jax 0.0.0.4 → 0.0.0.5

data/src/jax/webgl/material.js

@@ -366,10 +366,11 @@ Jax.Material.addResources = function(resources) {
 //= require "../../../builtin/shaders/texture/material"
 //= require "../../../builtin/shaders/normal_map/material"
 //= require "../../../builtin/shaders/shadow_map/material"
-//= require "../../../builtin/shaders/paraboloid-depthmap/material"
+//= require "../../../builtin/shaders/depthmap/material"
+//= require "../../../builtin/shaders/paraboloid/material"
 //= require "../../../builtin/shaders/fog/material"
 
 Jax.Material.create("basic");
 Jax.Material.create("default", {default_shader:'basic'});
 Jax.Material.create("depthmap", {default_shader:"depthmap"});
-Jax.Material.create("paraboloid-depthmap", {type:"DualParaboloid",default_shader:"paraboloid-depthmap"});
+Jax.Material.create("paraboloid-depthmap", {type:"Paraboloid",default_shader:"paraboloid",layers:[{type:"Depthmap"}]});

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

@@ -154,6 +154,7 @@ Jax.Scene.LightSource = (function() {
         fieldOfView = 60;
         this.camera.perspective({near:nearPlane,far:nearPlane+(2.0*sceneBoundingRadius),fov:fieldOfView,width:2048,height:2048});
       } else if (this.type == Jax.POINT_LIGHT) {
+        var paraboloid_depthmap = Jax.Material.find("paraboloid-depthmap");
         
         context.glDisable(GL_BLEND);
         context.glEnable(GL_CULL_FACE);
@@ -170,7 +171,7 @@ 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, {material:paraboloid_depthmap, direction:1});
             }
           });
 
@@ -180,7 +181,7 @@ Jax.Scene.LightSource = (function() {
             context.glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
             context.loadViewMatrix(self.camera.getModelViewMatrix());
             for (var i = 0; i < objects.length; i++) {
-              objects[i].render(context, {material:'paraboloid-depthmap',direction:-1});
+              objects[i].render(context, {material:paraboloid_depthmap,direction:-1});
             }
           });
   

metadata

@@ -2,7 +2,7 @@
 name: jax
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0.4
+  version: 0.0.0.5
 platform: ruby
 authors: 
 - Colin MacKenzie IV
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -04:00
+date: 2011-05-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -180,6 +180,7 @@ files:
 - .gitignore
 - .gitmodules
 - .rvmrc
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -190,6 +191,7 @@ files:
 - builtin/shaders/basic/vertex.ejs
 - builtin/shaders/depthmap/common.ejs
 - builtin/shaders/depthmap/fragment.ejs
+- builtin/shaders/depthmap/material.js
 - builtin/shaders/depthmap/vertex.ejs
 - builtin/shaders/fog/common.ejs
 - builtin/shaders/fog/fragment.ejs
@@ -198,6 +200,7 @@ files:
 - builtin/shaders/fog/vertex.ejs
 - builtin/shaders/functions/depth_map.ejs
 - builtin/shaders/functions/lights.ejs
+- builtin/shaders/functions/noise.ejs
 - builtin/shaders/lighting/common.ejs
 - builtin/shaders/lighting/fragment.ejs
 - builtin/shaders/lighting/manifest.yml
@@ -208,10 +211,11 @@ files:
 - builtin/shaders/normal_map/manifest.yml
 - builtin/shaders/normal_map/material.js
 - builtin/shaders/normal_map/vertex.ejs
-- builtin/shaders/paraboloid-depthmap/common.ejs
-- builtin/shaders/paraboloid-depthmap/fragment.ejs
-- builtin/shaders/paraboloid-depthmap/material.js
-- builtin/shaders/paraboloid-depthmap/vertex.ejs
+- builtin/shaders/paraboloid/common.ejs
+- builtin/shaders/paraboloid/fragment.ejs
+- builtin/shaders/paraboloid/manifest.yml
+- builtin/shaders/paraboloid/material.js
+- builtin/shaders/paraboloid/vertex.ejs
 - builtin/shaders/shadow_map/common.ejs
 - builtin/shaders/shadow_map/fragment.ejs
 - builtin/shaders/shadow_map/manifest.yml
@@ -424,9 +428,11 @@ files:
 - spec/example_app/app/controllers/application_controller.js
 - spec/example_app/app/controllers/courthouse_controller.js
 - spec/example_app/app/controllers/lighting_controller.js
+- spec/example_app/app/controllers/noise_controller.js
 - spec/example_app/app/controllers/shadows_controller.js
 - spec/example_app/app/controllers/textures_controller.js
 - spec/example_app/app/helpers/application_helper.js
+- spec/example_app/app/helpers/noise_helper.js
 - spec/example_app/app/helpers/textures_helper.js
 - spec/example_app/app/models/character.js
 - spec/example_app/app/models/door.js
@@ -438,11 +444,18 @@ files:
 - spec/example_app/app/resources/light_sources/spot_light.yml
 - spec/example_app/app/resources/light_sources/sun.yml
 - spec/example_app/app/resources/light_sources/textures_point.yml
+- spec/example_app/app/resources/materials/blob.yml
 - spec/example_app/app/resources/materials/bricks.yml
 - spec/example_app/app/resources/materials/lighting_with_shadows.yml
 - spec/example_app/app/resources/scenes/courthouse.yml
+- spec/example_app/app/shaders/blob/common.ejs
+- spec/example_app/app/shaders/blob/fragment.ejs
+- spec/example_app/app/shaders/blob/manifest.yml
+- spec/example_app/app/shaders/blob/material.js
+- spec/example_app/app/shaders/blob/vertex.ejs
 - spec/example_app/app/views/courthouse/index.js
 - spec/example_app/app/views/lighting/index.js
+- spec/example_app/app/views/noise/index.js
 - spec/example_app/app/views/shadows/index.js
 - spec/example_app/app/views/textures/index.js
 - spec/example_app/config/application.rb
@@ -455,11 +468,14 @@ files:
 - spec/example_app/public/images/rss.png
 - spec/example_app/public/webgl_not_supported.html
 - spec/example_app/script/jax
+- spec/example_app/spec/javascripts/controllers/noise_controller_spec.js
 - spec/example_app/spec/javascripts/controllers/textures_controller_spec.js
 - spec/example_app/spec/javascripts/helpers/application_helper_spec.js
+- spec/example_app/spec/javascripts/helpers/noise_helper_spec.js
 - spec/example_app/spec/javascripts/resources/directional_light_spec.js
 - spec/example_app/spec/javascripts/resources/point_light_spec.js
 - spec/example_app/spec/javascripts/resources/spot_light_spec.js
+- spec/example_app/spec/javascripts/shaders/blob_spec.js
 - spec/example_app/spec/javascripts/support/jasmine.yml
 - spec/example_app/spec/javascripts/support/jasmine_runner.rb
 - spec/example_app/spec/javascripts/support/spec_helpers/jax_spec_helper.js
@@ -469,7 +485,6 @@ files:
 - spec/generators/light_generator_spec.rb
 - spec/generators/material_generator_spec.rb
 - spec/generators/model_generator_spec.rb
-- spec/javascripts/Player.js
 - spec/javascripts/helpers/SpecHelper.js
 - spec/javascripts/jax/builtin/meshes/cube_spec.js
 - spec/javascripts/jax/builtin/meshes/plane_spec.js
@@ -505,10 +520,10 @@ files:
 - spec/javascripts/jax/world_spec.js
 - spec/javascripts/jax_spec.js
 - spec/javascripts/shaders/core_materials_spec.js
-- spec/javascripts/shaders/dual_paraboloid_spec.js
 - spec/javascripts/shaders/fog_spec.js
 - spec/javascripts/shaders/lighting_spec.js
 - spec/javascripts/shaders/normal_map_spec.js
+- spec/javascripts/shaders/paraboloid_spec.js
 - spec/javascripts/shaders/shadow_map_spec.js
 - spec/javascripts/shaders/texture_spec.js
 - spec/javascripts/support/jasmine.yml
@@ -519,6 +534,8 @@ files:
 - spec/spec_helper.rb
 - spec/support/file_exist_matcher.rb
 - spec/support/spec_shell.rb
+- src/constants.yml
+- src/constants.yml.erb
 - src/jax.js
 - src/jax/anim_frame.js
 - src/jax/builtin/all.js
@@ -540,6 +557,7 @@ files:
 - src/jax/geometry/plane.js
 - src/jax/helper.js
 - src/jax/model.js
+- src/jax/noise.js
 - src/jax/prototype/class.js
 - src/jax/prototype/core.js
 - src/jax/prototype/extensions.js
@@ -658,7 +676,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1105159901056856411
+      hash: -852676475953651161
       segments: 
       - 0
       version: "0"
@@ -667,7 +685,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1105159901056856411
+      hash: -852676475953651161
       segments: 
       - 0
       version: "0"
@@ -684,9 +702,11 @@ test_files:
 - spec/example_app/app/controllers/application_controller.js
 - spec/example_app/app/controllers/courthouse_controller.js
 - spec/example_app/app/controllers/lighting_controller.js
+- spec/example_app/app/controllers/noise_controller.js
 - spec/example_app/app/controllers/shadows_controller.js
 - spec/example_app/app/controllers/textures_controller.js
 - spec/example_app/app/helpers/application_helper.js
+- spec/example_app/app/helpers/noise_helper.js
 - spec/example_app/app/helpers/textures_helper.js
 - spec/example_app/app/models/character.js
 - spec/example_app/app/models/door.js
@@ -698,11 +718,18 @@ test_files:
 - spec/example_app/app/resources/light_sources/spot_light.yml
 - spec/example_app/app/resources/light_sources/sun.yml
 - spec/example_app/app/resources/light_sources/textures_point.yml
+- spec/example_app/app/resources/materials/blob.yml
 - spec/example_app/app/resources/materials/bricks.yml
 - spec/example_app/app/resources/materials/lighting_with_shadows.yml
 - spec/example_app/app/resources/scenes/courthouse.yml
+- spec/example_app/app/shaders/blob/common.ejs
+- spec/example_app/app/shaders/blob/fragment.ejs
+- spec/example_app/app/shaders/blob/manifest.yml
+- spec/example_app/app/shaders/blob/material.js
+- spec/example_app/app/shaders/blob/vertex.ejs
 - spec/example_app/app/views/courthouse/index.js
 - spec/example_app/app/views/lighting/index.js
+- spec/example_app/app/views/noise/index.js
 - spec/example_app/app/views/shadows/index.js
 - spec/example_app/app/views/textures/index.js
 - spec/example_app/config/application.rb
@@ -715,11 +742,14 @@ test_files:
 - spec/example_app/public/images/rss.png
 - spec/example_app/public/webgl_not_supported.html
 - spec/example_app/script/jax
+- spec/example_app/spec/javascripts/controllers/noise_controller_spec.js
 - spec/example_app/spec/javascripts/controllers/textures_controller_spec.js
 - spec/example_app/spec/javascripts/helpers/application_helper_spec.js
+- spec/example_app/spec/javascripts/helpers/noise_helper_spec.js
 - spec/example_app/spec/javascripts/resources/directional_light_spec.js
 - spec/example_app/spec/javascripts/resources/point_light_spec.js
 - spec/example_app/spec/javascripts/resources/spot_light_spec.js
+- spec/example_app/spec/javascripts/shaders/blob_spec.js
 - spec/example_app/spec/javascripts/support/jasmine.yml
 - spec/example_app/spec/javascripts/support/jasmine_runner.rb
 - spec/example_app/spec/javascripts/support/spec_helpers/jax_spec_helper.js
@@ -729,7 +759,6 @@ test_files:
 - spec/generators/light_generator_spec.rb
 - spec/generators/material_generator_spec.rb
 - spec/generators/model_generator_spec.rb
-- spec/javascripts/Player.js
 - spec/javascripts/helpers/SpecHelper.js
 - spec/javascripts/jax/builtin/meshes/cube_spec.js
 - spec/javascripts/jax/builtin/meshes/plane_spec.js
@@ -765,10 +794,10 @@ test_files:
 - spec/javascripts/jax/world_spec.js
 - spec/javascripts/jax_spec.js
 - spec/javascripts/shaders/core_materials_spec.js
-- spec/javascripts/shaders/dual_paraboloid_spec.js
 - spec/javascripts/shaders/fog_spec.js
 - spec/javascripts/shaders/lighting_spec.js
 - spec/javascripts/shaders/normal_map_spec.js
+- spec/javascripts/shaders/paraboloid_spec.js
 - spec/javascripts/shaders/shadow_map_spec.js
 - spec/javascripts/shaders/texture_spec.js
 - spec/javascripts/support/jasmine.yml

data/spec/javascripts/Player.js

@@ -1,58 +0,0 @@
-describe("Player", function() {
-  var player;
-  var song;
-
-  beforeEach(function() {
-    player = new Player();
-    song = new Song();
-  });
-
-  it("should be able to play a Song", function() {
-    player.play(song);
-    expect(player.currentlyPlayingSong).toEqual(song);
-
-    //demonstrates use of custom matcher
-    expect(player).toBePlaying(song);
-  });
-
-  describe("when song has been paused", function() {
-    beforeEach(function() {
-      player.play(song);
-      player.pause();
-    });
-
-    it("should indicate that the song is currently paused", function() {
-      expect(player.isPlaying).toBeFalsy();
-
-      // demonstrates use of 'not' with a custom matcher
-      expect(player).not.toBePlaying(song);
-    });
-
-    it("should be possible to resume", function() {
-      player.resume();
-      expect(player.isPlaying).toBeTruthy();
-      expect(player.currentlyPlayingSong).toEqual(song);
-    });
-  });
-
-  // demonstrates use of spies to intercept and test method calls
-  it("tells the current song if the user has made it a favorite", function() {
-    spyOn(song, 'persistFavoriteStatus');
-
-    player.play(song);
-    player.makeFavorite();
-
-    expect(song.persistFavoriteStatus).toHaveBeenCalledWith(true);
-  });
-
-  //demonstrates use of expected exceptions
-  describe("#resume", function() {
-    it("should throw an exception if song is already playing", function() {
-      player.play(song);
-
-      expect(function() {
-        player.resume();
-      }).toThrow("song is already playing");
-    });
-  });
-});