jax 0.0.0.5 → 0.0.0.6

metadata

@@ -2,7 +2,7 @@
 name: jax
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0.5
+  version: 0.0.0.6
 platform: ruby
 authors: 
 - Colin MacKenzie IV
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 -04:00
+date: 2011-05-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -216,6 +216,10 @@ files:
 - builtin/shaders/paraboloid/manifest.yml
 - builtin/shaders/paraboloid/material.js
 - builtin/shaders/paraboloid/vertex.ejs
+- builtin/shaders/picking/common.ejs
+- builtin/shaders/picking/fragment.ejs
+- builtin/shaders/picking/material.js
+- builtin/shaders/picking/vertex.ejs
 - builtin/shaders/shadow_map/common.ejs
 - builtin/shaders/shadow_map/fragment.ejs
 - builtin/shaders/shadow_map/manifest.yml
@@ -429,14 +433,18 @@ files:
 - 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/picking_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/picking_helper.js
 - spec/example_app/app/helpers/textures_helper.js
+- spec/example_app/app/models/blob.js
 - spec/example_app/app/models/character.js
 - spec/example_app/app/models/door.js
 - spec/example_app/app/models/scene.js
+- spec/example_app/app/resources/blobs/default.yml
 - spec/example_app/app/resources/characters/judge.yml
 - spec/example_app/app/resources/doors/courthouse_door.yml
 - spec/example_app/app/resources/light_sources/directional_light.yml
@@ -456,6 +464,7 @@ files:
 - 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/picking/index.js
 - spec/example_app/app/views/shadows/index.js
 - spec/example_app/app/views/textures/index.js
 - spec/example_app/config/application.rb
@@ -469,9 +478,12 @@ files:
 - 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/picking_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/helpers/picking_helper_spec.js
+- spec/example_app/spec/javascripts/models/blob_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
@@ -524,6 +536,7 @@ files:
 - spec/javascripts/shaders/lighting_spec.js
 - spec/javascripts/shaders/normal_map_spec.js
 - spec/javascripts/shaders/paraboloid_spec.js
+- spec/javascripts/shaders/preprocessor_spec.js
 - spec/javascripts/shaders/shadow_map_spec.js
 - spec/javascripts/shaders/texture_spec.js
 - spec/javascripts/support/jasmine.yml
@@ -547,7 +560,6 @@ files:
 - src/jax/builtin/meshes/torus.js
 - src/jax/compatibility.js
 - src/jax/context.js
-- src/jax/controller.js
 - src/jax/core.js
 - src/jax/core/math.js
 - src/jax/core/matrix_stack.js
@@ -555,17 +567,18 @@ files:
 - src/jax/events.js
 - src/jax/geometry.js
 - src/jax/geometry/plane.js
-- src/jax/helper.js
-- src/jax/model.js
+- src/jax/mvc/controller.js
+- src/jax/mvc/helper.js
+- src/jax/mvc/model.js
+- src/jax/mvc/route_set.js
+- src/jax/mvc/view.js
+- src/jax/mvc/view_manager.js
 - src/jax/noise.js
 - src/jax/prototype/class.js
 - src/jax/prototype/core.js
 - src/jax/prototype/extensions.js
-- src/jax/route_set.js
 - src/jax/vendor/ejs.js
 - src/jax/vendor/glMatrix.js
-- src/jax/view.js
-- src/jax/view_manager.js
 - src/jax/webgl.js
 - src/jax/webgl/camera.js
 - src/jax/webgl/core.js
@@ -676,7 +689,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -852676475953651161
+      hash: 3001490309694748403
       segments: 
       - 0
       version: "0"
@@ -685,7 +698,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -852676475953651161
+      hash: 3001490309694748403
       segments: 
       - 0
       version: "0"
@@ -703,14 +716,18 @@ test_files:
 - 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/picking_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/picking_helper.js
 - spec/example_app/app/helpers/textures_helper.js
+- spec/example_app/app/models/blob.js
 - spec/example_app/app/models/character.js
 - spec/example_app/app/models/door.js
 - spec/example_app/app/models/scene.js
+- spec/example_app/app/resources/blobs/default.yml
 - spec/example_app/app/resources/characters/judge.yml
 - spec/example_app/app/resources/doors/courthouse_door.yml
 - spec/example_app/app/resources/light_sources/directional_light.yml
@@ -730,6 +747,7 @@ test_files:
 - 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/picking/index.js
 - spec/example_app/app/views/shadows/index.js
 - spec/example_app/app/views/textures/index.js
 - spec/example_app/config/application.rb
@@ -743,9 +761,12 @@ test_files:
 - 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/picking_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/helpers/picking_helper_spec.js
+- spec/example_app/spec/javascripts/models/blob_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
@@ -798,6 +819,7 @@ test_files:
 - spec/javascripts/shaders/lighting_spec.js
 - spec/javascripts/shaders/normal_map_spec.js
 - spec/javascripts/shaders/paraboloid_spec.js
+- spec/javascripts/shaders/preprocessor_spec.js
 - spec/javascripts/shaders/shadow_map_spec.js
 - spec/javascripts/shaders/texture_spec.js
 - spec/javascripts/support/jasmine.yml

data/src/jax/helper.js

@@ -1,8 +0,0 @@
-Jax.Helper = {
-  instances: [],
-
-  create: function(methods) {
-    Jax.Helper.instances.push(methods);
-    return methods;
-  }
-};

data/src/jax/model.js

@@ -1,163 +0,0 @@
-/**
- * class Jax.Model
- * 
- **/
-(function() {
-  function initProperties(self, data) {
-    // to make sure sub-properties of data are standalone objects, so that the original data can't be tainted
-    data = Jax.Util.normalizeOptions(data, {});
-    
-    var attribute;
-        
-    if (data) {
-      for (attribute in data) {
-        switch(attribute) {
-          case 'position':    self.camera.setPosition(Jax.Util.vectorize(data[attribute])); break;
-          case 'direction':   self.camera.orient(Jax.Util.vectorize(data[attribute])); break;
-          case 'mesh':
-            if (data[attribute].isKindOf(Jax.Mesh)) self.mesh = data[attribute];
-            else throw new Error("Unexpected value for mesh:\n\n"+JSON.stringify(data[attribute]));
-            break;
-          default:
-            self[attribute] = data[attribute];
-        }
-      }
-    }
-  }
-  
-  Jax.Model = (function() {
-    return Jax.Class.create({
-      initialize: function(data) {
-        this.camera = new Jax.Camera();
-        
-        initProperties(this, Jax.Model.default_properties);
-        if (this._klass && this._klass.resources)
-          initProperties(this, this._klass.resources['default']);
-        initProperties(this, data);
-        
-        if (this.after_initialize) this.after_initialize();
-      },
-      
-      isShadowCaster: function() { return this.shadow_caster; },
-
-      /**
-       * Jax.Model#render(context) -> undefined
-       * 
-       * Renders this model with the given context. If the model doesn't have a mesh,
-       * nothing is rendered.
-       **/
-      render: function(context, options) {
-        if (this.mesh)
-        {
-          var self = this;
-          context.pushMatrix(function() {
-            context.multModelMatrix(self.camera.getModelViewMatrix());
-            self.mesh.render(context, options);
-          });
-        }
-      },
-      
-      getBoundingCube: function() {
-        if (!this.mesh.built) this.mesh.rebuild();
-        return this.mesh.bounds;
-      },
-      
-      getBoundingSphereRadius: function() {
-        var b = this.getBoundingCube();
-        return Math.max(b.width, Math.max(b.height, b.depth));
-      },
-      
-      dispose: function() {
-        if (this.mesh)
-          this.mesh.dispose();
-      },
-      
-      isLit: function() {
-        return this.lit;
-      },
-
-      /**
-       * Jax.Model#inspect() -> String
-       * 
-       * Returns the JSON representation of the attributes in this model.
-       * Function definitions are not included.
-       * 
-       **/
-      inspect: function() {
-        result = {};
-        for (var i in this)
-          if (!Object.isFunction(this[i]) && i != "_klass")
-            result[i] = this[i];
-        return JSON.stringify(result);
-      }
-    });
-  })();
-  
-  var model_class_methods = {
-    /**
-     * Jax.Model.find(id) -> Jax.Model
-     * - id (String): the unique identifier of the model to be found
-     * 
-     * Finds the resource with the specified name, instantiates its model and returns it.
-     * 
-     * Note that this is a class method of the model in question, and not of Jax.Model itself.
-     * 
-     * For example, this would be correct:
-     * 
-     *     Character.find('bad_guy')
-     *     
-     * while this would be *incorrect*:
-     * 
-     *     Jax.Model.find('bad_guy')
-     *     
-     **/
-    find: function(id) {
-      for (var resource_id in this.resources) {
-        if (id == resource_id)
-          return new this(this.resources[id]);
-      }
-      throw new Error("Resource '"+id+"' not found!");
-    },
-
-    /**
-     * Jax.Model.addResources(resources) -> undefined
-     * - resources (Object): the resources to be added
-     * 
-     * Adds the resources to the specified model. These resources can then be found using
-     * Jax.Model.find(id).
-     * 
-     * Note that this is a class method of the model in question, and not of Jax.Model itself.
-     * 
-     * For example, this would be correct:
-     * 
-     *     Character.addResources({'bad_guy': {...}})
-     *     
-     * while this would be *incorrect*:
-     * 
-     *     Jax.Model.addResources({'bad_guy': {...}})
-     *     
-     **/
-    addResources: function(resources) {
-      this.resources = this.resources || {};
-      for (var id in resources)
-        if (this.resources[id]) throw new Error("Duplicate resource ID: "+id);
-        else this.resources[id] = resources[id];
-    }
-  };
-  
-  Jax.Model.default_properties = {
-    lit: true,
-    shadow_caster: true
-  };
-  
-  Jax.Model.create = function(superclass, inner) {
-    var klass;
-    if (inner) klass = Jax.Class.create(superclass, inner);
-    else       klass = Jax.Class.create(Jax.Model, superclass);
-    
-    klass.addMethods({_klass:klass});
-
-    Object.extend(klass, model_class_methods);
-    return klass;
-  };
-})();