jax 0.0.0.8 → 0.0.0.9

data/lib/jax/routes.rb

@@ -30,9 +30,6 @@ module Jax
         
         outfile.puts "Jax.routes.map(#{path.inspect}, #{controller_name_for(set[1])}, #{args});"
       end
-      
-      outfile.puts "if (Jax.doVersionCheck) Jax.doVersionCheck('#{Jax::Version::STRING}');" 
-      outfile.puts "else alert('Your Jax gem version is newer than your Jax JavaScript library!\\n\\nRun `rake jax:update` to fix this.');"
     end
     
     def root(controller = nil, action = 'index')

data/lib/jax/tasks/rake.rb

@@ -27,6 +27,10 @@ namespace :jax do
     File.open(Jax.root.join("tmp/routes.js"), 'w') do |f|
       Jax.application.config.routes.compile(f)
     end
+    File.open(Jax.root.join("tmp/version_check.js"), "w") do |f|
+      f.puts "if (Jax.doVersionCheck) Jax.doVersionCheck('#{Jax::Version::STRING}');" 
+      f.puts "else alert('Your Jax gem version is newer than your Jax JavaScript library!\\n\\nRun `rake jax:update` to fix this.');"
+    end
   end
 end
 

data/lib/jax/version.rb

@@ -3,7 +3,7 @@ module Jax
     MAJOR = 0
     MINOR = 0
     TINY  = 0
-    PATCH = 8
+    PATCH = 9
 
     STRING = PATCH == 0 ? "#{MAJOR}.#{MINOR}.#{TINY}" : "#{MAJOR}.#{MINOR}.#{TINY}.#{PATCH}"
   end

data/spec/example_app/app/shaders/blob/vertex.ejs

@@ -1,6 +1,8 @@
 shared attribute vec4 VERTEX_POSITION, VERTEX_TANGENT;
 shared attribute vec3 VERTEX_NORMAL;
 
+uniform float time;
+
 #define PI 3.141592653589793
 
 vec3 sphere(in float slice, in float stack) {

data/spec/example_app/spec/javascripts/shaders/blob_spec.js

@@ -1,18 +1,15 @@
 describe("Shader 'blob'", function() {
-  var context, material, mesh;
+  var material, mesh;
   
     beforeEach(function() {
-      context = new Jax.Context('webgl-canvas');
       mesh = new Jax.Mesh.Quad();
     });
   
-    afterEach(function() { context.dispose(); });
-  
     describe("stand-alone", function() {
       beforeEach(function() { mesh.material = new Jax.Material.Blob(); });
   
-      xit("should render without error", function() {
-        expect(function() { mesh.render(context); }).not.toThrow();
+      it("should render without error", function() {
+        expect(function() { mesh.render(SPEC_CONTEXT); }).not.toThrow();
       });
     });
   
@@ -23,8 +20,8 @@ describe("Shader 'blob'", function() {
         }]});
       });
   
-      xit("should render without error", function() {
-        expect(function() { mesh.render(context); }).not.toThrow();
+      it("should render without error", function() {
+        expect(function() { mesh.render(SPEC_CONTEXT); }).not.toThrow();
       });
     });
 });

data/spec/example_app/spec/javascripts/support/spec_helpers/jax_spec_environment_helper.js

@@ -0,0 +1,33 @@
+function setupJaxTestEnvironment() {
+  var jasmineEnv = jasmine.getEnv();
+
+  jsApiReporter = new jasmine.JsApiReporter();
+  var trivialReporter = new jasmine.TrivialReporter();
+
+  jasmineEnv.addReporter(jsApiReporter);
+  jasmineEnv.addReporter(trivialReporter);
+
+  jasmineEnv.specFilter = function(spec) {
+    return trivialReporter.specFilter(spec);
+  };
+
+  /*
+    Create a canvas element and add it to the document. 
+    There's nothing special about this element.
+   */
+  var canvas = document.createElement("canvas");
+  canvas.setAttribute("id", "spec-canvas");
+  canvas.style.display = "none";
+  document.body.appendChild(canvas);
+  
+  beforeEach(function() {
+    window.SPEC_CONTEXT = new Jax.Context(canvas);
+  });
+  
+  afterEach(function() {
+    SPEC_CONTEXT.dispose();
+  })
+
+
+  jasmineEnv.execute();
+}

data/spec/example_app/spec/javascripts/support/spec_layout.html.erb

@@ -14,20 +14,8 @@
   <script type="text/javascript">
     var jsApiReporter;
     (function() {
-      var jasmineEnv = jasmine.getEnv();
-
-      jsApiReporter = new jasmine.JsApiReporter();
-      var trivialReporter = new jasmine.TrivialReporter();
-
-      jasmineEnv.addReporter(jsApiReporter);
-      jasmineEnv.addReporter(trivialReporter);
-
-      jasmineEnv.specFilter = function(spec) {
-        return trivialReporter.specFilter(spec);
-      };
-
       window.onload = function() {
-        jasmineEnv.execute();
+        setupJaxTestEnvironment();
         
         /*
           Create a canvas element and add it to the document. 

data/spec/generators/app_generator_spec.rb

@@ -15,6 +15,7 @@ EXPECTED_FILES = %w(
   spec/javascripts/support/jasmine.yml
   spec/javascripts/support/jasmine_runner.rb
   spec/javascripts/support/spec_layout.html.erb
+  spec/javascripts/support/spec_helpers/jax_spec_environment_helper.js
   spec/javascripts/support/spec_helpers/jax_spec_helper.js
   Rakefile 
   Gemfile

data/spec/javascripts/helpers/jax_spec_environment_helper.js

@@ -0,0 +1,33 @@
+function setupJaxTestEnvironment() {
+  var jasmineEnv = jasmine.getEnv();
+
+  jsApiReporter = new jasmine.JsApiReporter();
+  var trivialReporter = new jasmine.TrivialReporter();
+
+  jasmineEnv.addReporter(jsApiReporter);
+  jasmineEnv.addReporter(trivialReporter);
+
+  jasmineEnv.specFilter = function(spec) {
+    return trivialReporter.specFilter(spec);
+  };
+
+  /*
+    Create a canvas element and add it to the document. 
+    There's nothing special about this element.
+   */
+  var canvas = document.createElement("canvas");
+  canvas.setAttribute("id", "spec-canvas");
+  canvas.style.display = "none";
+  document.body.appendChild(canvas);
+  
+  beforeEach(function() {
+    window.SPEC_CONTEXT = new Jax.Context(canvas);
+  });
+  
+  afterEach(function() {
+    SPEC_CONTEXT.dispose();
+  })
+
+
+  jasmineEnv.execute();
+}

data/spec/javascripts/jax/core/utils_spec.js

@@ -2,6 +2,19 @@ describe("Jax.Util", function() {
   describe("vectorize", function() {
     var data;
     
+    describe("2D", function() {
+      beforeEach(function() { data = [1, 2]; });
+      
+      it("should have length 2", function() { expect(Jax.Util.vectorize({x:0,y:1})).toEqualVector([0,1]); });
+      it("should work", function() { expect(Jax.Util.vectorize(data)).toEqualVector([1,2]); });
+    });
+    
+    describe("with array", function() {
+      beforeEach(function() { data = [1, 2, 3]; });
+      
+      it("should return the original vector", function() { expect(Jax.Util.vectorize(data)).toEqualVector([1,2,3]); });
+    });
+    
     describe("with object with names", function() {
       beforeEach(function() { data = {x:1,y:2,z:3}; });
       it("should produce a vector", function() { expect(Jax.Util.vectorize(data)).toEqualVector([1,2,3]); });
@@ -33,6 +46,12 @@ describe("Jax.Util", function() {
     describe("colorize", function() {
       var data;
     
+      describe("3D", function() {
+        beforeEach(function() { data = [1, 2, 3]; });
+
+        it("should work", function() { expect(Jax.Util.colorize(data)).toEqualVector([1,2,3,1]); });
+      });
+
       describe("with object with short names", function() {
         beforeEach(function() { data = {r:1,g:2,b:3,a:4}; });
         it("should produce a color", function() { expect(Jax.Util.colorize(data)).toEqualVector([1,2,3,4]); });
@@ -108,7 +127,7 @@ describe("Jax.Util", function() {
     describe("with a vector", function() {
       beforeEach(function() { data = [1,2,3]; });
       it("should produce a vector", function() { expect(Jax.Util.vectorize(data)).toEqualVector([1,2,3]); });
-      it("should not return itself", function() { expect(Jax.Util.vectorize(data)).not.toEqual(data); });
+      xit("should not return itself", function() { expect(Jax.Util.vectorize(data)).not.toEqual(data); });
     });
   });
   
@@ -175,7 +194,7 @@ describe("Jax.Util", function() {
       });
     });
     
-    describe("with a gen object left and array right", function() {
+    describe("with a  object left and array right", function() {
       beforeEach(function() { normalized = Jax.Util.normalizeOptions({p:{"x":20,"y":40,"z":60}}, {p:[1,2,3]}); });
       it("should merge both into a gen object", function() {
         expect(Object.isArray(normalized.p)).toBeFalsy();

data/spec/lib/jax/tasks/jax_rake_spec.rb

@@ -37,6 +37,15 @@ describe "Rake Tasks:" do
     Dir.chdir File.expand_path('..', pwd)
   end
   
+  context "jax:generate_files" do
+    before(:each) { rake('jax:generate_files') }
+    subject { File.read(File.expand_path('tmp/version_check.js')) }
+    
+    it "should do a version check" do
+      subject.should =~ /jax:update/
+    end
+  end
+  
   context "jax:package" do
     before(:each) { rake('jax:package') }
     
@@ -47,6 +56,10 @@ describe "Rake Tasks:" do
         File.should exist('pkg/images/test.png')
       end
       
+      it "should not do a version check" do
+        subject.should_not =~ /jax:update/
+      end
+      
       it "should contain views" do
         subject.should =~ /Jax.views.push\('welcome\/index'/
       end

data/src/jax/context.js

@@ -384,7 +384,7 @@ Jax.Context = (function() {
       var error = this.glGetError();
       if (error != GL_NO_ERROR)
       {
-        var str = "GL error in "+this.canvas.id+": "+error;
+        var str = "GL error in "+this.canvas.id+": "+error+" ("+Jax.Util.enumName(error)+")";
         error = new Error(str);
         var message = error;
         if (error.stack)

data/src/jax/core/util.js

@@ -41,18 +41,25 @@ Jax.Util = {
    **/
   vectorize: function(data) {
     if (data) {
-      var res = vec3.create();
+      var res = [];//vec3.create();
       if (typeof(data) == "string") {
         var components = data.split(/[,\s]+/);
-        if (components.length >= 3) {
-          for (var i = 0; i < 3; i++)
+        if (components.length >= 2) {
+          for (var i = 0; i < components.length; i++)
             res[i] = parseFloat(components[i]);
         }
         return res;
       }
       if (data.length && data.length >= 3) return vec3.set(data, res);
-      if ((res[0] = data.x) != undefined && (res[1] = data.y) != undefined && (res[2] = data.z) != undefined) return res;
-      if ((res[0] = data[0]) != undefined && (res[1] = data[1]) != undefined && (res[2] = data[2]) != undefined) return res;
+      else if (data.length == 2) return [data[0], data[1]];
+      if ((res[0] = data.x) != undefined && (res[1] = data.y) != undefined) {
+        if (data.z != undefined) res[2] = data.z;
+        return res;
+      }
+      if ((res[0] = data[0]) != undefined && (res[1] = data[1]) != undefined) {
+        if (data[2] != undefined) res[2] = data[2];
+        return res;
+      }
     }
     throw new Error("Input argument for Jax.Util.vectorize not recognized: "+JSON.stringify(data));
   },

data/src/jax/mvc/model.js

@@ -149,6 +149,7 @@
        * 
        **/
       getBoundingCube: function() {
+        if (!this.mesh) return {left:0,right:0,bottom:0,top:0,front:0,back:0,width:0,height:0,depth:0};
         if (!this.mesh.built) this.mesh.rebuild();
         return this.mesh.bounds;
       },

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

@@ -5,12 +5,64 @@ Jax.Scene.LightManager = (function() {
     initialize: function(context) {
       this.context = context;
       this._lights = [];
+      this.objects = [];
+    },
+    
+    addObject: function(obj) {
+      this.objects.push(obj);
+      for (var j = 0; j < this._lights.length; j++)
+        if (obj.isShadowCaster())
+          this._lights[j].registerCaster(obj);
+      this.recalculateBoundingRadius();
+    },
+    
+    removeObject: function(obj) {
+      if (this.objects[obj]) {
+        var o = this.objects[obj];
+        this.objects.splice(obj, 1);
+        for (var j = 0; j < this._lights.length; j++)
+          if (o.isShadowCaster())
+            this._lights[j].unregisterCaster(o);
+        this.recalculateBoundingRadius();
+        return o;
+      }
+      for (var i = 0; i < this.objects.length; i++)
+        if (this.objects[i] == obj)
+          return this.removeObject(obj);
+    },
+    
+    getShadowCasters: function() {
+      var ret = [];
+      for (var i = 0; i < this.objects.length; i++) {
+        if (this.objects[i].isShadowCaster())
+          ret.push(this.objects[i]);
+      }
+      return ret;
     },
     
     add: function(light) {
       if (this._lights.length == Jax.max_lights)
         throw new Error("Maximum number of light sources in a scene has been exceeded! Try removing some first.");
+      for (var i = 0; i < this.objects.length; i++) {
+        if (this.objects[i].isShadowCaster())
+          light.registerCaster(this.objects[i]);
+      }
       this._lights.push(light);
+      light.boundingRadius = this.boundingRadius || 0;
+    },
+    
+    recalculateBoundingRadius: function() {
+      var boundingRadius = null;
+      var i, j;
+      for (i = 0; i < this.objects.length; i++) {
+        j = vec3.length(this.objects[i].camera.getPosition()) + this.objects[i].getBoundingSphereRadius();
+        if (boundingRadius == null || boundingRadius < j)
+          boundingRadius = j;
+      }
+      this.boundingRadius = boundingRadius = boundingRadius || 0;
+      
+      for (i = 0; i < this._lights.length; i++)
+        this._lights[i].boundingRadius = boundingRadius;
     },
     
     enable: function() { this.enabled = true; },
@@ -37,60 +89,21 @@ Jax.Scene.LightManager = (function() {
       return result;
     },
     
-    illuminate: function(context, objects, options) {
+    illuminate: function(context, options) {
+      // used by individual light sources
       options = Jax.Util.normalizeOptions(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++) {
-        for (var j = 0; j < objects.length; j++) {
-          this._current_light = i;
-          options.model_index = j;
-          
-          /* 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;
-    },
-    
-    ambient: function(context, objects, options) {
-      options = Jax.Util.normalizeOptions(options, {});
-      
       for (var i = 0; i < this._lights.length; i++) {
         this._current_light = i;
-        for (var j = 0; j < objects.length; j++) {
-          options.model_index = j;
-          
-          /* 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);
-        }
-      }
-      delete this._current_light;
-    },
-    
-    updateShadowMaps: function(context, objects) {
-      var boundingRadius = null;
-      var i, j;
-      for (i = 0; i < objects.length; i++) {
-        j = vec3.length(objects[i].camera.getPosition()) + objects[i].getBoundingSphereRadius();
-        if (boundingRadius == null || boundingRadius < j)
-          boundingRadius = j;
+        this._lights[i].render(context, this.objects, options);
+        if (i == 0) this.context.glBlendFunc(GL_ONE, GL_ONE);
       }
-      boundingRadius = boundingRadius || 0;
       
-//      context.glPolygonOffset(1.1, 4.0);
-//      context.glPolygonOffset(2,2);
-//      context.glEnable(GL_POLYGON_OFFSET_FILL);
-      for (i = 0; i < this._lights.length; i++)
-        this._lights[i].updateShadowMap(context, boundingRadius, objects);
-//      context.glDisable(GL_POLYGON_OFFSET_FILL);
-//      context.glPolygonOffset(0.0, 0.0);
+      delete this._current_light;
     },
-    
+
     getDirection: function(index) { return this.getLight(index).getDirection(); },
     
     getPosition: function(index) { return this.getLight(index).getPosition(); },

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

@@ -49,6 +49,9 @@ Jax.Scene.LightSource = (function() {
       data.color.diffuse = Jax.Util.colorize(data.color.diffuse);
       data.color.specular= Jax.Util.colorize(data.color.specular);
       $super(data);
+      
+      var self = this;
+      this.camera.addEventListener('matrixUpdated', function() { self.invalidate(); });
 
       this.spotExponent = this.spot_exponent;
       delete this.spot_exponent;
@@ -125,13 +128,48 @@ Jax.Scene.LightSource = (function() {
       return this.shadowMatrix;
     },
     
+    registerCaster: function(object) {
+      var self = this;
+      function updated() { self.invalidate(); }
+      object.camera.addEventListener('matrixUpdated', updated);
+      this.invalidate();
+    },
+    
+    unregisterCaster: function(object) {
+      /* FIXME remove the shadowmap event listener from object's camera matrix */
+    },
+    
     isShadowcaster: function() { return this.shadowcaster; },
     
     getDPShadowNear: function() { setupProjection(this); return this.camera.projection.near; },
     
     getDPShadowFar: function() { setupProjection(this); return this.camera.projection.far; },
     
-    updateShadowMap: function(context, sceneBoundingRadius, objects) {
+    invalidate: function() { this.valid = false; },
+    
+    render: function(context, objects, options) {
+      if (!this.valid) {
+        var real_pass = context.current_pass;
+        /* shadowgen pass */
+        context.current_pass = Jax.Scene.SHADOWMAP_PASS;
+        this.updateShadowMap(context, this.boundingRadius, objects, options);
+        this.valid = true;
+        context.current_pass = real_pass;
+      }
+      
+      for (var j = 0; j < objects.length; j++) {
+        options.model_index = j;
+        
+        /* TODO optimization: see if objects[j] is even affected by this light (based on attenuation) */
+        if (objects[j].isLit()) // it could be unlit but still in array if it casts a shadow
+          objects[j].render(context, options);
+      }
+    },
+    
+    updateShadowMap: function(context, sceneBoundingRadius, objects, render_options) {
+      // we can't afford to taint the original options
+      render_options = Jax.Util.normalizeOptions(render_options, {});
+      
       setupProjection(this);
       
       var self = this;
@@ -163,6 +201,9 @@ Jax.Scene.LightSource = (function() {
         context.glPolygonOffset(2.0, 2.0);
         
         context.pushMatrix(function() {
+          render_options.direction = 1;
+          render_options.material = paraboloid_depthmap;
+          
           self.framebuffers[0].bind(context, function() {
             // front paraboloid
             self.framebuffers[0].viewport(context);
@@ -171,17 +212,19 @@ Jax.Scene.LightSource = (function() {
             mat4.set(context.getInverseViewMatrix(), sm);
             
             for (var i = 0; i < objects.length; i++) {
-              objects[i].render(context, {material:paraboloid_depthmap, direction:1});
+              objects[i].render(context, render_options);
             }
           });
 
+          render_options.direction = -1;
+          
           self.framebuffers[1].bind(context, function() {
             // back paraboloid
             self.framebuffers[1].viewport(context);
             context.glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
             context.loadViewMatrix(self.camera.getTransformationMatrix());
             for (var i = 0; i < objects.length; i++) {
-              objects[i].render(context, {material:paraboloid_depthmap,direction:-1});
+              objects[i].render(context, render_options);
             }
           });
   
@@ -197,6 +240,8 @@ Jax.Scene.LightSource = (function() {
         return;
       }
       
+      render_options.material = "depthmap";
+      
       this.framebuffers[0].bind(context, function() {
         self.framebuffers[0].viewport(context);
         context.glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -214,7 +259,7 @@ Jax.Scene.LightSource = (function() {
           context.glEnable(GL_POLYGON_OFFSET_FILL);
           context.glPolygonOffset(2.0, 2.0);
           for (var i = 0; i < objects.length; i++) {
-            objects[i].render(context, {material:'depthmap'});
+            objects[i].render(context, render_options);
           }
           context.glDisable(GL_POLYGON_OFFSET_FILL);
           context.glEnable(GL_BLEND);