Removed unnecessary duplicates of procedural files, updated procedura…

…l-material to take colour parameters, reverted gladius-cubicvr libraries to versions that exist upstream on github
Osmose · Jun 5, 2012 · 57321d1 · 57321d1
1 parent f0d9fcd
commit 57321d1
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 130 deletions.
diff --git a/examples/assets/procedural-material.js b/examples/assets/procedural-material.js
@@ -1,5 +1,21 @@
-    function proc( options ) {
-        return {
-            color: [1, 0.2, 0]
-        };
-    }
+function proc( options ) {
+  options = options || {};
+  if (options.colorR === undefined){
+    options.colorR = 1;
+  }else{
+    options.colorR = parseInt(options.colorR);
+  }
+  if (options.colorG === undefined){
+    options.colorG = 0.2
+  }else{
+    options.colorG = parseInt(options.colorG);
+  }
+  if (options.colorB === undefined){
+    options.colorB = 0;
+  }else{
+    options.colorB = parseInt(options.colorB);
+  }
+  return {
+    color: [options.colorR, options.colorG, options.colorB]
+  };
+}
diff --git a/examples/cube-collision/cube-collision.js b/examples/cube-collision/cube-collision.js
@@ -45,7 +45,7 @@ document.addEventListener( "DOMContentLoaded", function( e ) {
         [
           {
             type: engine["gladius-cubicvr"].Mesh,
-            url: 'procedural-mesh.js',
+            url: '../assets/procedural-mesh.js',
             load: engine.loaders.procedural,
             onsuccess: function( mesh ) {
               resources.mesh = mesh;
@@ -55,7 +55,7 @@ document.addEventListener( "DOMContentLoaded", function( e ) {
           },
           {
             type: engine["gladius-cubicvr"].MaterialDefinition,
-            url: 'procedural-material.js',
+            url: '../assets/procedural-material.js',
             load: engine.loaders.procedural,
             onsuccess: function( material ) {
               resources.material = material;
@@ -65,7 +65,7 @@ document.addEventListener( "DOMContentLoaded", function( e ) {
           },
           {
             type: engine["gladius-cubicvr"].MaterialDefinition,
-            url: 'procedural-material.js?colorR=0&colorG=0&colorB=1',
+            url: '../assets/procedural-material.js?colorR=0&colorG=0&colorB=1',
             load: engine.loaders.procedural,
             onsuccess: function( material ) {
               resources.materialBlue = material;
@@ -75,7 +75,7 @@ document.addEventListener( "DOMContentLoaded", function( e ) {
           },
           {
             type: engine["gladius-cubicvr"].MaterialDefinition,
-            url: 'procedural-material.js?colorR=0&colorG=1&colorB=0',
+            url: '../assets/procedural-material.js?colorR=0&colorG=1&colorB=0',
             load: engine.loaders.procedural,
             onsuccess: function( material ) {
               resources.materialGreen = material;

diff --git a/examples/cube-collision/procedural-material.js b/examples/cube-collision/procedural-material.js
diff --git a/examples/cube-collision/procedural-mesh.js b/examples/cube-collision/procedural-mesh.js
diff --git a/examples/cube-impulse/cube-impulse.js b/examples/cube-impulse/cube-impulse.js
@@ -45,7 +45,7 @@ document.addEventListener( "DOMContentLoaded", function( e ) {
         [
           {
             type: engine["gladius-cubicvr"].Mesh,
-            url: 'procedural-mesh.js',
+            url: '../assets/procedural-mesh.js',
             load: engine.loaders.procedural,
             onsuccess: function( mesh ) {
               resources.mesh = mesh;
@@ -55,7 +55,7 @@ document.addEventListener( "DOMContentLoaded", function( e ) {
           },
           {
             type: engine["gladius-cubicvr"].MaterialDefinition,
-            url: 'procedural-material.js',
+            url: '../assets/procedural-material.js',
             load: engine.loaders.procedural,
             onsuccess: function( material ) {
               resources.material = material;

diff --git a/examples/cube-impulse/procedural-material.js b/examples/cube-impulse/procedural-material.js
diff --git a/examples/cube-impulse/procedural-mesh.js b/examples/cube-impulse/procedural-mesh.js
diff --git a/gladius-cubicvr.js b/gladius-cubicvr.js
@@ -23687,22 +23687,31 @@ define('src/components/model',['require','common/extend','base/component'],funct
   var Model = function( service, mesh, materialDefinition ) {
     Component.call( this, "Model", service, ["Transform"] );
 
-    this._cubicvrMesh = mesh || new service.target.context.Mesh();
-    setMaterialDefinition.call(this, materialDefinition || new service.target.context.Material());
+    this._cubicvrMesh = null;
+    this._cubicvrMaterialDefinition = null;
+
+    setMesh.call( this, mesh || new service.target.context.Mesh() );
+    setMaterialDefinition.call( this, materialDefinition || new service.target.context.Material() );
   };
   Model.prototype = new Component();
   Model.prototype.constructor = Model;
 
-  function setMaterialDefinition(materialDefinition){
-    if (materialDefinition){
-      this._cubicvrMaterialDefinition = materialDefinition;
-    }
+  function setMaterialDefinition( materialDefinition ){
+    this._cubicvrMaterialDefinition = materialDefinition;
   }
 
   function getMaterialDefinition(){
     return this._cubicvrMaterialDefinition;
   }
 
+  function setMesh( mesh ) {
+    this._cubicvrMesh = mesh;
+  }
+
+  function getMesh() {
+    return this._cubicvrMesh;
+  }
+
   function onUpdate( event ) {
   }
 
@@ -23740,6 +23749,8 @@ define('src/components/model',['require','common/extend','base/component'],funct
   var prototype = {
     getMaterialDefinition: getMaterialDefinition,
     setMaterialDefinition: setMaterialDefinition,
+    getMesh: getMesh,
+    setMesh: setMesh,
     onUpdate: onUpdate,
     onEntitySpaceChanged: onEntitySpaceChanged,
     onComponentOwnerChanged: onComponentOwnerChanged,

diff --git a/gladius-cubicvr.min.js b/gladius-cubicvr.min.js