added stop to pts, added stop function to pts demo, fixed sundae ref …

…tester, fixed SMS demo to work even if device does not have SMS.
asalga · Mar 16, 2011 · 536ac1e · 536ac1e
1 parent a3dadfb
commit 536ac1e
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 8 deletions.
diff --git a/demos/accelerometer/demo.js b/demos/accelerometer/demo.js
@@ -1,5 +1,9 @@
 var ps, mickey;
-var x, z;
+
+// set these values in case the device used does not
+// have MozOrientation. At least we can render the point cloud
+var x = 0;
+var z = 0;
 
 function render() {
   ps.translate(0, 0, -50);

diff --git a/demos/lion/lion.js b/demos/lion/lion.js
@@ -5,6 +5,8 @@ var zoomed = -50;
 var rot =[0, 0];
 var curCoords = [0, 0];
 
+const KEY_ESC = 27;
+
 function zoom(amt){
   var invert = document.getElementById('invertScroll').checked ? -1: 1;
   zoomed += amt * 2 * invert;
@@ -20,6 +22,12 @@ function mouseReleased(){
   buttonDown = false;
 }
 
+function keyDown(){
+  if(ps.key == KEY_ESC){
+    ps.stop("../../clouds/lion.asc");
+  }
+}
+
 function render() {
   var deltaX = ps.mouseX - curCoords[0];
   var deltaY = ps.mouseY - curCoords[1];
@@ -97,6 +105,7 @@ function start(){
   ps.onMouseScroll = zoom;
   ps.onMousePressed = mousePressed;
   ps.onMouseReleased = mouseReleased;
+  ps.onKeyDown = keyDown;
 
   lion = ps.load("../../clouds/lion.asc");
 }
diff --git a/parsers/asc.js b/parsers/asc.js
@@ -208,6 +208,9 @@ var ASCParser = (function() {
       return fileSizeInBytes;
     });
 
+    /**
+      Stop downloading and parsing the associated point cloud.
+    */
     this.stop = function(){
       if(AJAX){
         AJAX.abort();

diff --git a/parsers/pts.js b/parsers/pts.js
@@ -92,6 +92,15 @@ var PTSParser = (function() {
       return fileSizeInBytes;
     });
 
+    /**
+      Stop downloading and parsing the associated point cloud.
+    */
+    this.stop = function(){
+      if(AJAX){
+        AJAX.abort();
+      }
+    };
+
     /**
       @param {String} path Path to the resource.
     */

diff --git a/tests/pts/index.html b/tests/pts/index.html
@@ -2,7 +2,7 @@
 
   <head>
     <link rel="stylesheet" type="text/css" href="../style.css" />
-    <script src="verts.js"></script>
+    <script src="test.js"></script>
     <script src="../../xbps.js"></script>
   </head>
 
@@ -11,7 +11,6 @@
     <h1><a href="http://zenit.senecac.on.ca/wiki/index.php/XB_PointStream">XB PointStream</a> PTS Parser Test</h1>
 
       <p>
-        <br />
         <canvas id="canvas" width="500" height="500"></canvas><br />
         <span id="debug"></span>
       </p>

diff --git a/tests/pts/verts.js → tests/pts/test.js b/tests/pts/verts.js → tests/pts/test.js
@@ -1,5 +1,6 @@
 var ps, pointCloud;
 var i = 0;
+const KEY_ESC = 27;
 
 function render() {
   ps.translate(0, 0, -20);
@@ -21,5 +22,12 @@ function start(){
   ps.background([0, 0, 0, 1.0]);
   ps.pointSize(3);
   ps.onRender = render;
+
+  ps.onKeyDown = function(){
+    if(ps.key === KEY_ESC){
+      ps.stop("../../clouds/lobby.pts");
+      ps.println('downloading stopped.');
+    }
+  };
   pointCloud = ps.load("../../clouds/lobby.pts");
 }
diff --git a/tests/stop/index.html b/tests/stop/index.html
@@ -10,9 +10,8 @@
 
     <h1><a href="http://zenit.senecac.on.ca/wiki/index.php/XB_PointStream">XB PointStream</a> parser stop() test</h1>
       <p>
-        <input id="eggenburg" type="radio" onClick="switchCloud(1);" />eggenburg<br />
-        <input id="mickey" type="radio" onClick="switchCloud(2);" />mickey<br />
-        <canvas id="canvas" width="500" height="500"></canvas><br />
+        <input id="eggenburg" type="radio" onClick="switchCloud(1);" />eggenburg &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;<input id="mickey" type="radio" onClick="switchCloud(2);" />mickey<br />
+        <canvas id="canvas" width="500" height="300"></canvas><br />
       </p>
 
   </body>

diff --git a/tools/sundae/resources/tests.js b/tools/sundae/resources/tests.js
@@ -6,15 +6,17 @@
         "name": "only verts",
         "dependancyURL": ["../../mjs.js",
                           "../../psapi.js",
-                          "../../parsers/asc.js"],
+                          "../../parsers/asc.js",
+                          "../../parsers/pts.js"],
         "referenceImageURL": "resources/only_verts/only_verts.png",
         "run": {"src": "resources/only_verts/only_verts.js", "func": "start" }
       },
       {
         "name": "1",
         "dependancyURL": ["../../mjs.js",
                           "../../psapi.js",
-                          "../../parsers/asc.js"],
+                          "../../parsers/asc.js",
+                          "../../parsers/pts.js"],
         "referenceImageURL": "resources/acorn_unlit/acorn_unlit.png",
         "run": {"src": "resources/acorn_unlit/acorn_unlit.js", "func": "start" }
       },
@@ -23,6 +25,7 @@
         "dependancyURL": ["../../mjs.js",
                           "../../psapi.js",
                           "../../parsers/asc.js",
+                          "../../parsers/pts.js",
                           "resources/user_shader/user_shader.js"],
         "referenceImageURL": "resources/user_shader/mickey_lit.png",
         "run": {"src": "resources/user_shader/test.js", "func": "start" }