RubyGems - jax - Versions diffs - 0.0.0.5 → 0.0.0.6 - Mend

jax 0.0.0.5 → 0.0.0.6

Files changed (71) hide show

data/CHANGELOG +26 -1
data/Rakefile +3 -1
data/builtin/shaders/picking/common.ejs +2 -0
data/builtin/shaders/picking/fragment.ejs +4 -0
data/builtin/shaders/picking/material.js +14 -0
data/builtin/shaders/picking/vertex.ejs +24 -0
data/lib/jax/generators/app/templates/public/javascripts/jax.js +289 -681
data/lib/jax/generators/app/templates/spec/javascripts/support/spec_layout.html.erb +55 -2
data/lib/jax/generators/shader/templates/common.ejs.tt +2 -2
data/lib/jax/packager/sprockets_template.rb +1 -4
data/lib/jax/routes.rb +3 -0
data/lib/jax/version.rb +1 -1
data/spec/example_app/app/controllers/noise_controller.js +37 -5
data/spec/example_app/app/controllers/picking_controller.js +32 -0
data/spec/example_app/app/helpers/picking_helper.js +3 -0
data/spec/example_app/app/models/blob.js +38 -0
data/spec/example_app/app/resources/blobs/default.yml +2 -0
data/spec/example_app/app/resources/materials/blob.yml +2 -2
data/spec/example_app/app/shaders/blob/common.ejs +8 -13
data/spec/example_app/app/shaders/blob/fragment.ejs +1 -1
data/spec/example_app/app/shaders/blob/material.js +15 -12
data/spec/example_app/app/shaders/blob/vertex.ejs +33 -8
data/spec/example_app/app/views/picking/index.js +4 -0
data/spec/example_app/config/routes.rb +1 -0
data/spec/example_app/spec/javascripts/controllers/picking_controller_spec.js +11 -0
data/spec/example_app/spec/javascripts/helpers/picking_helper_spec.js +12 -0
data/spec/example_app/spec/javascripts/models/blob_spec.js +11 -0
data/spec/example_app/spec/javascripts/support/spec_layout.html.erb +40 -2
data/spec/javascripts/jax/model_spec.js +10 -0
data/spec/javascripts/jax/world_spec.js +74 -1
data/spec/javascripts/shaders/preprocessor_spec.js +35 -0
data/src/constants.yml +1 -1
data/src/jax.js +30 -8
data/src/jax/anim_frame.js +6 -2
data/src/jax/builtin/meshes/cube.js +22 -1
data/src/jax/builtin/meshes/plane.js +27 -0
data/src/jax/builtin/meshes/quad.js +7 -1
data/src/jax/builtin/meshes/sphere.js +20 -1
data/src/jax/builtin/meshes/teapot.js +10 -0
data/src/jax/builtin/meshes/torus.js +18 -0
data/src/jax/compatibility.js +165 -2
data/src/jax/context.js +176 -9
data/src/jax/core.js +6 -3
data/src/jax/core/math.js +18 -3
data/src/jax/core/matrix_stack.js +4 -3
data/src/jax/core/util.js +15 -0
data/src/jax/events.js +67 -12
data/src/jax/geometry.js +5 -1
data/src/jax/geometry/plane.js +59 -5
data/src/jax/{controller.js → mvc/controller.js} +38 -0
data/src/jax/mvc/helper.js +35 -0
data/src/jax/mvc/model.js +301 -0
data/src/jax/{route_set.js → mvc/route_set.js} +0 -0
data/src/jax/{view.js → mvc/view.js} +6 -0
data/src/jax/{view_manager.js → mvc/view_manager.js} +1 -0
data/src/jax/noise.js +13 -0
data/src/jax/prototype/class.js +3 -0
data/src/jax/prototype/extensions.js +26 -8
data/src/jax/webgl/camera.js +6 -6
data/src/jax/webgl/core/framebuffer.js +4 -4
data/src/jax/webgl/material.js +16 -0
data/src/jax/webgl/mesh.js +19 -4
data/src/jax/webgl/scene/light_manager.js +8 -0
data/src/jax/webgl/scene/light_source.js +3 -3
data/src/jax/webgl/shader.js +4 -2
data/src/jax/webgl/shader_chain.js +1 -0
data/src/jax/webgl/world.js +157 -6
data/vendor/glmatrix/glMatrix.js +365 -408
metadata +32 -10
data/src/jax/helper.js +0 -8
data/src/jax/model.js +0 -163

data/lib/jax/generators/app/templates/spec/javascripts/support/spec_layout.html.erb CHANGED Viewed

@@ -28,15 +28,56 @@
       window.onload = function() {
         jasmineEnv.execute();
+        /*
+          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", "webgl-canvas");
         canvas.setAttribute("width", "600");
         canvas.setAttribute("height", "400");
         document.body.appendChild(canvas);
-        window.JAX_CONTEXT = new Jax.Context(canvas);
+        /*
+          Instantiate a Jax context.
+          Note that you can have more than one, though you usually won't need to do so.
+          Each context should be initialized with its own canvas element.
+         */
+        window.context = new Jax.Context(canvas);
+        /*
+          That's all there is to initializing a Jax context, if you have a root route.
+          If not, you'll need to point it at a Jax controller manually:
+         */
+        // context.redirect_to("controller_name/action_name");
+        /* Set up framerate monitoring */
+        function updateFramerateMessage() {
+          document.getElementById('jax_fps').innerHTML = parseInt(context.getFramesPerSecond());
+          document.getElementById('jax_ups').innerHTML = parseInt(context.getUpdatesPerSecond());
+        }
+        window.context.afterUpdate(function() { if (document.show_framerate) updateFramerateMessage(); });
       };
     })();
+    /*
+      helpers for the framerate links. Updating the DIV with framerates incurs a performance
+      hit, so it's disabled by default; enable it when you need it, leave it when you don't.
+    */
+    function showFramerate() {
+      document.show_framerate = true;
+      document.getElementById('jax_fpsups').style.display = 'inline';
+      document.getElementById('jax_showfps').style.display = "none";
+    }
+    function hideFramerate() {
+      document.show_Framerate = false;
+      context.disableFrameSpeedCalculations();
+      context.disableUpdateSpeedCalculations();
+      document.getElementById('jax_fpsups').style.display = "none";
+      document.getElementById('jax_showfps').style.display = "inline";
+    }
   </script>
   <% js_files.each do |js_file| %>
@@ -52,11 +93,23 @@
       background-color: #fff0f0;
       font-size:14pt;
     }
+    #jax_fpsups { display:none; }
+    #jax_fps { display:inline; }
+    #jax_ups { display:inline; }
   </style>
 </head>
 <body>
 <div id="jax_banner">
-  Jax
+  <!-- or we could use <%%=Jax::Version::STRING%> for the Rubygem version -->
+  Jax v<script type="text/javascript">document.write(Jax.VERSION);</script>
+  &rarr;
+  <a href="#" id="jax_showfps" onclick="showFramerate();return false;">Show Framerate</a>
+  <div id="jax_fpsups">
+    Frames per second: <div id="jax_fps">(calculating...)</div>
+    Updates per second: <div id="jax_ups">(calculating...)</div>
+    <a href="#" onclick="hideFramerate();return false;">Hide Framerate</a>
+  </div>
 </div>
 <div id="jasmine_content"></div>
 </body>

data/lib/jax/generators/shader/templates/common.ejs.tt CHANGED Viewed

@@ -5,8 +5,8 @@ shared uniform mat3 nMatrix;
 shared uniform mat4 mvMatrix, pMatrix;
 shared varying vec2 vTexCoords;
-shared varying vec3 vNormals;
-shared varying vec4 vColor;
+shared varying vec3 vNormal;
+shared varying vec4 vBaseColor;
 // If a variable isn't shared, it will be defined specifically for this shader.
 // If this shader is used twice in one materials, unshared variables will be

data/lib/jax/packager/sprockets_template.rb CHANGED Viewed

@@ -18,10 +18,7 @@ class Jax::Packager::SprocketsTemplate < Sprockets::SourceFile
           template << "//= require \"#{relative_path}\""
         end
       end
-      template.concat [
-        "if (Jax.doVersionCheck) Jax.doVersionCheck('#{Jax::Version::STRING}');",
-        "else alert('Your Jax gem version is newer than your Jax JavaScript library!\n\nRun `rake jax:update` to fix this.');"
-      ]
       template
     end
   end

data/lib/jax/routes.rb CHANGED Viewed

@@ -30,6 +30,9 @@ 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/version.rb CHANGED Viewed

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

data/spec/example_app/app/controllers/noise_controller.js CHANGED Viewed

@@ -1,18 +1,50 @@
 //= require "application_controller"
 var NoiseController = (function() {
+  var red, green, blue;
   return Jax.Controller.create("noise", ApplicationController, {
     index: function() {
-      var model = new Jax.Model({mesh:new Jax.Mesh.Sphere({material:Material.find("blob")})});
+      var model = new Blob();
       this.world.addObject(model);
       this.player.camera.move(-5);
-    },
+      var light_options = {
+        type: Jax.POINT_LIGHT,
+        attenuation: {
+          constant: 0,
+          linear: 0,
+          quadratic: 0.002
+        }
+      };
+      red = new LightSource(Jax.Util.normalizeOptions({
+        position: [-20, 0, 20], color: { ambient: [0.2, 0, 0, 1], diffuse: [0.8, 0, 0, 1], specular:[1.0, 0, 0, 1] }
+      }, light_options));
+      this.world.addLightSource(red);
+      green = new LightSource(Jax.Util.normalizeOptions({
+        position: [ 20, 20, 20], color: { ambient: [0, 0.2, 0, 1], diffuse: [0, 0.8, 0, 1], specular:[0, 1.0, 0, 1] }
+      }, light_options));
+       this.world.addLightSource(green);
+      blue = new LightSource(Jax.Util.normalizeOptions({
+        position: [ 20, -20, 20], color: { ambient: [0, 0, 0.2, 1], diffuse: [0, 0, 0.8, 1], specular:[0, 0, 1.0, 1] }
+      }, light_options));
+       this.world.addLightSource(blue);
+    },
-    // Some special actions are fired whenever the corresponding input is
-    // received from the user.
-    mouse_clicked: function(event) {
+    update: function(tc) {
+      this.rot = (this.rot || 0) + tc * 3.0;
+      function set(light, angle) {
+        var s = Math.sin(angle), c = Math.cos(angle);
+        light.camera.setPosition(s*20, c*20, 20);
+      }
+      var dif = Math.deg2rad(120);
+      set(red, this.rot + dif);
+      set(blue, this.rot + dif*2);
+      set(green, this.rot + dif*3);
     }
   });
 })();

data/spec/example_app/app/controllers/picking_controller.js ADDED Viewed

@@ -0,0 +1,32 @@
+//= require "application_controller"
+var PickingController = (function() {
+  return Jax.Controller.create("picking", ApplicationController, {
+    index: function() {
+      function mesh() { return new Jax.Mesh.Sphere({size: 1.0}); };
+      ofront       = this.world.addObject(new Jax.Model({position:[ 0.0, 0.0,-5],mesh:mesh()}));
+      otopleft     = this.world.addObject(new Jax.Model({position:[-2.5, 2.5,-5],mesh:mesh()}));
+      otopright    = this.world.addObject(new Jax.Model({position:[ 2.5, 2.5,-5],mesh:mesh()}));
+      obottomleft  = this.world.addObject(new Jax.Model({position:[-2.5,-2.5,-5],mesh:mesh()}));
+      obottomright = this.world.addObject(new Jax.Model({position:[ 2.5,-2.5,-5],mesh:mesh()}));
+    },
+    mouse_pressed: function(e) { alert(e.x+" "+e.y); },
+    mouse_moved: function(evt) {
+      var obj = this.world.pick(evt.x, evt.y);
+      if (obj) {
+        if (this.current_obj && obj != this.current_obj) {
+          this.current_obj.mesh.setColor(1,1,1,1);
+        }
+        obj.mesh.setColor(1,0,0,1);
+      } else {
+        if (this.current_obj) {
+          this.current_obj.mesh.setColor(1,1,1,1);
+        }
+      }
+      this.current_obj = obj;
+    }
+  });
+})();

data/spec/example_app/app/helpers/picking_helper.js ADDED Viewed

@@ -0,0 +1,3 @@
+var PickingHelper = Jax.Helper.create({
+});

data/spec/example_app/app/models/blob.js ADDED Viewed

@@ -0,0 +1,38 @@
+/**
+ * class Blob < Jax.Model
+ *
+ **/
+var Blob = (function() {
+  return Jax.Model.create({
+    update: function(tc) {
+      this.camera.rotate(tc, [1,0,0]);
+    },
+     after_initialize: function() {
+      var u = (2*Math.PI)/16, v = (Math.PI/16);
+      this.mesh = new Jax.Mesh({
+        material: Material.find("blob"),
+        init: function(vertices, colors, textureCoords, normals, indices) {
+          for (var x = 0; x < 64; x++) {
+            for (var y = 0; y < 64; y++) {
+              var u = x, v = y;
+              vertices.push(u, v, 0);
+              vertices.push(u+1, v, 0);
+              vertices.push(u, v+1, 0);
+              vertices.push(u, v+1, 0);
+              vertices.push(u+1, v, 0);
+              vertices.push(u+1, v+1, 0);
+            }
+          }
+        }
+      });
+      this.mesh.material.u = u;
+      this.mesh.material.v = v;
+    }
+  });
+})();

data/spec/example_app/app/resources/blobs/default.yml ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ # default attribute values
2	+ # (these will apply to all blobs)

data/spec/example_app/app/resources/materials/blob.yml CHANGED Viewed

@@ -21,8 +21,8 @@ specular:
 shininess: 30
+type: Blob
 layers:
   # remove Lighting to conserve video memory if you don't need/want support for light sources
   - type: Lighting
-  - type: Blob

data/spec/example_app/app/shaders/blob/common.ejs CHANGED Viewed

@@ -1,18 +1,13 @@
 //= require "functions/noise"
-// Shared variables save on graphics memory and allow you to "piggy-back" off of
-// variables defined in other shaders:
+shared uniform mat4 ivMatrix, mvMatrix, pMatrix, vMatrix;
+shared uniform mat3 vnMatrix, nMatrix;
-shared uniform mat3 nMatrix;
-shared uniform mat4 mvMatrix, pMatrix;
+shared uniform vec4 materialDiffuse, materialAmbient, materialSpecular;
+shared uniform float materialShininess;
-shared varying vec2 vTexCoords;
-shared varying vec3 vNormals;
-shared varying vec4 vColor;
-// If a variable isn't shared, it will be defined specifically for this shader.
-// If this shader is used twice in one materials, unshared variables will be
-// defined twice -- once for each use of the shader.
+shared uniform int PASS_TYPE;
-//   uniform sampler2D Texture;
-//   uniform float TextureScaleX, TextureScaleY;
+shared varying vec2 vTexCoords;
+shared varying vec3 vNormal, vSurfacePos;
+shared varying vec4 vBaseColor;

data/spec/example_app/app/shaders/blob/fragment.ejs CHANGED Viewed

@@ -4,5 +4,5 @@
   to make your shader more efficient.
 */
 void main(inout vec4 ambient, inout vec4 diffuse, inout vec4 specular) {
-  diffuse = vColor;
+//  diffuse = vBaseColor;
 }

data/spec/example_app/app/shaders/blob/material.js CHANGED Viewed

@@ -7,9 +7,11 @@ Jax.Material.Blob = (function() {
   return Jax.Class.create(Jax.Material, {
     initialize: function($super, options) {
+      this.u = this.v = 0.0;
       options = Jax.Util.normalizeOptions(options, {
-        shader: "blob",
+        shader: "blob"
         // You can specify default options (see +manifest.yml+) here.
       });
@@ -21,28 +23,29 @@ Jax.Material.Blob = (function() {
       $super(context, mesh, options, uniforms);
       uniforms.set('mvMatrix', context.getModelViewMatrix());
-      uniforms.set('nMatrix', context.getNormalMatrix());
-      uniforms.set('pMatrix', context.getProjectionMatrix());
+      uniforms.set('nMatrix',  context.getNormalMatrix());
+      uniforms.set('pMatrix',  context.getProjectionMatrix());
       // uniforms.texture('Texture', this.texture, context);
-      this.l = this.l || new Date().getTime();
-      var tc = (new Date().getTime() - this.l) / 1000;
+//      this.l = this.l || new Date().getTime();
+//      var tc = (new Date().getTime() - this.l) / 1000;
       var noise = getNoise(this, context);
-      uniforms.texture('permTexture', noise.perm, context);
+      uniforms.texture('permTexture',    noise.perm,    context);
       uniforms.texture('simplexTexture', noise.simplex, context);
-      uniforms.texture('gradTexture', noise.grad, context);
+      uniforms.texture('gradTexture',    noise.grad,    context);
-      uniforms.set('time', tc);
+      uniforms.set('time', Jax.uptime);
     },
     setAttributes: function($super, context, mesh, options, attributes) {
       attributes.set('VERTEX_POSITION',  mesh.getVertexBuffer());
-      attributes.set('VERTEX_COLOR',     mesh.getColorBuffer());
-      attributes.set('VERTEX_NORMAL',    mesh.getNormalBuffer());
-      attributes.set('VERTEX_TEXCOORDS', mesh.getTextureCoordsBuffer());
+      attributes.set('VERTEX_TANGENT',   mesh.getTangentBuffer());
+      // attributes.set('VERTEX_COLOR',     mesh.getColorBuffer());
+      // attributes.set('VERTEX_NORMAL',    mesh.getNormalBuffer());
+      // attributes.set('VERTEX_TEXCOORDS', mesh.getTextureCoordsBuffer());
     }
   });
 })();

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

@@ -1,13 +1,38 @@
-shared attribute vec4 VERTEX_POSITION, VERTEX_COLOR;
+shared attribute vec4 VERTEX_POSITION, VERTEX_TANGENT;
 shared attribute vec3 VERTEX_NORMAL;
-shared attribute vec2 VERTEX_TEXCOORDS;
-void main(void) {
-  vec4 pos = VERTEX_POSITION;
-  float n = snoise(vec4(pos.xyz, time));
-  pos.xyz += normalize(pos.xyz)*n;
+#define PI 3.141592653589793
+vec3 sphere(in float slice, in float stack) {
+  vec3 res;
+  float theta = (slice / 64.0) * PI,
+        phi   = (stack / 64.0) * 2.0 * PI;
+  float sinth = sin(theta), costh = cos(theta),
+        sinph = sin(phi),   cosph = cos(phi);
+  res.x = cosph * sinth;
+  res.y = costh;
+  res.z = sinph * sinth;
+  float n = snoise(vec4(res, time*0.5)) * 0.5;
+  res += normalize(res)*n;
-  gl_Position = pMatrix * mvMatrix * pos;
+  return res;
+}
+void main(void) {
+  vec3 pos = sphere(VERTEX_POSITION.x, VERTEX_POSITION.y);
+  vec3 a = sphere(VERTEX_POSITION.x+1.0, VERTEX_POSITION.y);
+  vec3 b = sphere(VERTEX_POSITION.x, VERTEX_POSITION.y+1.0);
+  a = (a - pos);
+  b = (b - pos);
+  vNormal = nMatrix * cross(b, a);
+  vSurfacePos = (mvMatrix * vec4(pos, 1.0)).xyz;
+  gl_Position = pMatrix * mvMatrix * vec4(pos, 1.0);
-  vColor = vec4(n);
+  vBaseColor = vec4(1,1,1,1);
 }

data/spec/example_app/app/views/picking/index.js ADDED Viewed

@@ -0,0 +1,4 @@
+Jax.views.push('picking/index', function() {
+  this.glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  this.world.render();
+});

data/spec/example_app/config/routes.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 ExampleApp.routes.map do
+  map 'picking/index'
   map 'noise/index'
   map 'textures/index'
   root 'lighting'

data/spec/example_app/spec/javascripts/controllers/picking_controller_spec.js ADDED Viewed

@@ -0,0 +1,11 @@
+describe("PickingController", function() {
+  var controller;
+  beforeEach(function() {
+    controller = new PickingController();
+  });
+  it("does something", function() {
+    expect(1).toEqual(1);
+  });
+});

data/spec/example_app/spec/javascripts/helpers/picking_helper_spec.js ADDED Viewed

@@ -0,0 +1,12 @@
+describe("PickingHelper", function() {
+  var helper;
+  beforeEach(function() {
+    var klass = Jax.Class.create({helpers: function() { return [PickingHelper]; } });
+    helper = new klass();
+  });
+  it("does something", function() {
+    expect(1).toEqual(1);
+  });
+});