added getDataLayout for flexible asc files, added mouse callbacks, cl…

…eaned code
asalga · Jul 7, 2010 · 9a2912e · 9a2912e
1 parent 99d3151
commit 9a2912e
Show file tree

Hide file tree

Showing 6 changed files with 57,690 additions and 62 deletions.
diff --git a/demos/acorn/acorn.html b/demos/acorn/acorn.html
@@ -1,7 +1,7 @@
 <html>
 
   <head>
-    <!--<link rel="stylesheet" type="text/css" href="../style.css" />-->
+    <link rel="stylesheet" type="text/css" href="../style.css" />
     <script src="../../mjs.js"></script>
     <script src="../../pointstream.js"></script>
     <script src="acorn.js"></script>

diff --git a/demos/acorn/acorn.js b/demos/acorn/acorn.js
@@ -6,16 +6,13 @@ var zoomed = 0;
 var rot =[0,0];
 var curCoords = [0,0];
 
-var size = 500;
+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(){
@@ -49,8 +46,6 @@ function render() {
   // redraw
   ps.clear();
   ps.render();
-
-//  window.status = Math.floor(ps.frameRate);
 }
 
 function start(){