diff --git a/db.sqlite3 b/db.sqlite3 index 733e1f2..5eb5204 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/docs/Model Generation.docx b/docs/Model Generation.docx index 82790fb..a30aed6 100644 Binary files a/docs/Model Generation.docx and b/docs/Model Generation.docx differ diff --git a/media/Actinolite.ctm b/media/Actinolite.ctm index 8a5e41e..1f367c1 100644 Binary files a/media/Actinolite.ctm and b/media/Actinolite.ctm differ diff --git a/media/Actinolite2.ctm b/media/Actinolite2.ctm deleted file mode 100644 index dfc6bee..0000000 Binary files a/media/Actinolite2.ctm and /dev/null differ diff --git a/media/Qtz4.ctm b/media/Qtz4.ctm new file mode 100644 index 0000000..7b7fa3a Binary files /dev/null and b/media/Qtz4.ctm differ diff --git a/media/Trilobite.ctm b/media/Trilobite.ctm new file mode 100644 index 0000000..ade0687 Binary files /dev/null and b/media/Trilobite.ctm differ diff --git a/three_d_viewer/templates/three_d_viewer/detail.html b/three_d_viewer/templates/three_d_viewer/detail.html index 5a55bba..6ecd062 100644 --- a/three_d_viewer/templates/three_d_viewer/detail.html +++ b/three_d_viewer/templates/three_d_viewer/detail.html @@ -88,7 +88,7 @@ function load(){ } function loaded(){ - if ( navigator.userAgent.indexOf("WebKit") == -1){ + /*if ( navigator.userAgent.indexOf("WebKit") == -1){ var worker = new Worker("loader.js"); worker.onmessage = function(event){ @@ -99,11 +99,11 @@ function loaded(){ worker.postMessage(request.responseText); - }else{ + }else{*/ file = new CTM.File( new CTM.Stream(request.responseText) ); webGLStart(); document.getElementById("progress").innerHTML = ""; - } + //} } function webGLStart(){