jax 0.0.0.3 → 0.0.0.4

data/src/jax/core/matrix_stack.js

@@ -130,20 +130,24 @@ Jax.MatrixStack = (function() {
      * 
      * See also Jax.MatrixStack#pop()
      **/
-    push: function() { pushMatrix(this); },
+    push: function() { pushMatrix(this); return this; },
 
     /**
+     * Jax.MatrixStack#pop() -> Jax.MatrixStack
+     *
      * Reverts back to an earlier matrix stack, effectively undoing any changes that have been made
      * since the most recent call to Jax.MatrixStack#push().
+     *
+     * See also Jax.MatrixStack#push()
      **/
-    pop: function() { this.depth--; },
+    pop: function() { this.depth--; return this; },
 
     /**
      * Jax.MatrixStack#reset() -> Jax.MatrixStack
      * 
      * Resets the stack depth to zero, effectively undoing all calls to #push().
      **/
-    reset: function() { this.depth = 0; },
+    reset: function() { this.depth = 0; return this; },
 
     /**
      * Jax.MatrixStack#loadModelMatrix(matr) -> Jax.MatrixStack

data/src/jax/webgl/core/framebuffer.js

@@ -1,3 +1,8 @@
+/**
+ * class Jax.Framebuffer
+ *
+ * Used for rendering images off-screen and capturing the result.
+ **/
 Jax.Framebuffer = (function() {
   function build(context, self) {
     var handle = context.glCreateFramebuffer();

data/src/jax/webgl/scene/light_manager.js

@@ -38,13 +38,16 @@ Jax.Scene.LightManager = (function() {
     },
     
     illuminate: function(context, objects, options) {
+      // Use alpha blending for the first pass, and additive blending for subsequent passes.
+      this.context.glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
       for (var i = 0; i < this._lights.length; i++) {
-        this._current_light = i;
         for (var j = 0; j < objects.length; j++) {
+          this._current_light = i;
           /* TODO optimization: see if objects[j] is even affected by this._lights[i] (based on attenuation) */
           if (objects[j].isLit())
             objects[j].render(context, options);
         }
+        this.context.glBlendFunc(GL_ONE, GL_ONE);
       }
       delete this._current_light;
     },

data/src/jax/webgl/shader.js

@@ -1,3 +1,8 @@
+/**
+ * class Jax.Shader
+ *
+ * Wraps around a WebGL shader program.
+ **/
 Jax.Shader = (function() {
   function buildStackTrace(context, glShader, source) {
     source = source.split(/\n/);
@@ -119,8 +124,13 @@ Jax.Shader = (function() {
     return source;
   }
   
+  function sourceWithoutComments(source) {
+    return source.replace(/\/\*.*\*\//g, "");
+  }
+  
   function numArgumentsInMain(source) {
-    var result = /void\s*main\((.*?)\)\s*\{/.exec(source);
+    // if a comment contains 'void main' in it, we'll get false positives
+    var result = /void\s*main\((.*?)\)\s*\{/.exec(sourceWithoutComments(source));
     if (result) {
       result = result[1].replace(/\s*/g, '');
       if (result == "" || result == "void") return 0;

data/src/jax/webgl/shader/manifest.js

@@ -1,10 +1,10 @@
 /**
- class Jax.Shader.Manifest
-   
- Used to track variable assignments. After all assignments have been made just prior to committing a render phase,
- the manifest will be used to actually pass variable values into the shader. This keeps from specifying shader
- values more than once. Manifest can also be used to cache values between render passes, because its values are
- never reset.
+ * class Jax.Shader.Manifest
+ *   
+ * Used to track variable assignments. After all assignments have been made just prior to committing a render phase,
+ * the manifest will be used to actually pass variable values into the shader. This keeps from specifying shader
+ * values more than once. Manifest can also be used to cache values between render passes, because its values are
+ * never reset.
  **/
 Jax.Shader.Manifest = Jax.Class.create({
   initialize: function(existing) {

data/src/jax/webgl/shader_chain.js

@@ -8,7 +8,7 @@ Jax.ShaderChain = (function() {
   function preprocessFunctions(self, prefix, suffix, source) {
     /* TODO mangle all function and structure names to prevent conflicts -- right now we only mangle main() */
     
-    return source.replace(/void\s*main\s*\(/, 'void '+sanitizeName(prefix)+'_main_'+sanitizeName(suffix)+'(');
+    return source.replace(/void\s*main\s*\(/g, 'void '+sanitizeName(prefix)+'_main_'+sanitizeName(suffix)+'(');
   }
   
   function preprocessorOptions(self) {
@@ -148,11 +148,18 @@ Jax.ShaderChain = (function() {
         functionCalls += "  "+sanitizeName(this.phases[i].getName())+i+"_main_f("+args+");\n";
       }
       
+      var colors = "#ifdef PASS_TYPE\n"
+                 + "  if (PASS_TYPE == "+Jax.Scene.ILLUMINATION_PASS+") gl_FragColor = ambient + diffuse + specular;\n"
+                 + "  else gl_FragColor = ambient;\n"
+                 + "#else\n"
+                 + "  gl_FragColor = ambient + diffuse + specular;\n"
+                 + "#endif\n";
+                 
       return "/**** Shader chain generated #main ****/\n" +
              "void main(void) {\n" +
                "vec4 ambient = vec4(1.0,1.0,1.0,1.0), diffuse = vec4(1.0,1.0,1.0,1.0), specular = vec4(1.0,1.0,1.0,1.0);\n" +
                functionCalls +
-               (lastTookArguments ? "gl_FragColor = ambient + diffuse + specular;\n" : "") +
+               (lastTookArguments ? colors : "") +
              "}\n";
     },
     

data/src/jax/webgl/world.js

@@ -74,11 +74,16 @@ Jax.World = (function() {
       
       if (this.lighting.isEnabled()) {
         /* ambient pass */
-        for (i = 0; i < this.objects.length; i++) {
+        /*
+          So.... I see a legit need for an ambient pass for A) unlit objects and B)
+          scene lighting. But jax doesn't yet support scene lighting so really only
+          unlit objects need an ambient pass. For lit objects, why not let
+          lighting take care of (ambient + diffuse + specular) all at once?
+        */
+        for (i = 0; i < this.objects.length; i++)
           if (!this.objects[i].lit)
             this.objects[i].render(this.context, unlit);
-        }
-        this.lighting.ambient(this.context, this.objects);
+        // this.lighting.ambient(this.context, this.objects);
       
         /* shadowgen pass */
         this.context.current_pass = Jax.Scene.SHADOWMAP_PASS;
@@ -88,7 +93,6 @@ Jax.World = (function() {
         }
         
         /* illumination pass */
-        this.context.glBlendFunc(GL_ONE, GL_ONE);
         this.context.current_pass = Jax.Scene.ILLUMINATION_PASS;
         this.lighting.illuminate(this.context, this.objects);
       } else {

metadata

@@ -2,7 +2,7 @@
 name: jax
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0.3
+  version: 0.0.0.4
 platform: ruby
 authors: 
 - Colin MacKenzie IV
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -04:00
+date: 2011-05-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -181,6 +181,7 @@ files:
 - .gitmodules
 - .rvmrc
 - Gemfile
+- LICENSE
 - README.rdoc
 - Rakefile
 - bin/jax
@@ -230,8 +231,20 @@ files:
 - guides/assets/images/feature_tile.gif
 - guides/assets/images/footer_tile.gif
 - guides/assets/images/getting_started/clean_passing_jasmine_suite.png
+- guides/assets/images/getting_started/dungeon-complete.png
+- guides/assets/images/getting_started/dungeon-normal-map.png
+- guides/assets/images/getting_started/dungeon-rainbow-textured.png
+- guides/assets/images/getting_started/dungeon-rainbow.png
+- guides/assets/images/getting_started/dungeon-textured-lighting.png
+- guides/assets/images/getting_started/dungeon-textured.png
 - guides/assets/images/getting_started/rock.png
 - guides/assets/images/getting_started/rock_normal.png
+- guides/assets/images/getting_started/teapot-red-directional-point.png
+- guides/assets/images/getting_started/teapot-red-directional.png
+- guides/assets/images/getting_started/teapot-red-nolight.png
+- guides/assets/images/getting_started/teapot-red-spot-point-directional.png
+- guides/assets/images/getting_started/teapot-white.png
+- guides/assets/images/getting_started/teapot-with-model.png
 - guides/assets/images/grey_bullet.gif
 - guides/assets/images/header_backdrop.png
 - guides/assets/images/header_tile.gif
@@ -330,6 +343,7 @@ files:
 - guides/source/layout.html.erb
 - guides/source/lighting.textile
 - guides/source/materials.textile
+- guides/source/matrices.textile
 - guides/source/shaders.textile
 - guides/source/testing.textile
 - guides/w3c_validator.rb
@@ -380,6 +394,14 @@ files:
 - lib/jax/generators/model/templates/model.js.tt
 - lib/jax/generators/model/templates/test.js.tt
 - lib/jax/generators/script_jax_loader.rb
+- lib/jax/generators/shader/USAGE
+- lib/jax/generators/shader/shader_generator.rb
+- lib/jax/generators/shader/templates/common.ejs.tt
+- lib/jax/generators/shader/templates/fragment.ejs.tt
+- lib/jax/generators/shader/templates/manifest.yml.tt
+- lib/jax/generators/shader/templates/material.js.tt
+- lib/jax/generators/shader/templates/spec.js.tt
+- lib/jax/generators/shader/templates/vertex.ejs.tt
 - lib/jax/monkeypatch/jasmine.rb
 - lib/jax/monkeypatch/jasmine/config.rb
 - lib/jax/monkeypatch/jasmine/server.rb
@@ -449,13 +471,6 @@ files:
 - spec/generators/model_generator_spec.rb
 - spec/javascripts/Player.js
 - spec/javascripts/helpers/SpecHelper.js
-- spec/javascripts/jax/builtin/materials/core_materials_spec.js
-- spec/javascripts/jax/builtin/materials/dual_paraboloid_spec.js
-- spec/javascripts/jax/builtin/materials/fog_spec.js
-- spec/javascripts/jax/builtin/materials/lighting_spec.js
-- spec/javascripts/jax/builtin/materials/normal_map_spec.js
-- spec/javascripts/jax/builtin/materials/shadow_map_spec.js
-- spec/javascripts/jax/builtin/materials/texture_spec.js
 - spec/javascripts/jax/builtin/meshes/cube_spec.js
 - spec/javascripts/jax/builtin/meshes/plane_spec.js
 - spec/javascripts/jax/builtin/meshes/quad_spec.js
@@ -489,6 +504,13 @@ files:
 - spec/javascripts/jax/webgl_spec.js
 - spec/javascripts/jax/world_spec.js
 - spec/javascripts/jax_spec.js
+- spec/javascripts/shaders/core_materials_spec.js
+- spec/javascripts/shaders/dual_paraboloid_spec.js
+- spec/javascripts/shaders/fog_spec.js
+- spec/javascripts/shaders/lighting_spec.js
+- spec/javascripts/shaders/normal_map_spec.js
+- spec/javascripts/shaders/shadow_map_spec.js
+- spec/javascripts/shaders/texture_spec.js
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_runner.rb
 - spec/lib/jax/routes_spec.rb
@@ -636,7 +658,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2432223765413461543
+      hash: 1105159901056856411
       segments: 
       - 0
       version: "0"
@@ -645,7 +667,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2432223765413461543
+      hash: 1105159901056856411
       segments: 
       - 0
       version: "0"
@@ -709,13 +731,6 @@ test_files:
 - spec/generators/model_generator_spec.rb
 - spec/javascripts/Player.js
 - spec/javascripts/helpers/SpecHelper.js
-- spec/javascripts/jax/builtin/materials/core_materials_spec.js
-- spec/javascripts/jax/builtin/materials/dual_paraboloid_spec.js
-- spec/javascripts/jax/builtin/materials/fog_spec.js
-- spec/javascripts/jax/builtin/materials/lighting_spec.js
-- spec/javascripts/jax/builtin/materials/normal_map_spec.js
-- spec/javascripts/jax/builtin/materials/shadow_map_spec.js
-- spec/javascripts/jax/builtin/materials/texture_spec.js
 - spec/javascripts/jax/builtin/meshes/cube_spec.js
 - spec/javascripts/jax/builtin/meshes/plane_spec.js
 - spec/javascripts/jax/builtin/meshes/quad_spec.js
@@ -749,6 +764,13 @@ test_files:
 - spec/javascripts/jax/webgl_spec.js
 - spec/javascripts/jax/world_spec.js
 - spec/javascripts/jax_spec.js
+- spec/javascripts/shaders/core_materials_spec.js
+- spec/javascripts/shaders/dual_paraboloid_spec.js
+- spec/javascripts/shaders/fog_spec.js
+- spec/javascripts/shaders/lighting_spec.js
+- spec/javascripts/shaders/normal_map_spec.js
+- spec/javascripts/shaders/shadow_map_spec.js
+- spec/javascripts/shaders/texture_spec.js
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_runner.rb
 - spec/lib/jax/routes_spec.rb