Merge branches 'bug26' and 'master' into bug26

asalga · Jul 9, 2010 · 575c93a · 575c93a
2 parents 648d20e + 4434007
commit 575c93a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 17 deletions.
diff --git a/demos/mickey/mickey.html b/demos/mickey/mickey.html
@@ -7,7 +7,26 @@
   </head>
 
   <body onLoad="start();">
-    <canvas id="canvas" width="500" height="500"></canvas>
+  A cross-browser JavaScript tool which will emulate Arius3D's PointStream viewer. <br />
+  It will be able to quickly render a large amount of point cloud data to the &lt;canvas &gt;<br />
+  tag using WebGL.<br />
+  A cross-browser JavaScript tool which will emulate Arius3D's PointStream viewer. <br />
+  It will be able to quickly render a large amount of point cloud data to the &lt;canvas &gt;<br />
+  tag using WebGL.<br />
+  A cross-browser JavaScript tool which will emulate Arius3D's PointStream viewer. <br />
+  It will be able to quickly render a large amount of point cloud data to the &lt;canvas &gt;<br />
+  tag using WebGL.<br />
+  A cross-browser JavaScript tool which will emulate Arius3D's PointStream viewer. <br />
+  It will be able to quickly render a large amount of point cloud data to the &lt;canvas &gt;<br />
+  tag using WebGL.<br />
+  A cross-browser JavaScript tool which will emulate Arius3D's PointStream viewer. <br />
+  It will be able to quickly render a large amount of point cloud data to the &lt;canvas &gt;<br />
+  tag using WebGL.<br />
+  A cross-browser JavaScript tool which will emulate Arius3D's PointStream viewer. <br />
+  It will be able to quickly render a large amount of point cloud data to the &lt;canvas &gt;<br />
+  tag using WebGL.<br />
+
+    <canvas id="canvas" width="500" height="500" style="position:absolute;left:0px;top:0px;"></canvas>
     <span id="debug"></span>
   </body>
 

diff --git a/demos/mickey/mickey.js b/demos/mickey/mickey.js
@@ -10,7 +10,7 @@ var size = 500;
 
 window.onresize = function(){
   ps.resize(window.innerWidth, window.innerHeight);
-  ps.background([0.3,0.5,0.7,1]);
+  ps.background([0.3,0.5,0.7,0.2]);
 };
 
 function zoom(amt){
@@ -57,7 +57,7 @@ function start(){
   ps = new PointStream();
 
   ps.setup(document.getElementById('canvas'), render);
-  ps.background([0.3,0.5,0.7,1]);
+  ps.background([0.3,0.5,0.7,0.2]);
 
   ps.onMouseScroll = zoom;
   ps.onMousePressed = mousePressed;

diff --git a/pointstream.js b/pointstream.js
@@ -1,11 +1,12 @@
-var ps_include = ((function(lastScript) { 
-  return (function(path) {
-    var fullUrl = lastScript.src.substring(0, lastScript.src.lastIndexOf('/') + 1) + path; 
-    var newScript = document.createElement("script"); 
-    newScript.src = fullUrl; 
-    document.getElementsByTagName("head")[0].appendChild(newScript);
-  });
-})(document.getElementsByTagName("head")[0].lastChild));
+var ps_include = function(path){
+  var lastScript = document.getElementsByTagName("head")[0].lastChild;
+  var fullUrl = lastScript.src.substring(0, lastScript.src.lastIndexOf('/') + 1) + path;
+  document.write('<' + 'script');
+  document.write(' language="javascript"');
+  document.write(' type="text/javascript"');
+  document.write(' src="' + fullUrl + '">');
+  document.write('</' + 'script' + '>');
+}
 
 ps_include('mjs.js');
 ps_include('psapi.js');
diff --git a/psapi.js b/psapi.js
@@ -1,12 +1,6 @@
 /*
   Copyright (c) 2010  Seneca College
   MIT LICENSE
-
-TODO:
-- add mouseScroll empty var?
-- change verts, norms, cols to webglarrays?
-- should mousewheel return single value or object?
-- add external js loading so mjs isn't present in html file
 */
 
 function PointStream(){