Merge branch 'master' of git://github.com/asalga/XB-PointStream.git

asalga · Jul 7, 2010 · e8df4d0 · e8df4d0
2 parents 33a7c45 + 9a2912e
commit e8df4d0
Show file tree

Hide file tree

Showing 7 changed files with 57,770 additions and 56 deletions.
diff --git a/README b/README
@@ -6,4 +6,5 @@ It can render a large amount of point cloud data to the <canvas> tag using WebGL
 Website:    http://zenit.senecac.on.ca/wiki/index.php/XB_PointStream
 GitHub:     http://github.com/asalga/XB-PointStream
 Lighthouse: http://cdot.lighthouseapp.com/projects/52886-xb-pointstream/
-Twitter:    XBPointStream
+Twitter:    http://twitter.com/XBPointStream
+
diff --git a/demos/acorn/acorn.html b/demos/acorn/acorn.html
@@ -9,7 +9,6 @@
 
   <body onLoad="start();">
     <canvas id="canvas" width="500" height="500"></canvas>
-    <span id="debug"></span>
   </body>
 
 </html>
diff --git a/demos/acorn/acorn.js b/demos/acorn/acorn.js
@@ -1,31 +1,51 @@
 var ps;
 
-var rot = 0;
+var buttonDown = false;
 var zoomed = 0;
 
-var size = 500;
+var rot =[0,0];
+var curCoords = [0,0];
+
+window.onresize = function(){
+  ps.resize(window.innerWidth, window.innerHeight);
+  ps.background([0,0,0,1]);
+};
 
 function zoom(amt){
   zoomed += amt * 2;
-  size += amt * 10;
+}
 
-  if(ps.mouseX < 25 && ps.mouseY < 25){ 
-    ps.resize(size, size);
-    ps.background([0,0,0,1]);
-  }
+function mousePressed(){
+  curCoords[0] = ps.mouseX;
+  curCoords[1] = ps.mouseY;
+  buttonDown = true;
+}
+
+function mouseReleased(){
+  buttonDown = false;
 }
 
 function render() {
 
+  var deltaX = ps.mouseX - curCoords[0];
+  var deltaY = ps.mouseY - curCoords[1];
+
+  if(buttonDown){
+    rot[0] += deltaX / 250;
+    rot[1] += deltaY / 250;
+    curCoords[0] = ps.mouseX;
+    curCoords[1] = ps.mouseY;
+  }
+
   // transform point cloud
   ps.translate(0,0,zoomed);
-  ps.rotateY(rot+=0.01);
+
+  ps.rotateY(rot[0]);
+  ps.rotateX(rot[1]);
 
   // redraw
   ps.clear();
   ps.render();
-
-  window.status = Math.floor(ps.frameRate);
 }
 
 function start(){
@@ -35,6 +55,8 @@ function start(){
   ps.background([0,0,0,1]);
 
   ps.onMouseScroll = zoom;
+  ps.onMousePressed = mousePressed;
+  ps.onMouseReleased = mouseReleased;
 
   ps.loadFile({path:"acorn.asc", autoCenter: true});
 }
diff --git a/demos/acorn/acorn_vc.asc b/demos/acorn/acorn_vc.asc
diff --git a/demos/mickey/mickey.js b/demos/mickey/mickey.js
@@ -1,31 +1,67 @@
 var ps;
+
+var buttonDown = false;
 var zoomed = 0;
-var rot = 0;
+
+var rot =[0,0];
+var curCoords = [0,0];
+
+var size = 500;
+
+window.onresize = function(){
+  ps.resize(window.innerWidth, window.innerHeight);
+  ps.background([0.3,0.5,0.7,1]);
+};
 
 function zoom(amt){
   zoomed += amt * 2;
+  size += amt * 10;
+}
+
+function mousePressed(){
+  curCoords[0] = ps.mouseX;
+  curCoords[1] = ps.mouseY;
+  buttonDown = true;
+}
+
+function mouseReleased(){
+  buttonDown = false;
 }
 
 function render() {
 
+  var deltaX = ps.mouseX - curCoords[0];
+  var deltaY = ps.mouseY - curCoords[1];
+
+  if(buttonDown){
+    rot[0] += deltaX / 250;
+    rot[1] += deltaY / 250;
+    curCoords[0] = ps.mouseX;
+    curCoords[1] = ps.mouseY;
+  }
+
   // transform point cloud
   ps.translate(0,0,zoomed);
-  ps.rotateY(rot+=0.01);
+
+  ps.rotateY(rot[0]);
+  ps.rotateX(rot[1]);
 
   // redraw
   ps.clear();
   ps.render();
 
-  window.status = Math.floor(ps.frameRate);
+  window.status = ps.frameRate;
 }
 
 function start(){
   ps = new PointStream();
 
   ps.setup(document.getElementById('canvas'), render);
-  ps.background([.2,.5,.7,1]);
+  ps.background([0.3,0.5,0.7,1]);
 
   ps.onMouseScroll = zoom;
+  ps.onMousePressed = mousePressed;
+  ps.onMouseReleased = mouseReleased;
 
   ps.loadFile({path:"mickey.asc", autoCenter: true});
 }
diff --git a/demos/style.css b/demos/style.css
@@ -1,8 +1,17 @@
+html {
+  overflow-x: hidden;
+  overflow-y: hidden;
+}
+
 span{
   vertical-align: top;
   font-family: monospace;
 }
 
+body{
+  margin: 0px 0px;
+}
+
 .progress{
   color:purple;
 }