shane/rockviewer
1
0
Fork 0
Code Issues 1 Pull Requests Releases 2 Wiki Activity

Added models and updated documentation

Browse Source
This commit is contained in:
Shane Frischkorn
2013-10-25 11:28:24 +10:00
parent 34d8e295e9
commit 49b543db0b
7 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
db.sqlite3
View File

Binary file not shown.

BIN
docs/Model Generation.docx
View File

Binary file not shown.

BIN
media/Actinolite.ctm
View File

Binary file not shown.

BIN
media/Actinolite2.ctm
View File

Binary file not shown.

BIN
media/Qtz4.ctm Normal file
View File

Binary file not shown.

BIN
media/Trilobite.ctm Normal file
View File

Binary file not shown.

6
three_d_viewer/templates/three_d_viewer/detail.html
View File

@@ -88,7 +88,7 @@ function load(){
} }
function loaded(){ function loaded(){
if ( navigator.userAgent.indexOf("WebKit") == -1){ /*if ( navigator.userAgent.indexOf("WebKit") == -1){
var worker = new Worker("loader.js"); var worker = new Worker("loader.js");
worker.onmessage = function(event){ worker.onmessage = function(event){
@@ -99,11 +99,11 @@ function loaded(){
worker.postMessage(request.responseText); worker.postMessage(request.responseText);
}else{ }else{*/
file = new CTM.File( new CTM.Stream(request.responseText) ); file = new CTM.File( new CTM.Stream(request.responseText) );
webGLStart(); webGLStart();
document.getElementById("progress").innerHTML = ""; document.getElementById("progress").innerHTML = "";
} //}
} }
function webGLStart(){ function webGLStart(){