Added models and updated documentation

2013-10-25 11:28:24 +10:00
parent 34d8e295e9
commit 49b543db0b
7 changed files with 3 additions and 3 deletions
--- a/db.sqlite3
+++ b/db.sqlite3
--- a/Generation.docx
+++ b/Generation.docx
--- a/media/Actinolite.ctm
+++ b/media/Actinolite.ctm
--- a/media/Actinolite2.ctm
+++ b/media/Actinolite2.ctm
--- a/media/Qtz4.ctm
+++ b/media/Qtz4.ctm
--- a/media/Trilobite.ctm
+++ b/media/Trilobite.ctm
--- 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(){