aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-09 10:13:59 -0800
committerJose Antonio Marquez2012-03-09 10:13:59 -0800
commitd549383abf18a0dc54a990983fb4296602b66120 (patch)
treeac107d3823abb846c1afae3d03abce0f6aae2c98 /js/lib/geom
parent3bcdfaa322ac53609b66ecedbace1872048fd310 (diff)
parent7b6e8194b91168abdeb94702eb350d14f147858b (diff)
downloadninja-d549383abf18a0dc54a990983fb4296602b66120.tar.gz
Merge branch 'refs/heads/integration' into FileIO-Integration
Conflicts: js/document/html-document.js
Diffstat (limited to 'js/lib/geom')
-rwxr-xr-xjs/lib/geom/circle.js5
-rwxr-xr-xjs/lib/geom/geom-obj.js42
-rwxr-xr-xjs/lib/geom/rectangle.js5
3 files changed, 49 insertions, 3 deletions
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index ad77383b..f94d4e6b 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -61,6 +61,8 @@ var Circle = function GLCircle() {
61 } else { 61 } else {
62 this._fillMaterial = MaterialsModel.exportFlatMaterial(); 62 this._fillMaterial = MaterialsModel.exportFlatMaterial();
63 } 63 }
64
65 this.exportMaterials();
64 }; 66 };
65 67
66 /////////////////////////////////////////////////////////////////////// 68 ///////////////////////////////////////////////////////////////////////
@@ -610,8 +612,9 @@ var Circle = function GLCircle() {
610 console.log( "object material not found in library: " + fillMaterialName ); 612 console.log( "object material not found in library: " + fillMaterialName );
611 fillMat = MaterialsModel.exportFlatMaterial(); 613 fillMat = MaterialsModel.exportFlatMaterial();
612 } 614 }
613
614 this._fillMaterial = fillMat; 615 this._fillMaterial = fillMat;
616
617 this.importMaterials( importStr );
615 }; 618 };
616 619
617 this.collidesWithPoint = function( x, y ) { 620 this.collidesWithPoint = function( x, y ) {
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 852aab89..1a197832 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -5,6 +5,27 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
5</copyright> */ 5</copyright> */
6 6
7var MaterialsModel = require("js/models/materials-model").MaterialsModel; 7var MaterialsModel = require("js/models/materials-model").MaterialsModel;
8var FlatMaterial = require("js/lib/rdge/materials/flat-material").FlatMaterial;
9var LinearGradientMaterial = require("js/lib/rdge/materials/linear-gradient-material").LinearGradientMaterial;
10var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-material").RadialGradientMaterial;
11var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
12var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
13var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
14var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
15var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
16var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
17var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material").ReliefTunnelMaterial;
18var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
19var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;
20var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
21var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial;
22var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
23var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
24var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial;
25var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial;
26var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial;
27var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial;
28
8/////////////////////////////////////////////////////////////////////// 29///////////////////////////////////////////////////////////////////////
9// Class GLGeomObj 30// Class GLGeomObj
10// Super class for all geometry classes 31// Super class for all geometry classes
@@ -235,7 +256,26 @@ var GeomObj = function GLGeomObj() {
235 var materialType = this.getPropertyFromString( "material: ", importStr ); 256 var materialType = this.getPropertyFromString( "material: ", importStr );
236 switch (materialType) 257 switch (materialType)
237 { 258 {
238 case "flat": mat = new FlatMaterial(); break; 259 case "flat": mat = new FlatMaterial(); break;
260 case "radialGradient": mat = new RadialGradientMaterial(); break;
261 case "linearGradient": mat = new LinearGradientMaterial(); break;
262 case "bumpMetal": mat = new BumpMetalMaterial(); break;
263 case "uber": mat = new UberMaterial(); break;
264 case "plasma": mat = new PlasmaMaterial(); break;
265 case "deform": mat = new DeformMaterial(); break;
266 case "water": mat = new WaterMaterial(); break;
267 case "tunnel": mat = new TunnelMaterial(); break;
268 case "reliefTunnel": mat = new ReliefTunnelMaterial(); break;
269 case "squareTunnel": mat = new SquareTunnelMaterial(); break;
270 case "twist": mat = new TwiseMaterial(); break;
271 case "fly": mat = new FlyMaterial(); break;
272 case "julia": mat = new JuliaMaterial(); break;
273 case "mandel": mat = new MandelMaterial(); break;
274 case "star": mat = new StarMaterial(); break;
275 case "zinvert": mat = new ZInvertMaterial(); break;
276 case "keleidoscope": mat = new KeleidoscopeMaterial(); break;
277 case "radialBlur": mat = new RadialBlurMaterial(); break;
278 case "pulse": mat = new PulseMaterial(); break;
239 279
240 default: 280 default:
241 console.log( "material type: " + materialType + " is not supported" ); 281 console.log( "material type: " + materialType + " is not supported" );
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index f91e830c..370bb257 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -79,6 +79,8 @@ var Rectangle = function GLRectangle() {
79 } else { 79 } else {
80 this._fillMaterial = MaterialsModel.exportFlatMaterial(); 80 this._fillMaterial = MaterialsModel.exportFlatMaterial();
81 } 81 }
82
83 this.exportMaterials();
82 }; 84 };
83 85
84 /////////////////////////////////////////////////////////////////////// 86 ///////////////////////////////////////////////////////////////////////
@@ -264,8 +266,9 @@ var Rectangle = function GLRectangle() {
264 console.log( "object material not found in library: " + fillMaterialName ); 266 console.log( "object material not found in library: " + fillMaterialName );
265 fillMat = MaterialsModel.exportFlatMaterial(); 267 fillMat = MaterialsModel.exportFlatMaterial();
266 } 268 }
267
268 this._fillMaterial = fillMat; 269 this._fillMaterial = fillMat;
270
271 this.importMaterials( importStr );
269 }; 272 };
270 273
271 this.buildBuffers = function() { 274 this.buildBuffers = function() {