aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/lib/geom/geom-obj.js4
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js14
-rw-r--r--js/lib/rdge/materials/water-material.js14
-rwxr-xr-xjs/models/materials-model.js12
-rw-r--r--js/panels/Materials/materials-data.json18
6 files changed, 32 insertions, 32 deletions
<
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index bbf53144..6b74b04f 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.4"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.5"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 3cd3a89b..e0ed51fb 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -385,8 +385,8 @@ exports.GeomObj = Object.create(Object.prototype, {
385 case "plasma": 385 case "plasma":
386 case "deform": 386 case "deform":
387 case "water": 387 case "water":
388 case "paris": 388 case "blueSky":
389 case "raiders": 389 case "darkBlur":
390 case "tunnel": 390 case "tunnel":
391 case "reliefTunnel": 391 case "reliefTunnel":
392 case "squareTunnel": 392 case "squareTunnel":
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 1f89f79e..2d26638b 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -176,22 +176,22 @@ var radialBlurMaterialDef =
176}; 176};
177 177
178 178
179var RaidersMaterial = function RaidersMaterial() { 179var DarkBlurMaterial = function DarkBlurMaterial() {
180 // initialize the inherited members 180 // initialize the inherited members
181 this.inheritedFrom = RadialBlurMaterial; 181 this.inheritedFrom = RadialBlurMaterial;
182 this.inheritedFrom(); 182 this.inheritedFrom();
183 183
184 this._name = "Raiders"; 184 this._name = "Dark Blur";
185 this._shaderName = "raiders"; 185 this._shaderName = "darkBlur";
186 186
187 this._texMap = 'assets/images/raiders.png'; 187 this._texMap = 'assets/images/darkblur.png';
188 this._propValues[this._propNames[0]] = this._texMap.slice(0); 188 this._propValues[this._propNames[0]] = this._texMap.slice(0);
189 189
190 190
191 // duplicate method required 191 // duplicate method required
192 this.dup = function (world) { 192 this.dup = function (world) {
193 // allocate a new uber material 193 // allocate a new uber material
194 var newMat = new RaidersMaterial(); 194 var newMat = new DarkBlurMaterial();
195 195
196 // copy over the current values; 196 // copy over the current values;
197 var propNames = [], propValues = [], propTypes = [], propLabels = []; 197 var propNames = [], propValues = [], propTypes = [], propLabels = [];
@@ -204,10 +204,10 @@ var RaidersMaterial = function RaidersMaterial() {
204 }; 204 };
205} 205}
206 206
207RaidersMaterial.prototype = new Material(); 207DarkBlurMaterial.prototype = new Material();
208 208
209if (typeof exports === "object") { 209if (typeof exports === "object") {
210 exports.RaidersMaterial = RaidersMaterial; 210 exports.DarkBlurMaterial = DarkBlurMaterial;
211} 211}
212 212
213 213
diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js
index c7e7313c..9997244c 100644
--- a/js/lib/rdge/materials/water-material.js
+++ b/js/lib/rdge/materials/water-material.js
@@ -165,16 +165,16 @@ var waterMaterialDef =
165 } 165 }
166}; 166};
167 167
168var ParisMaterial = function ParisMaterial() 168var BlueSkyMaterial = function BlueSkyMaterial()
169{ 169{
170 // initialize the inherited members 170 // initialize the inherited members
171 this.inheritedFrom = WaterMaterial; 171 this.inheritedFrom = WaterMaterial;
172 this.inheritedFrom(); 172 this.inheritedFrom();
173 173
174 this._name = "Paris"; 174 this._name = "Blue Sky";
175 this._shaderName = "paris"; 175 this._shaderName = "blueSky";
176 176
177 this._defaultTexMap = 'assets/images/paris.png'; 177 this._defaultTexMap = 'assets/images/bluesky.png';
178 this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0); 178 this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
179 179
180 //this._diffuseColor = [0.5, 0.5, 0.5, 0.5]; 180 //this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
@@ -191,7 +191,7 @@ var ParisMaterial = function ParisMaterial()
191 this._shader.init(); 191 this._shader.init();
192 192
193 // set up the material node 193 // set up the material node
194 this._materialNode = RDGE.createMaterialNode("parisMaterial" + "_" + world.generateUniqueNodeID()); 194 this._materialNode = RDGE.createMaterialNode("blueSkyMaterial" + "_" + world.generateUniqueNodeID());
195 this._materialNode.setShader(this._shader); 195 this._materialNode.setShader(this._shader);
196 196
197 this._time = 0; 197 this._time = 0;
@@ -206,9 +206,9 @@ var ParisMaterial = function ParisMaterial()
206} 206}
207 207
208 208
209ParisMaterial.prototype = new PulseMaterial(); 209BlueSkyMaterial.prototype = new PulseMaterial();
210if (typeof exports === "object") { 210if (typeof exports === "object") {
211 exports.ParisMaterial = ParisMaterial; 211 exports.BlueSkyMaterial = BlueSkyMaterial;
212} 212}
213 213
214 214
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index 15feca93..ec481933 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -43,7 +43,7 @@ var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").Bum
43var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; 43var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
44//var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; 44//var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial;
45var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; 45var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
46var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; 46var DarkBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").DarkBlurMaterial;
47var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; 47var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
48var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; 48var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
49//var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; 49//var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
@@ -52,7 +52,7 @@ var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial;
52//var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial; 52//var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
53//var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial; 53//var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;
54var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; 54var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
55var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial; 55var BlueSkyMaterial = require("js/lib/rdge/materials/water-material").BlueSkyMaterial;
56//var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial; 56//var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial;
57//var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; 57//var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
58//var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; 58//var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
@@ -74,8 +74,10 @@ exports.MaterialsModel = Montage.create(Component, {
74 value: function() { 74 value: function() {
75 // Load all the materials 75 // Load all the materials
76 this.addMaterial(new FlatMaterial()); 76 this.addMaterial(new FlatMaterial());
77 this.addMaterial(new BlueSkyMaterial());
77 this.addMaterial(new BumpMetalMaterial()); 78 this.addMaterial(new BumpMetalMaterial());
78 //this.addMaterial(new CloudMaterial()); 79 //this.addMaterial(new CloudMaterial());
80 this.addMaterial(new DarkBlurMaterial());
79 //this.addMaterial(new DeformMaterial()); 81 //this.addMaterial(new DeformMaterial());
80 this.addMaterial(new FlagMaterial()); 82 this.addMaterial(new FlagMaterial());
81 //this.addMaterial(new FlyMaterial()); 83 //this.addMaterial(new FlyMaterial());
@@ -83,12 +85,10 @@ exports.MaterialsModel = Montage.create(Component, {
83 //this.addMaterial(new KeleidoscopeMaterial()); 85 //this.addMaterial(new KeleidoscopeMaterial());
84 this.addMaterial(new LinearGradientMaterial()); 86 this.addMaterial(new LinearGradientMaterial());
85 //this.addMaterial(new MandelMaterial()); 87 //this.addMaterial(new MandelMaterial());
86 this.addMaterial(new ParisMaterial());
87 this.addMaterial(new PlasmaMaterial()); 88 this.addMaterial(new PlasmaMaterial());
88 this.addMaterial(new PulseMaterial()); 89 this.addMaterial(new PulseMaterial());
89 this.addMaterial(new RadialBlurMaterial()); 90 this.addMaterial(new RadialBlurMaterial());
90 this.addMaterial(new RadialGradientMaterial()); 91 this.addMaterial(new RadialGradientMaterial());
91 this.addMaterial(new RaidersMaterial());
92 //this.addMaterial(new ReliefTunnelMaterial()); 92 //this.addMaterial(new ReliefTunnelMaterial());
93 //this.addMaterial(new SquareTunnelMaterial()); 93 //this.addMaterial(new SquareTunnelMaterial());
94 //this.addMaterial(new StarMaterial()); 94 //this.addMaterial(new StarMaterial());
@@ -260,8 +260,8 @@ exports.MaterialsModel = Montage.create(Component, {
260 case "flag": mat = new FlagMaterial(); break; 260 case "flag": mat = new FlagMaterial(); break;
261 //case "fly": mat = new FlyMaterial(); break; 261 //case "fly": mat = new FlyMaterial(); break;
262 case "water": mat = new WaterMaterial(); break; 262 case "water": mat = new WaterMaterial(); break;
263 case "paris": mat = new ParisMaterial(); break; 263 case "blueSky": mat = new BlueSkyMaterial(); break;
264 case "raiders": mat = new RaidersMaterial(); break; 264 case "darkBlur": mat = new DarkBlurMaterial(); break;
265 //case "zinvert": mat = new ZInvertMaterial(); break; 265 //case "zinvert": mat = new ZInvertMaterial(); break;
266 //case "deform": mat = new DeformMaterial(); break; 266 //case "deform": mat = new DeformMaterial(); break;
267 //case "star": mat = new StarMaterial(); break; 267 //case "star": mat = new StarMaterial(); break;
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index 8e025185..6fe5da69 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -5,10 +5,18 @@
5 "label": "Ninja Materials", 5 "label": "Ninja Materials",
6 "children": [ 6 "children": [
7 { 7 {
8 "label": "Blue Sky",
9 "id" : "Blue Sky"