jax 2.0.5 → 2.0.6

data/CHANGELOG

@@ -1,3 +1,27 @@
+* 2.0.6 *
+
+* Resolved issue #30: `Jax.Framebuffer#getTexture(context, index)` now returns texture
+  with index 0 if index was not given.
+
+* Resolved issue #43: Plugin models appear after app models in load order.
+
+* Minor improvements to `Jax.Framebuffer`
+
+* `Jax.Texture` data type can now be specified, for example, in apps which make use of
+  the OES_texture_float extension
+  
+* Resolved issue #38: `Jax.RouteSet` now underscores CamelCase routes.
+
+* `Jax.World#addLightSource()` now returns the light source that was added, just like
+  `Jax.World#addObject()` returns the object that was added.
+  
+* Resolved issue #46: Render errors when shadows are disabled, but shadowmapping is not
+
+* Resolved issue #47: Removing an object from the scene causes infinite recursion in light
+  manager
+
+
+
 * 2.0.5 *
 
 * Setting `shadowcaster` to `false` for a light source now has the expected result: it

data/features/rails/models.feature

@@ -0,0 +1,9 @@
+@rails
+Feature: Models
+
+  Scenario: Plugin models loaded first
+    Given file "app/assets/jax/models/person.js" contains "__feature_model_person"
+      And file "vendor/plugins/mine/app/assets/jax/models/human.js" contains "__feature_model_human"
+    When I visit "/assets/jax/application.js"
+    # Then show me the response
+    Then "__feature_model_human" should come before "__feature_model_person"

data/features/step_definitions/response_steps.rb

@@ -11,3 +11,7 @@ end
 Then /^the response should contain:$/ do |text|
   (!!page.body.to_s[text]).should be_true
 end
+
+Then /^"([^"]*)" should come before "([^"]*)"$/ do |first, second|
+  page.body.to_s.index(first).should be_less_than(page.body.to_s.index(second))
+end

data/features/support/numeric_matcher.rb

@@ -0,0 +1,26 @@
+module Matchers
+  class NumericMatcher
+    def initialize(expected, operation)
+      @expected, @operation = expected, operation
+    end
+    
+    def matches?(actual)
+      @actual = actual
+      @actual.respond_to?(@operation) ? actual.send(@operation, @expected) : false
+    end
+    
+    def failure_message
+      "Expected #{@actual.inspect} #{@operation} #{@expected.inspect}"
+    end
+    
+    def negative_failure_message
+      "Expected #{@actual.inspect} not #{@operation} #{@expected.inspect}"
+    end
+  end
+  
+  def be_less_than(other)
+    Matchers::NumericMatcher.new other, :<
+  end
+end
+
+World(Matchers)

data/lib/assets/javascripts/jax/core/util.js

@@ -18,6 +18,53 @@ Jax.Util = {
                     "a string representing a material in the Jax material registry");
   },
   
+  gsub: function(source, pattern, replacement) {
+    var match, result, submatch, _replacement;
+    if (!((pattern != null) && (replacement != null))) {
+      return source;
+    }
+    result = '';
+    while (source.length > 0) {
+      if ((match = source.match(pattern))) {
+        // handle \1, \2, etc in replacement string
+        _replacement = replacement;
+        while (submatch = _replacement.match(/\\(\d+)/)) {
+          _replacement = _replacement.replace('\\'+submatch[1], match[submatch[1]]);
+        }
+
+        result += source.slice(0, match.index);
+        result += _replacement;
+        source = source.slice(match.index + match[0].length);
+      } else {
+        result += source;
+        source = '';
+      }
+    }
+    return result;
+  },
+  
+  /**
+   * Jax.Util.underscore(word) -> String
+   * word (String): a String to be converted to underscore.
+   *
+   * Takes a String, which may be in CamelCase format, and returns
+   * the same string converted to underscored_format. Examples:
+   *
+   *     "HelloWorld" => "hello_world"
+   *     "Hello_World" => "hello_world"
+   *     "Hello" => "hello"
+   *
+   **/
+  underscore: function(word) {
+    word = Jax.Util.gsub(word, /::/, "\/");
+    word = Jax.Util.gsub(word, /([A-Z]+)([A-Z][a-z])/,'\\1_\\2');
+    word = Jax.Util.gsub(word, /([a-z\d])([A-Z])/,'\\1_\\2');
+
+    while (word.indexOf('-') != -1) word = word.replace('-', '_');
+
+    return word.toLowerCase();
+  },
+  
   /**
    * Jax.Util.decodePickingColor(red, green, blue, alpha) -> Number
    * 

data/lib/assets/javascripts/jax/mvc/model.js

@@ -282,6 +282,19 @@
       for (var id in resources)
         if (this.resources[id]) throw new Error("Duplicate resource ID: "+id);
         else this.resources[id] = resources[id];
+    },
+    
+    /**
+     * Jax.Model.removeAllResources() -> undefined
+     * 
+     * Removes all resources from this model. Existing instances won't be
+     * affected, but #find() will fail for any resource not re-added using
+     * #addResources().
+     *
+     * Useful for managing test cases, so that they can run in isolation.
+     **/
+    removeAllResources: function() {
+      this.resources = {};
     }
   };
   

data/lib/assets/javascripts/jax/mvc/route_set.js

@@ -66,7 +66,7 @@ Jax.RouteSet = (function() {
       var parts = path.split(/\//);
       var controller_name = parts[0];
 
-      this._map[controller_name.toLowerCase()] = controller;
+      this._map[Jax.Util.underscore(controller_name)] = controller;
 
       if (!Jax.views.exists(controller_name+"/index"))
         Jax.views.push(controller_name+"/index", function() {
@@ -107,7 +107,7 @@ Jax.RouteSet = (function() {
       var controller_name = parts[0];
       var action_name = parts[1] || "index";
       
-      var controller_class = this._map[controller_name.toLowerCase()];
+      var controller_class = this._map[Jax.Util.underscore(controller_name)];
       if (!controller_class || !controller_class.prototype)
         throw new Error("Route not recognized: '"+path+"' (controller not found)");
         

data/lib/assets/javascripts/jax/webgl/core/framebuffer.js

@@ -47,11 +47,12 @@ Jax.Framebuffer = (function() {
         format:GL_RGBA,
         width:width,
         height:height,
-        min_filter:GL_LINEAR,
-        mag_filter:GL_LINEAR,
-        wrap_s:GL_CLAMP_TO_EDGE,
-        wrap_t:GL_CLAMP_TO_EDGE,
-        generate_mipmap:false
+        min_filter:self.options.min_filter,
+        mag_filter:self.options.mag_filter,
+        wrap_s:self.options.wrap_s,
+        wrap_t:self.options.wrap_t,
+        generate_mipmap:self.options.generate_mipmap,
+        data_type: self.options.data_type
       };
       if (typeof(format) != "number") { texture_options = Jax.Util.normalizeOptions(format, texture_options); }
       else { texture_options.format = format; }
@@ -66,7 +67,13 @@ Jax.Framebuffer = (function() {
       attachment++;
     }
 
-    checkStatus(context, self);
+    try {
+      checkStatus(context, self);
+    } catch(e) {
+      // build failed, release all objects so user can (maybe) change options and try again
+      self.dispose(context);
+      throw e;
+    }
   }
   
   function checkStatus(context, self) {
@@ -101,6 +108,40 @@ Jax.Framebuffer = (function() {
   }
   
   return Jax.Class.create({
+    dispose: function(context) {
+      if (!this.handles) return;
+      
+      var handle = this.getHandle(context);
+      if (!handle) return;
+      
+      // handle.stencilbuffer, handle.depthbuffer, handle.depthstencilbuffer
+      if (handle.stencilbuffer) {
+        context.glDeleteRenderbuffer(handle.stencilbuffer);
+        delete handle.stencilbuffer;
+      }
+      if (handle.depthbuffer) {
+        context.glDeleteRenderbuffer(handle.depthbuffer);
+        delete handle.depthbuffer;
+      }
+      if (handle.depthstencilbuffer) {
+        context.glDeleteRenderbuffer(handle.depthstencilbuffer);
+        delete handle.depthstencilbuffer;
+      }
+      
+      // texture attachments
+      if (handle.textures) {
+        while (handle.textures.length > 0) {
+          handle.textures[0].dispose(context);
+          handle.textures.splice(0, 1);
+        }
+        delete handle.textures;
+      }
+      
+      // finally, delete the framebuffer itself
+      context.glDeleteFramebuffer(handle);
+      this.setHandle(context, null);
+    },
+    
     /**
      * new Jax.Framebuffer([options])
      * - options (Object): a generic object containing the following optional properties:
@@ -120,6 +161,15 @@ Jax.Framebuffer = (function() {
      *            framebuffer must have the same width. Defaults to 512.
      *   * height: the height of the render and color buffers. All render and color buffers for a given
      *             framebuffer must have the same height. Defaults to 512.
+     *
+     * The following options may also be present. If they are, they will be passed into Jax.Texture:
+     * 
+     *   * data_type: defaults to GL_UNSIGNED_BYTE
+     *   * min_filter: defaults to GL_LINEAR
+     *   * mag_filter: defaults to GL_LINEAR
+     *   * wrap_s: defaults to GL_CLAMP_TO_EDGE
+     *   * wrap_t: defaults to GL_CLAMP_TO_EDGE
+     *   * generate_mipmap: defaults to false
      *     
      **/
     initialize: function(options) {
@@ -127,7 +177,13 @@ Jax.Framebuffer = (function() {
         depth: false,
         stencil: false,
         width:512,
-        height:512
+        height:512,
+        data_type: GL_UNSIGNED_BYTE,
+        min_filter: GL_LINEAR,
+        mag_filter: GL_LINEAR,
+        wrap_s: GL_CLAMP_TO_EDGE,
+        wrap_t: GL_CLAMP_TO_EDGE,
+        generate_mipmap: false
       };
       if (!(options && (options.color || options.colors))) defaults.colors = [GL_RGBA];
       
@@ -151,12 +207,12 @@ Jax.Framebuffer = (function() {
      * For cube map framebuffers only, this will bind the specified cube map face to its color buffer position.
      * The faceEnum can be any of the following face enums:
      * 
-     *     0: GL_TEXTURE_CUBE_MAP_POSITIVE_X
-     *     1: GL_TEXTURE_CUBE_MAP_NEGATIVE_X
-     *     2: GL_TEXTURE_CUBE_MAP_POSITIVE_Y
-     *     3: GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
-     *     4: GL_TEXTURE_CUBE_MAP_POSITIVE_Z
-     *     5: GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
+     *     0 or GL_TEXTURE_CUBE_MAP_POSITIVE_X
+     *     1 or GL_TEXTURE_CUBE_MAP_NEGATIVE_X
+     *     2 or GL_TEXTURE_CUBE_MAP_POSITIVE_Y
+     *     3 or GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
+     *     4 or GL_TEXTURE_CUBE_MAP_POSITIVE_Z
+     *     5 or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
      * 
      * Example:
      * 
@@ -168,8 +224,7 @@ Jax.Framebuffer = (function() {
      *     });
      **/
     bindCubeFace: function(context, texIndex, faceEnum, callback) {
-      if (!this.getHandle(context)) build(context, this);
-      var texture = this.getHandle(context).textures[texIndex];
+      var texture = this.getTexture(context, texIndex);
       if (texture.options.target != GL_TEXTURE_CUBE_MAP)
         throw new Error("Texture at index "+texIndex+" is not a cube map!");
       
@@ -198,7 +253,7 @@ Jax.Framebuffer = (function() {
      *
      **/
     bind: function(context, callback) {
-      if (!this.getHandle(context)) build(context, this);
+      this.validate(context);
       context.glBindFramebuffer(GL_FRAMEBUFFER, this.getHandle(context));
       
       if (callback) {
@@ -209,6 +264,33 @@ Jax.Framebuffer = (function() {
       return this;
     },
     
+    /**
+     * Jax.Framebuffer#validate(context) -> Jax.Framebuffer
+     * - context (Jax.Context): the context to validate this framebuffer for
+     * 
+     * If this framebuffer's underlying WebGL counterpart has not yet been
+     * created, this method will do so. This method may raise errors per the
+     * WebGL specification if the framebuffer is not complete or compatible
+     * with the client hardware.
+     *
+     * After successful construction, or if the framebuffer has already been
+     * built, this framebuffer is returned.
+     **/
+    validate: function(context) {
+      if (!this.getHandle(context)) build(context, this);
+      return this;
+    },
+    
+    /**
+     * Jax.Framebuffer#countTextures(context) -> Jax.Framebuffer
+     * - context (Jax.Context): a WebGL context
+     *
+     * Returns the number of textures associated with this framebuffer.
+     **/
+    countTextures: function(context) {
+      return this.validate().getHandle(context).textures.length;
+    },
+    
     /**
      * Jax.Framebuffer#unbind(context) -> Jax.Framebuffer
      * - context (Jax.Context): the context to bind this framebuffer to
@@ -245,7 +327,8 @@ Jax.Framebuffer = (function() {
      * first texture available is returned.
      **/
     getTexture: function(context, index) {
-      return this.getHandle(context) && this.getHandle(context).textures[index];
+      this.validate(context);
+      return this.getHandle(context).textures[index || 0];
     },
     
     /**
@@ -311,6 +394,12 @@ Jax.Framebuffer = (function() {
      *
      * Returns this instance of Jax.Framebuffer.
      **/
-    setHandle: function(context, handle) { this.handles[context.id] = handle; return this; }
+    setHandle: function(context, handle) {
+      if (handle)
+        this.handles[context.id] = handle;
+      else if (this.handles[context.id])
+        delete this.handles[context.id];
+      return this;
+    }
   });
 })();

data/lib/assets/javascripts/jax/webgl/scene/light_manager.js

@@ -17,6 +17,7 @@ Jax.Scene.LightManager = (function() {
     },
     
     removeObject: function(obj) {
+      // if obj is a number, remove that index
       if (this.objects[obj]) {
         var o = this.objects[obj];
         this.objects.splice(obj, 1);
@@ -26,9 +27,10 @@ Jax.Scene.LightManager = (function() {
         this.recalculateBoundingRadius();
         return o;
       }
+      // ...if it's not, find its index and remove it.
       for (var i = 0; i < this.objects.length; i++)
         if (this.objects[i] == obj)
-          return this.removeObject(obj);
+          return this.removeObject(i);
     },
     
     getShadowCasters: function() {

data/lib/assets/javascripts/jax/webgl/texture.js

@@ -80,10 +80,10 @@ Jax.Texture = (function() {
       
       function ti2d(glEnum) {
         try {
-          context.glTexImage2D(glEnum, 0, format, width, height, 0, format, GL_UNSIGNED_BYTE, null);
+          context.glTexImage2D(glEnum, 0, format, width, height, 0, format, data_type, null);
         } catch (e) {
           var tex = new Uint8Array(width*height*Jax.Util.sizeofFormat(format));
-          context.glTexImage2D(glEnum, 0, format, width, height, 0, format, GL_UNSIGNED_BYTE, tex);
+          context.glTexImage2D(glEnum, 0, format, width, height, 0, format, data_type, tex);
         }
       }
       
@@ -391,7 +391,7 @@ Jax.Texture = (function() {
      * to dispose the texture for all contexts except for one).
      **/
     dispose: function(context) {
-      context.glDeleteTexture(getHandle(context));
+      context.glDeleteTexture(this.getHandle(context));
       delete this.handles[context.id];
     },
     

data/lib/assets/javascripts/jax/webgl/world.js

@@ -31,7 +31,7 @@ Jax.World = (function() {
      *
      * Adds the light to the world and then returns the light itself unchanged.
      **/
-    addLightSource: function(light)   { this.lighting.add(light); },
+    addLightSource: function(light)   { this.lighting.add(light); return light; },
     
     /**
      * Jax.World#addObject(object) -> Jax.Model

data/lib/assets/javascripts/shaders/shadow_map/material.js

@@ -4,21 +4,26 @@ Jax.Material.ShadowMap = Jax.Class.create(Jax.Material, {
   },
   
   setVariables: function(context, mesh, options, vars) {
+    var light = context.world.lighting.getLight();
+    var shadowmap_enabled = light.isShadowMapEnabled();
+    
     vars.set({
       DP_SHADOW_NEAR: 0.1, //c.world.lighting.getLight().getDPShadowNear() || 0.1;}},
       DP_SHADOW_FAR: 500,//c.world.lighting.getLight().getDPShadowFar() || 500;}},
           
       SHADOWMAP_PCF_ENABLED: false,
-      SHADOWMAP_MATRIX: context.world.lighting.getLight().getShadowMatrix(),
-      SHADOWMAP_ENABLED: context.world.lighting.getLight().isShadowMapEnabled()
+      SHADOWMAP_ENABLED: shadowmap_enabled
     });
     
-    var light = context.world.lighting.getLight(), front, back;
+    if (shadowmap_enabled) {
+      vars.set({SHADOWMAP_MATRIX: light.getShadowMatrix()});
+      var front, back;
 
-    front = light.getShadowMapTextures(context)[0];
-    back  = light.getShadowMapTextures(context)[1];
-    
-    if (front) vars.texture('SHADOWMAP0', front, context);
-    if (back)  vars.texture('SHADOWMAP1', back,  context);
+      front = light.getShadowMapTextures(context)[0];
+      back  = light.getShadowMapTextures(context)[1];
+
+      if (front) vars.texture('SHADOWMAP0', front, context);
+      if (back)  vars.texture('SHADOWMAP1', back,  context);
+    }
   }
 });

data/lib/jax/directive_processor.rb

@@ -25,6 +25,8 @@ module Jax
     end
     
     def process_require_everything_matching_directive(subpath)
+      # TODO this method is very dirty. Make it prettier.
+      
       # depend on any base subpath directories that may exist
       # this should pick up any new shaders as they are added to app
       context.environment.paths.each do |base_path|
@@ -33,7 +35,6 @@ module Jax
       end
       
       files = []
-      # context.environment.each_logical_path do |path|
       context.environment.each_file do |path|
         # skip all.js and skip manifest.yml
         path = path.to_s
@@ -42,12 +43,20 @@ module Jax
         logical_path = attrs.logical_path
         if logical_path[/^#{Regexp::escape subpath}/]
           # skip if logical path has already been processed
-          next if files.include?(logical_path)
-          files << logical_path
-          path = context.resolve(logical_path).to_s
-          process_require_directive path
+          ary = [ path, logical_path ]
+          files << ary unless files.include?(ary)
         end
       end
+      
+      # order files so they appear in order: plugin files, then app files.
+      plugins_path = 'vendor/plugins'
+      numerize = proc { |a| a[plugins_path] ? 0 : 1 }
+      files.sort! { |a, b| numerize.call(a[0]) <=> numerize.call(b[0]) }
+
+      # require files, now that they are in order
+      files.each do |(path, logical_path)|
+        process_require_directive path
+      end
     end
   end
 end

data/lib/jax/version.rb

@@ -2,7 +2,7 @@ module Jax
   module Version
     MAJOR = 2
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
     BUILD = nil
     STRING = BUILD ? [MAJOR, MINOR, PATCH, BUILD].join(".") : [MAJOR, MINOR, PATCH].join(".")
   end

data/spec/generators/jax/scaffold_generator_spec.rb

@@ -1,6 +1,27 @@
 require 'spec_helper'
 
 describe 'jax:scaffold' do
+  with_args "test_breaker" do
+    it "should camelize model name" do
+      subject.should generate("app/assets/jax/models/test_breaker.js.coffee") { |f|
+        f.should =~ /TestBreaker/
+      }
+    end
+    
+    it "should camelize controller name" do
+      subject.should generate("app/assets/jax/controllers/test_breaker_controller.js.coffee") { |f|
+        f.should =~ /TestBreaker/
+      }
+    end
+    
+    it "should camelize names in controller spec" do
+      subject.should generate("spec/javascripts/jax/controllers/test_breaker_controller_spec.js.coffee") { |f|
+        f.should =~ /describe "TestBreakerController"/
+        f.should =~ /redirectTo "test_breaker/
+      }
+    end
+  end
+  
   with_args "dungeon" do
     it "should generate dungeon model" do
       subject.should generate("app/assets/jax/models/dungeon.js.coffee")

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

@@ -1,4 +1,15 @@
 describe("Jax.Util", function() {
+  describe("underscore", function() {
+    it("should work", function() {
+      expect(Jax.Util.underscore("Product")).toEqual("product");
+      expect(Jax.Util.underscore("SpecialGuest")).toEqual("special_guest");
+      expect(Jax.Util.underscore("ApplicationController")).toEqual("application_controller");
+      expect(Jax.Util.underscore("Area51Controller")).toEqual("area51_controller");
+      expect(Jax.Util.underscore("HTMLTidy")).toEqual('html_tidy');
+      expect(Jax.Util.underscore('HTMLTidyGenerator')).toEqual('html_tidy_generator');
+    });
+  });
+  
   describe("vectorize", function() {
     var data;
     

data/spec/javascripts/jax/mvc/route_set_spec.js

@@ -5,6 +5,17 @@ describe("Jax.RouteSet", function() {
   
   beforeEach(function() { map = Jax.routes; map.clear(); });
   
+  describe("when a CamelCase controller name is given", function() {
+    beforeEach(function() {
+      controller_class = Jax.Controller.create("TestBreaker", {index: function() { }});
+    });
+    
+    it("should recognize underscored route names", function() {
+      var route = map.recognizeRoute("test_breaker");
+      expect(route.controller).toEqual(controller_class);
+    });
+  });
+  
   describe("when a controller name is given during controller definition", function() {
     beforeEach(function() {
       controller_class = Jax.Controller.create("welcome", {index: function() { }});

data/spec/javascripts/jax/webgl/framebuffer_spec.js

@@ -1,6 +1,13 @@
 describe("Framebuffer", function() {
   var buf;
   
+  it("should return the first texture if index not given (issue #30)", function() {
+    // https://github.com/sinisterchipmunk/jax/issues/30
+    buf = new Jax.Framebuffer();
+    expect(buf.getTexture(SPEC_CONTEXT)).toBeTruthy();
+    expect(buf.getTexture(SPEC_CONTEXT)).toBe(buf.getTexture(SPEC_CONTEXT, 0));
+  });
+  
   describe("with no attachments", function() {
     beforeEach(function() { buf = new Jax.Framebuffer(); });
     

data/spec/javascripts/jax/webgl/lighting_spec.js

@@ -3,11 +3,12 @@ describe("LightManager", function() {
   
   describe("when a light resource is defined with shadowcasting disabled", function() {
     beforeEach(function() {
+      LightSource.removeAllResources();
       LightSource.addResources({"__test_shadowcast_disabled":{
         shadowcaster:!1,enabled:!0,
         position:{x:-20,y:0,z:0},
-        type:"POINT_LIGHT",
-        attenuation:{constant:0,linear:1,quadratic:0},
+        type:"DIRECTIONAL_LIGHT",
+        attenuation:{constant:1,linear:0,quadratic:0},
         color:{ambient:{red:.15,green:.15,blue:.15,alpha:1},
         diffuse:{red:.33,green:.1843137254901961,blue:.12679738562091503,alpha:1},
         specular:{red:0,green:0,blue:0,alpha:0}}}});
@@ -16,6 +17,17 @@ describe("LightManager", function() {
     it("should not be a shadow caster", function() {
       expect(LightSource.find("__test_shadowcast_disabled").isShadowCaster()).toBeFalsy();
     });
+    
+    it("should not cause render errors with materials that have shadow mapping enabled", function() {
+      var model = new Jax.Model({position:[-20,0,0], lit: true, shadow_caster: false, mesh: new Jax.Mesh.Cube()});
+      model.mesh.lit = true;
+      model.mesh.default_material = new Jax.Material({ layers:[ {type:"Lighting"} ] });
+      model.mesh.default_material.addLayer(new Jax.Material.ShadowMap());
+      
+      SPEC_CONTEXT.world.addLightSource("__test_shadowcast_disabled");
+      SPEC_CONTEXT.world.addObject(model);
+      SPEC_CONTEXT.world.render();
+    });
   });
   
   describe("when more than 1 light source is active", function() {
@@ -66,7 +78,24 @@ describe("LightManager", function() {
   });
   
   describe("by default", function() {
+    var model;
     beforeEach(function() { mgr = new Jax.Scene.LightManager(); });
+    
+    describe("after adding an object", function() {
+      beforeEach(function() { mgr.addObject(model = new Jax.Model({shadow_caster:true})); });
+      
+      it("should be in the shadowcasters list", function() {
+        expect(mgr.getShadowCasters().length).toEqual(1);
+      });
+      
+      describe("removing the object", function() {
+        beforeEach(function() { mgr.removeObject(model); });
+        
+        it("should be gone", function() {
+          expect(mgr.getShadowCasters().length).toEqual(0);
+        });
+      });
+    });
   
     it("should not be enabled", function() {
       expect(mgr.isEnabled()).toBeFalsy();

data/spec/javascripts/jax/world_spec.js

@@ -14,6 +14,16 @@ describe("Jax.World", function() {
     world = SPEC_CONTEXT.world;
   });
   
+  it("should return objects added to world", function() {
+    var obj = new (Jax.Model.create({one:1}))();
+    expect(world.addObject(obj)).toBe(obj);
+  });
+  
+  it("should return light sources added to world", function() {
+    var lite = new Jax.Scene.LightSource();
+    expect(world.addLightSource(lite)).toBe(lite);
+  });
+  
   describe("picking", function() {
     var at, ofront, otopleft, otopright, obottomleft, obottomright, mesh;
     

data/spec/javascripts/node_helper.js

@@ -1,51 +1,56 @@
-var jsdom = require('jsdom'),
-    doc   = jsdom.jsdom('<html><body></body></html>');
+// This file's name matches the regexp used to load Jasmine helpers,
+// so we need to code a special case to avoid causing errors.
+
+if (typeof(require) != 'undefined') {
+  var jsdom = require('jsdom'),
+      doc   = jsdom.jsdom('<html><body></body></html>');
     
-global.document = doc;
-global.window = doc.createWindow();
+  global.document = doc;
+  global.window = doc.createWindow();
 
-global.ENV = global.ENV || process.env;
-global.ENV['SILENCED'] = '1';
+  global.ENV = global.ENV || process.env;
+  global.ENV['SILENCED'] = '1';
 
-/* TODO remove this when node-canvas supports webgl */
-var canvas = document._elementBuilders.canvas;
-document._elementBuilders.canvas = function(document, tagName) {
-  var element = canvas.call(this, document, tagName);
-  var getContext = element.getContext;
+  /* TODO remove this when node-canvas supports webgl */
+  var canvas = document._elementBuilders.canvas;
+  document._elementBuilders.canvas = function(document, tagName) {
+    var element = canvas.call(this, document, tagName);
+    var getContext = element.getContext;
   
-  element.getContext = function(name) {
-    if (name == "webgl" || name == "experimental-webgl") {
-      return require("./node/mocks/webgl.js").context();
-    } else {
-      return getContext.call(this, name);
-    }
-  };
+    element.getContext = function(name) {
+      if (name == "webgl" || name == "experimental-webgl") {
+        return require("./node/mocks/webgl.js").context();
+      } else {
+        return getContext.call(this, name);
+      }
+    };
   
-  element.width = element.height = 100;
+    element.width = element.height = 100;
   
-  return element;
-};
+    return element;
+  };
 
-// mock navigator
-global.navigator = {
-  userAgent: 'firefox'
-};
+  // mock navigator
+  global.navigator = {
+    userAgent: 'firefox'
+  };
 
-global.Image = global.Image || function() {
-  var src;
+  global.Image = global.Image || function() {
+    var src;
   
-  this.__defineGetter__("src", function() {
-    return src;
-  });
+    this.__defineGetter__("src", function() {
+      return src;
+    });
   
-  this.__defineSetter__("src", function(s) {
-    src = s;
-    if (this.onload) this.onload();
-    return src;
-  });
-};
+    this.__defineSetter__("src", function(s) {
+      src = s;
+      if (this.onload) this.onload();
+      return src;
+    });
+  };
 
-global.Jax = require("../../tmp/jax.js").Jax;
+  global.Jax = require("../../tmp/jax.js").Jax;
 
-require("./helpers/jax_spec_environment_helper.js");
-setupJaxSpecContext();
+  require("./helpers/jax_spec_environment_helper.js");
+  setupJaxSpecContext();
+} // if (typeof(require) != 'undefined')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jax
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000Z
+date: 2011-12-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153721020 !ruby/object:Gem::Requirement
+  requirement: &2153610220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153721020
+  version_requirements: *2153610220
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2153720420 !ruby/object:Gem::Requirement
+  requirement: &2153609620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *2153720420
+  version_requirements: *2153609620
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2153719960 !ruby/object:Gem::Requirement
+  requirement: &2153609040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153719960
+  version_requirements: *2153609040
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153719480 !ruby/object:Gem::Requirement
+  requirement: &2153608480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153719480
+  version_requirements: *2153608480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153718920 !ruby/object:Gem::Requirement
+  requirement: &2153593920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153718920
+  version_requirements: *2153593920
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &2153718340 !ruby/object:Gem::Requirement
+  requirement: &2153593380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153718340
+  version_requirements: *2153593380
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &2153717740 !ruby/object:Gem::Requirement
+  requirement: &2153592720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.7
   type: :development
   prerelease: false
-  version_requirements: *2153717740
+  version_requirements: *2153592720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153717260 !ruby/object:Gem::Requirement
+  requirement: &2153592180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *2153717260
+  version_requirements: *2153592180
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2153716680 !ruby/object:Gem::Requirement
+  requirement: &2153591580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153716680
+  version_requirements: *2153591580
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2153716180 !ruby/object:Gem::Requirement
+  requirement: &2153591000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153716180
+  version_requirements: *2153591000
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: &2153715720 !ruby/object:Gem::Requirement
+  requirement: &2153590400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.2.3
   type: :development
   prerelease: false
-  version_requirements: *2153715720
+  version_requirements: *2153590400
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &2153715120 !ruby/object:Gem::Requirement
+  requirement: &2153589820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 2.9.1
   type: :development
   prerelease: false
-  version_requirements: *2153715120
+  version_requirements: *2153589820
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153714620 !ruby/object:Gem::Requirement
+  requirement: &2153589220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153714620
+  version_requirements: *2153589220
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &2153714240 !ruby/object:Gem::Requirement
+  requirement: &2153588720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153714240
+  version_requirements: *2153588720
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &2153713680 !ruby/object:Gem::Requirement
+  requirement: &2153588060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153713680
+  version_requirements: *2153588060
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2153713040 !ruby/object:Gem::Requirement
+  requirement: &2153587440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: '4.2'
   type: :development
   prerelease: false
-  version_requirements: *2153713040
+  version_requirements: *2153587440
 - !ruby/object:Gem::Dependency
   name: w3c_validators
-  requirement: &2153712580 !ruby/object:Gem::Requirement
+  requirement: &2153586860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *2153712580
+  version_requirements: *2153586860
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &2153712120 !ruby/object:Gem::Requirement
+  requirement: &2153586280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 1.4.9
   type: :development
   prerelease: false
-  version_requirements: *2153712120
+  version_requirements: *2153586280
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2153711500 !ruby/object:Gem::Requirement
+  requirement: &2153584940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,7 +219,7 @@ dependencies:
         version: 2.0.11
   type: :development
   prerelease: false
-  version_requirements: *2153711500
+  version_requirements: *2153584940
 description: ! "\n    Framework for creating rich WebGL-enabled applications using
   JavaScript and Ruby.\n    Can be used stand-alone to create static JavaScript documents,
   or integrated\n    seamlessly with Ruby on Rails to build dynamic WebGL applications.\n
@@ -259,6 +259,7 @@ files:
 - bin/jax
 - config.ru
 - config/routes.rb
+- features/rails/models.feature
 - features/rails/resources.feature
 - features/rails/shaders.feature
 - features/rails/specs.feature
@@ -268,6 +269,7 @@ files:
 - features/step_definitions/runtime.rb
 - features/step_definitions/web_steps.rb
 - features/support/env.rb
+- features/support/numeric_matcher.rb
 - features/support/paths.rb
 - features/support/rails_environment.rb
 - features/support/selectors.rb
@@ -646,7 +648,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2586210584584297927
+      hash: 1570841926271225879
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -655,7 +657,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2586210584584297927
+      hash: 1570841926271225879
 requirements: []
 rubyforge_project: jax
 rubygems_version: 1.8.10
@@ -664,6 +666,7 @@ specification_version: 3
 summary: Framework for creating rich WebGL-enabled applications using JavaScript and
   Ruby
 test_files:
+- features/rails/models.feature
 - features/rails/resources.feature
 - features/rails/shaders.feature
 - features/rails/specs.feature
@@ -673,6 +676,7 @@ test_files:
 - features/step_definitions/runtime.rb
 - features/step_definitions/web_steps.rb
 - features/support/env.rb
+- features/support/numeric_matcher.rb
 - features/support/paths.rb
 - features/support/rails_environment.rb
 - features/support/selectors.rb