From 0df5ad6391df5d285cb8b93dc23e2595cddaec3c Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 19 Jul 2012 10:36:31 -0700 Subject: Re-added Radial Blur and Raiders materials --- js/models/materials-model.js | 12 ++++++------ js/panels/Materials/materials-data.json | 8 ++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'js') diff --git a/js/models/materials-model.js b/js/models/materials-model.js index cc3c3fa1..15feca93 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -42,8 +42,8 @@ var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-mate var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial; var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; //var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; -//var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; -//var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; +var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; +var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; //var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; @@ -86,9 +86,9 @@ exports.MaterialsModel = Montage.create(Component, { this.addMaterial(new ParisMaterial()); this.addMaterial(new PlasmaMaterial()); this.addMaterial(new PulseMaterial()); - //this.addMaterial(new RadialBlurMaterial()); + this.addMaterial(new RadialBlurMaterial()); this.addMaterial(new RadialGradientMaterial()); - //this.addMaterial(new RaidersMaterial()); + this.addMaterial(new RaidersMaterial()); //this.addMaterial(new ReliefTunnelMaterial()); //this.addMaterial(new SquareTunnelMaterial()); //this.addMaterial(new StarMaterial()); @@ -251,7 +251,7 @@ exports.MaterialsModel = Montage.create(Component, { case "taper": mat = new TaperMaterial(); break; case "twistVert": mat = new TwistVertMaterial(); break; - //case "radialBlur": mat = new RadialBlurMaterial(); break; + case "radialBlur": mat = new RadialBlurMaterial(); break; case "plasma": mat = new PlasmaMaterial(); break; case "pulse": mat = new PulseMaterial(); break; //case "tunnel": mat = new TunnelMaterial(); break; @@ -261,7 +261,7 @@ exports.MaterialsModel = Montage.create(Component, { //case "fly": mat = new FlyMaterial(); break; case "water": mat = new WaterMaterial(); break; case "paris": mat = new ParisMaterial(); break; - //case "raiders": mat = new RaidersMaterial(); break; + case "raiders": mat = new RaidersMaterial(); break; //case "zinvert": mat = new ZInvertMaterial(); break; //case "deform": mat = new DeformMaterial(); break; //case "star": mat = new StarMaterial(); break; diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index abdacbe1..8e025185 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json @@ -28,10 +28,18 @@ "label": "Pulse", "id" : "Pulse" }, + { + "label": "Radial Blur", + "id" : "Radial Blur" + }, { "label": "Radial Gradient", "id" : "Radial Gradient" }, + { + "label": "Raiders", + "id" : "Raiders" + }, { "label": "Taper", "id" : "Taper" -- cgit v1.2.3 From 431b6fa7610e59074b4ebb3e9e712672f185b8ad Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 19 Jul 2012 11:44:50 -0700 Subject: Renamed Raiders material to Dark Blur, and Paris to Blue Sky. --- js/io/system/ninjalibrary.json | 2 +- js/lib/geom/geom-obj.js | 4 ++-- js/lib/rdge/materials/radial-blur-material.js | 14 +++++++------- js/lib/rdge/materials/water-material.js | 14 +++++++------- js/models/materials-model.js | 12 ++++++------ js/panels/Materials/materials-data.json | 18 +++++++++--------- 6 files changed, 32 insertions(+), 32 deletions(-) (limited to 'js') 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 @@ { "libraries": [ {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"}, - {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.4"} + {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.5"} ] } \ 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, { case "plasma": case "deform": case "water": - case "paris": - case "raiders": + case "blueSky": + case "darkBlur": case "tunnel": case "reliefTunnel": 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 = }; -var RaidersMaterial = function RaidersMaterial() { +var DarkBlurMaterial = function DarkBlurMaterial() { // initialize the inherited members this.inheritedFrom = RadialBlurMaterial; this.inheritedFrom(); - this._name = "Raiders"; - this._shaderName = "raiders"; + this._name = "Dark Blur"; + this._shaderName = "darkBlur"; - this._texMap = 'assets/images/raiders.png'; + this._texMap = 'assets/images/darkblur.png'; this._propValues[this._propNames[0]] = this._texMap.slice(0); // duplicate method required this.dup = function (world) { // allocate a new uber material - var newMat = new RaidersMaterial(); + var newMat = new DarkBlurMaterial(); // copy over the current values; var propNames = [], propValues = [], propTypes = [], propLabels = []; @@ -204,10 +204,10 @@ var RaidersMaterial = function RaidersMaterial() { }; } -RaidersMaterial.prototype = new Material(); +DarkBlurMaterial.prototype = new Material(); if (typeof exports === "object") { - exports.RaidersMaterial = RaidersMaterial; + exports.DarkBlurMaterial = DarkBlurMaterial; } 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 = } }; -var ParisMaterial = function ParisMaterial() +var BlueSkyMaterial = function BlueSkyMaterial() { // initialize the inherited members this.inheritedFrom = WaterMaterial; this.inheritedFrom(); - this._name = "Paris"; - this._shaderName = "paris"; + this._name = "Blue Sky"; + this._shaderName = "blueSky"; - this._defaultTexMap = 'assets/images/paris.png'; + this._defaultTexMap = 'assets/images/bluesky.png'; this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0); //this._diffuseColor = [0.5, 0.5, 0.5, 0.5]; @@ -191,7 +191,7 @@ var ParisMaterial = function ParisMaterial() this._shader.init(); // set up the material node - this._materialNode = RDGE.createMaterialNode("parisMaterial" + "_" + world.generateUniqueNodeID()); + this._materialNode = RDGE.createMaterialNode("blueSkyMaterial" + "_" + world.generateUniqueNodeID()); this._materialNode.setShader(this._shader); this._time = 0; @@ -206,9 +206,9 @@ var ParisMaterial = function ParisMaterial() } -ParisMaterial.prototype = new PulseMaterial(); +BlueSkyMaterial.prototype = new PulseMaterial(); if (typeof exports === "object") { - exports.ParisMaterial = ParisMaterial; + exports.BlueSkyMaterial = BlueSkyMaterial; } 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 var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; //var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; -var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; +var DarkBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").DarkBlurMaterial; var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; //var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; @@ -52,7 +52,7 @@ var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial; //var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial; //var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial; var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; -var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial; +var BlueSkyMaterial = require("js/lib/rdge/materials/water-material").BlueSkyMaterial; //var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial; //var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; //var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; @@ -74,8 +74,10 @@ exports.MaterialsModel = Montage.create(Component, { value: function() { // Load all the materials this.addMaterial(new FlatMaterial()); + this.addMaterial(new BlueSkyMaterial()); this.addMaterial(new BumpMetalMaterial()); //this.addMaterial(new CloudMaterial()); + this.addMaterial(new DarkBlurMaterial()); //this.addMaterial(new DeformMaterial()); this.addMaterial(new FlagMaterial()); //this.addMaterial(new FlyMaterial()); @@ -83,12 +85,10 @@ exports.MaterialsModel = Montage.create(Component, { //this.addMaterial(new KeleidoscopeMaterial()); this.addMaterial(new LinearGradientMaterial()); //this.addMaterial(new MandelMaterial()); - this.addMaterial(new ParisMaterial()); this.addMaterial(new PlasmaMaterial()); this.addMaterial(new PulseMaterial()); this.addMaterial(new RadialBlurMaterial()); this.addMaterial(new RadialGradientMaterial()); - this.addMaterial(new RaidersMaterial()); //this.addMaterial(new ReliefTunnelMaterial()); //this.addMaterial(new SquareTunnelMaterial()); //this.addMaterial(new StarMaterial()); @@ -260,8 +260,8 @@ exports.MaterialsModel = Montage.create(Component, { case "flag": mat = new FlagMaterial(); break; //case "fly": mat = new FlyMaterial(); break; case "water": mat = new WaterMaterial(); break; - case "paris": mat = new ParisMaterial(); break; - case "raiders": mat = new RaidersMaterial(); break; + case "blueSky": mat = new BlueSkyMaterial(); break; + case "darkBlur": mat = new DarkBlurMaterial(); break; //case "zinvert": mat = new ZInvertMaterial(); break; //case "deform": mat = new DeformMaterial(); break; //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 @@ "label": "Ninja Materials", "children": [ { + "label": "Blue Sky", + "id" : "Blue Sky" + }, + { "label": "Bump Metal", "id" : "Bump Metal" }, - { + { + "label": "Dark Blur", + "id" : "Dark Blur" + }, + { "label": "Flag", "id" : "Flag" }, @@ -16,10 +24,6 @@ "label": "Linear Gradient", "id" : "Linear Gradient" }, - { - "label": "Paris", - "id" : "Paris" - }, { "label": "Plasma", "id" : "Plasma" @@ -36,10 +40,6 @@ "label": "Radial Gradient", "id" : "Radial Gradient" }, - { - "label": "Raiders", - "id" : "Raiders" - }, { "label": "Taper", "id" : "Taper" -- cgit v1.2.3