Merge branches 'staged' and 'bug81' into staged

asalga · Mar 14, 2011 · 5df5593 · 5df5593
2 parents 8ee8de9 + a9bcbba
commit 5df5593
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/demos/many_clouds/index.html b/demos/many_clouds/index.html
@@ -11,7 +11,6 @@
     <script src="shaders/acorn_shader.js"></script>
     <script src="shaders/mickey_shader.js"></script>
     <script src="js/many_clouds.js"></script>
-    <script src="js/user_asc_parser.js"></script>
   </head>
 
   <body onload="start();" bgcolor="#222222" text="#FFFFFF">

diff --git a/demos/many_clouds/shaders/mickey_shader.js b/demos/many_clouds/shaders/mickey_shader.js
@@ -56,12 +56,18 @@ var mickeyVertShader =
 "    }" +
 "    gl_Position = ps_ProjectionMatrix * ecPos4;" +
 "  }" +
+
 "  else{" +
 "    float intensity = 0.0;" +
 "    PointLight(intensity, ecPos, transNorm);" +
-"    gl_PointSize = 4.0;" + 
-"    if(intensity > 0.0){gl_PointSize = 0.0;}" + 
 "    frontColor = vec4(0.0, 0.0, 0.0, 1.0);" +
-"    gl_Position = ps_ProjectionMatrix * ps_ModelViewMatrix * vec4(ps_Vertex + ps_Normal/5.0, 1.0);" +
+"    if(intensity > 0.0){" +
+"      gl_PointSize = 0.0;"+
+"      gl_Position = ps_ProjectionMatrix * ps_ModelViewMatrix * vec4(0.0,0.0,0.0,1.0);" +
+"    }" +
+"    else{" +
+"      gl_PointSize = 4.0;" + 
+"      gl_Position = ps_ProjectionMatrix * ps_ModelViewMatrix * vec4(ps_Vertex + ps_Normal/5.0, 1.0);" +
+"    }" +
 "  }" +
-"}";
+"}";