jax 0.0.0.2 → 0.0.0.3

data/lib/jax/generators/app/templates/public/javascripts/jax.js

@@ -6614,7 +6614,7 @@ Jax.Texture = (function() {
   }
 
   function isPoT(s) {
-    return s && (s & -s == s);
+    return s && (s & -s) == s;
   }
 
   function imageLoaded(self, isImageArray, img) {

data/lib/jax/version.rb

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

data/spec/javascripts/jax/builtin/materials/texture_spec.js

@@ -10,6 +10,27 @@ describe("Material segment 'texture'", function() {
   
   afterEach(function() { context.dispose(); });
   
+  it("should not replace options if image is POT", function() {
+    matr = new Jax.Material({"ambient":{"red":1.0,"green":1.0,"blue":1.0,"alpha":1.0},
+      "diffuse":{"red":1.0,"green":1.0,"blue":1.0,"alpha":1.0},
+      "specular":{"red":1.0,"green":1.0,"blue":1.0,"alpha":1.0},
+      "shininess":30,
+      "layers":[
+        {"type":"Lighting"},
+        {"type":"Texture","path":"/images/rock.png","flip_y":false,"scale_x":1.0,"scale_y":1.0,"generate_mipmap":true,"min_filter":"GL_NEAREST","mag_filter":"GL_NEAREST","mipmap_hint":"GL_DONT_CARE","format":"GL_RGBA","data_type":"GL_UNSIGNED_BYTE","wrap_s":"GL_REPEAT","wrap_t":"GL_REPEAT","premultiply_alpha":false,"colorspace_conversion":true},
+        {"type":"NormalMap","path":"/images/rockNormal.png","flip_y":false,"scale_x":1.0,"scale_y":1.0,"generate_mipmap":true,"min_filter":"GL_NEAREST","mag_filter":"GL_NEAREST","mipmap_hint":"GL_DONT_CARE","format":"GL_RGBA","data_type":"GL_UNSIGNED_BYTE","wrap_s":"GL_REPEAT","wrap_t":"GL_REPEAT","premultiply_alpha":false,"colorspace_conversion":true}
+      ]
+    });
+    
+    waitsFor(function() {
+      if (matr.layers[1].texture.loaded) {
+        expect(Jax.Util.enumName(matr.layers[1].texture.options.wrap_s)).toEqual("GL_REPEAT");
+        return true;
+      }
+      return false;
+    });
+  });
+  
   it("should compile successfully", function() {
     matr.addLayer(new Jax.Material.Texture(new Jax.Texture("/images/rss.png")));
     

data/src/jax/webgl/texture.js

@@ -11,7 +11,7 @@ Jax.Texture = (function() {
   }
   
   function isPoT(s) {
-    return s && (s & -s == s);
+    return s && (s & -s) == s;
   }
   
   function imageLoaded(self, isImageArray, img) {

metadata

@@ -2,7 +2,7 @@
 name: jax
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0.2
+  version: 0.0.0.3
 platform: ruby
 authors: 
 - Colin MacKenzie IV
@@ -636,7 +636,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1597188045016768330
+      hash: 2432223765413461543
       segments: 
       - 0
       version: "0"
@@ -645,7 +645,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1597188045016768330
+      hash: 2432223765413461543
       segments: 
       - 0
       version: "0"