jax 2.0.8 → 2.0.9

data/.travis.yml

@@ -19,3 +19,15 @@ rvm:
 #   - sh -e /etc/init.d/xvfb start
 
 env: "SKIP_WEBGL=1 "
+
+# JRuby and RBX are not yet officially supported,
+# until failing dependencies work properly or are
+# no longer depended upon.
+matrix:
+  allow_failures:
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-head
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
+

data/CHANGELOG

@@ -1,3 +1,9 @@
+* 2.0.9 *
+
+* Resolved issue #59: Jax.Mesh.Cube should update its data when any of its faces change
+
+
+
 * 2.0.8 *
 
 * Resolved issue #55: bin/jax should not fail within spaced paths

data/lib/assets/javascripts/jax/builtin/meshes/cube.js

@@ -30,26 +30,40 @@ Jax.Mesh.Cube = Jax.Class.create(Jax.Mesh, {
     this.draw_mode = GL_TRIANGLES;
     $super(options);
     
+    var self = this;
+    /* TODO for performance, only update data that has actually changed */
+    var dispose = function() { self.dispose(); };
+    var refresh = function() { self.dispose(); };
     var w = options.width, h = options.height, d = options.depth;
-    this.sides = {};
+    this.left = new Jax.Model({mesh: new Jax.Mesh.Quad(d, h)});
+    this.left.camera.reorient([-1,0,0], [-w/2,0,0]);
+    this.left.mesh.addEventListener("color_changed", dispose);
+    this.left.camera.addEventListener("updated", refresh);
 
-    this.sides.left = new Jax.Model({mesh: new Jax.Mesh.Quad(d, h)});
-    this.sides.left.camera.reorient([-1,0,0], [-w/2,0,0]);
+    this.right = new Jax.Model({mesh: new Jax.Mesh.Quad(d, h)});
+    this.right.camera.reorient([1,0,0], [w/2,0,0]);
+    this.right.mesh.addEventListener("color_changed", dispose);
+    this.right.camera.addEventListener("updated", refresh);
 
-    this.sides.right = new Jax.Model({mesh: new Jax.Mesh.Quad(d, h)});
-    this.sides.right.camera.reorient([1,0,0], [w/2,0,0]);
+    this.front = new Jax.Model({mesh: new Jax.Mesh.Quad(w, h)});
+    this.front.camera.reorient([0,0,1], [0,0,d/2]);
+    this.front.mesh.addEventListener("color_changed", dispose);
+    this.front.camera.addEventListener("updated", refresh);
 
-    this.sides.front = new Jax.Model({mesh: new Jax.Mesh.Quad(w, h)});
-    this.sides.front.camera.reorient([0,0,1], [0,0,d/2]);
+    this.back = new Jax.Model({mesh: new Jax.Mesh.Quad(w, h)});
+    this.back.camera.reorient([0,0,-1], [0,0,-d/2]);
+    this.back.mesh.addEventListener("color_changed", dispose);
+    this.back.camera.addEventListener("updated", refresh);
 
-    this.sides.back = new Jax.Model({mesh: new Jax.Mesh.Quad(w, h)});
-    this.sides.back.camera.reorient([0,0,-1], [0,0,-d/2]);
+    this.top = new Jax.Model({mesh: new Jax.Mesh.Quad(w, d)});
+    this.top.camera.reorient([0,1,0], [0,h/2,0]);
+    this.top.mesh.addEventListener("color_changed", dispose);
+    this.top.camera.addEventListener("updated", refresh);
 
-    this.sides.top = new Jax.Model({mesh: new Jax.Mesh.Quad(w, d)});
-    this.sides.top.camera.reorient([0,1,0], [0,h/2,0]);
-
-    this.sides.bottom = new Jax.Model({mesh: new Jax.Mesh.Quad(w, d)});
-    this.sides.bottom.camera.reorient([0,-1,0], [0,-h/2,0]);
+    this.bottom = new Jax.Model({mesh: new Jax.Mesh.Quad(w, d)});
+    this.bottom.camera.reorient([0,-1,0], [0,-h/2,0]);
+    this.bottom.mesh.addEventListener("color_changed", dispose);
+    this.bottom.camera.addEventListener("updated", refresh);
   },
   
   init: function(verts, colors, texes, norms) {
@@ -57,11 +71,13 @@ Jax.Mesh.Cube = Jax.Class.create(Jax.Mesh, {
     // local transformation, which includes the position offset and direction.
     
     var matrix;
-    for (var i in this.sides)
+    var sides = ['left', 'right', 'top', 'bottom', 'front', 'back'];
+    for (var i = 0; i < sides.length; i++)
     {
       var qverts = [], qcolor = [], qtex = [], qnorm = [];
-      this.sides[i].mesh.init(qverts, qcolor, qtex, qnorm, []);
-      matrix = this.sides[i].camera.getTransformationMatrix();
+      this[sides[i]].mesh.init(qverts, qcolor, qtex, qnorm, []);
+      qcolor = this[sides[i]].mesh.getColorBuffer().js;
+      matrix = this[sides[i]].camera.getTransformationMatrix();
 
       // unfortunately quads are rendered in triangle strips; we need to translate that
       // into triangles, because there's no support at this time for ending one triangle

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

@@ -221,6 +221,22 @@
         return this.lit;
       },
 
+      /**
+       * Jax.Mesh#setColor(r, g, b, a) -> Jax.Model
+       * Jax.Mesh#setColor(colors) -> Jax.Model
+       *
+       * Sets the color to the specified RGBA color, or an array containing
+       * RGBA colors. This is method simply delegated into `this.mesh`.
+       *
+       * Returns itself.
+       *
+       **/
+      setColor: function(a, b, c, d) {
+        if (arguments.length > 1) this.mesh.setColor(a, b, c, d);
+        else this.mesh.setColor(a);
+        return this;
+      },
+
       /**
        * Jax.Model#inspect() -> String
        * 

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

@@ -1,12 +1,13 @@
 //= require "jax/webgl/core"
+//= require "jax/webgl/core/events"
 //= require_self
 //= require "jax/webgl/mesh/tangent_space"
 //= require "jax/webgl/mesh/support"
 //= require "jax/webgl/mesh/normals"
 
-
 /**
  * class Jax.Mesh
+ * includes Jax.Events.Methods
  * 
  * Example:
  * 
@@ -217,6 +218,7 @@ Jax.Mesh = (function() {
       }
 
       colorBuffer.refresh();
+      this.fireEvent('color_changed');
       return this;
     },
 
@@ -438,3 +440,5 @@ Jax.Mesh = (function() {
     }
   });
 })();
+
+Jax.Mesh.addMethods(Jax.Events.Methods);

data/lib/jax/version.rb

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

data/spec/javascripts/helpers/jax_spec_helper.js

@@ -63,10 +63,19 @@ beforeEach(function() {
   }
 
   this.addMatchers({
-    toBePlaying: function(expectedSong) {
-      var player = this.actual;
-      return player.currentlyPlayingSong === expectedSong
-          && player.isPlaying;
+    toIncludeSubset: function(subset) {
+      for (var i = 0; i < this.actual.length; i++) {
+        if (i+subset.length >= this.actual.length) return false;
+        
+        var found = true;
+        for (var j = 0; j < subset.length; j++) {
+          if (this.actual[i+j] != subset[j])
+            found = false;
+        }
+        if (found) return true;
+      }
+      
+      return false;
     },
     
     toBeKindOf: function(expectedKlass) {

data/spec/javascripts/jax/builtin/meshes/cube_spec.js.coffee

@@ -0,0 +1,39 @@
+describe "Cube", ->
+  cube = null
+  verts = colors = texes = norms = null
+  
+  beforeEach ->
+    [verts, colors, texes, norms] = [[], [], [], []]
+    cube = new Jax.Mesh.Cube()
+  
+  it "should build successfully", ->
+    cube.init verts, colors, texes, norms
+  
+  it "should default all colors to white", ->
+    cube.init verts, colors, texes, norms
+    expect(colors).toEqualVector [
+      1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, # side 1
+      1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, # side 2
+      1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, # side 3
+      1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, # side 4
+      1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, # side 5
+      1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, # side 6
+    ]
+  
+  it "should allow altering of face color prior to build", ->
+    cube.left.setColor 1, 0, 0, 1
+    colors = cube.getColorBuffer().js;
+    expect(colors).toIncludeSubset([1, 0, 0, 1]);
+    
+  it "should allow altering of face color after build", ->
+    cube.getColorBuffer();
+    cube.left.setColor 1, 0, 0, 1
+    colors = cube.getColorBuffer().js;
+    expect(colors).toIncludeSubset([1, 0, 0, 1]);
+    
+  describe "when a side has been changed", ->
+    it "should update its vertices", ->
+      cube.getColorBuffer();
+      cube.left.camera.setPosition([10, 10, 10]);
+      expect(cube.getVertexBuffer().js).toIncludeSubset([10, 9.5, 9.5]);
+      

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jax
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000Z
+date: 2012-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160774320 !ruby/object:Gem::Requirement
+  requirement: &2157372880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2160774320
+  version_requirements: *2157372880
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2160773480 !ruby/object:Gem::Requirement
+  requirement: &2157372260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *2160773480
+  version_requirements: *2157372260
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2160772640 !ruby/object:Gem::Requirement
+  requirement: &2157371460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *2160772640
+  version_requirements: *2157371460
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2160771880 !ruby/object:Gem::Requirement
+  requirement: &2157370820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *2160771880
+  version_requirements: *2157370820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160770860 !ruby/object:Gem::Requirement
+  requirement: &2157370220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2160770860
+  version_requirements: *2157370220
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &2160769880 !ruby/object:Gem::Requirement
+  requirement: &2157369640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2160769880
+  version_requirements: *2157369640
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &2160769080 !ruby/object:Gem::Requirement
+  requirement: &2157369060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2160769080
+  version_requirements: *2157369060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2160768260 !ruby/object:Gem::Requirement
+  requirement: &2157368500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2160768260
+  version_requirements: *2157368500
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2160767460 !ruby/object:Gem::Requirement
+  requirement: &2157367880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2160767460
+  version_requirements: *2157367880
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2160766660 !ruby/object:Gem::Requirement
+  requirement: &2157361040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2160766660
+  version_requirements: *2157361040
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: &2160765580 !ruby/object:Gem::Requirement
+  requirement: &2157360200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160765580
+  version_requirements: *2157360200
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &2160764460 !ruby/object:Gem::Requirement
+  requirement: &2157358480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2160764460
+  version_requirements: *2157358480
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2160763400 !ruby/object:Gem::Requirement
+  requirement: &2157357660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2160763400
+  version_requirements: *2157357660
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &2160762780 !ruby/object:Gem::Requirement
+  requirement: &2157357120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160762780
+  version_requirements: *2157357120
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &2160761760 !ruby/object:Gem::Requirement
+  requirement: &2157356060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2160761760
+  version_requirements: *2157356060
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2160760580 !ruby/object:Gem::Requirement
+  requirement: &2157355120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: '4.2'
   type: :development
   prerelease: false
-  version_requirements: *2160760580
+  version_requirements: *2157355120
 - !ruby/object:Gem::Dependency
   name: w3c_validators
-  requirement: &2160759660 !ruby/object:Gem::Requirement
+  requirement: &2157354260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *2160759660
+  version_requirements: *2157354260
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &2160758760 !ruby/object:Gem::Requirement
+  requirement: &2157353660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 1.4.9
   type: :development
   prerelease: false
-  version_requirements: *2160758760
+  version_requirements: *2157353660
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2160757900 !ruby/object:Gem::Requirement
+  requirement: &2157353000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,7 +219,7 @@ dependencies:
         version: 2.0.11
   type: :development
   prerelease: false
-  version_requirements: *2160757900
+  version_requirements: *2157353000
 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
@@ -468,7 +468,7 @@ files:
 - spec/javascripts/helpers/jasmine_webgl_helper.js
 - spec/javascripts/helpers/jax_spec_environment_helper.js
 - spec/javascripts/helpers/jax_spec_helper.js
-- spec/javascripts/jax/builtin/meshes/cube_spec.js
+- spec/javascripts/jax/builtin/meshes/cube_spec.js.coffee
 - spec/javascripts/jax/builtin/meshes/plane_spec.js
 - spec/javascripts/jax/builtin/meshes/quad_spec.js
 - spec/javascripts/jax/builtin/meshes/sphere_spec.js
@@ -648,7 +648,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3461560233530444624
+      hash: 2869810087449141519
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -657,7 +657,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3461560233530444624
+      hash: 2869810087449141519
 requirements: []
 rubyforge_project: jax
 rubygems_version: 1.8.10
@@ -717,7 +717,7 @@ test_files:
 - spec/javascripts/helpers/jasmine_webgl_helper.js
 - spec/javascripts/helpers/jax_spec_environment_helper.js
 - spec/javascripts/helpers/jax_spec_helper.js
-- spec/javascripts/jax/builtin/meshes/cube_spec.js
+- spec/javascripts/jax/builtin/meshes/cube_spec.js.coffee
 - spec/javascripts/jax/builtin/meshes/plane_spec.js
 - spec/javascripts/jax/builtin/meshes/quad_spec.js
 - spec/javascripts/jax/builtin/meshes/sphere_spec.js

data/spec/javascripts/jax/builtin/meshes/cube_spec.js

@@ -1,10 +0,0 @@
-describe("Cube", function() {
-  var cube;
-  
-  beforeEach(function() { cube = new Jax.Mesh.Cube() });
-  
-  it("should build successfully", function() {
-    var verts = [], colors = [], texes = [], norms = [];
-    cube.init(verts, colors, texes, norms);
-  });
-});