From d6613f1e883eaa318fcf2098477eb5eede3d34ba Mon Sep 17 00:00:00 2001 From: hwc487 Date: Tue, 10 Jul 2012 10:00:35 -0700 Subject: Removed the shaders that we do not have rights to. --- js/io/system/ninjalibrary.json | 2 +- js/models/materials-model.js | 78 ++++++++++++++++----------------- js/panels/Materials/materials-data.json | 52 ---------------------- 3 files changed, 40 insertions(+), 92 deletions(-) (limited to 'js') diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index 7f8ee94f..bbf53144 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.3"} + {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.4"} ] } \ No newline at end of file diff --git a/js/models/materials-model.js b/js/models/materials-model.js index 833eb08f..cc3c3fa1 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -42,26 +42,26 @@ 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; -var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material").ReliefTunnelMaterial; +//var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; +//var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material").ReliefTunnelMaterial; 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 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 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; -var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial; +//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; +//var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial; var TwistVertMaterial = require("js/lib/rdge/materials/twist-vert-material").TwistVertMaterial; var TaperMaterial = require("js/lib/rdge/materials/taper-material").TaperMaterial; -var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial; -var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial; -var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial; +//var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial; +//var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial; +//var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial; exports.MaterialsModel = Montage.create(Component, { @@ -76,29 +76,29 @@ exports.MaterialsModel = Montage.create(Component, { this.addMaterial(new FlatMaterial()); this.addMaterial(new BumpMetalMaterial()); //this.addMaterial(new CloudMaterial()); - this.addMaterial(new DeformMaterial()); + //this.addMaterial(new DeformMaterial()); this.addMaterial(new FlagMaterial()); - this.addMaterial(new FlyMaterial()); - this.addMaterial(new JuliaMaterial()); - this.addMaterial(new KeleidoscopeMaterial()); + //this.addMaterial(new FlyMaterial()); + //this.addMaterial(new JuliaMaterial()); + //this.addMaterial(new KeleidoscopeMaterial()); this.addMaterial(new LinearGradientMaterial()); - this.addMaterial(new MandelMaterial()); + //this.addMaterial(new MandelMaterial()); 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 ReliefTunnelMaterial()); - this.addMaterial(new SquareTunnelMaterial()); - this.addMaterial(new StarMaterial()); + //this.addMaterial(new RaidersMaterial()); + //this.addMaterial(new ReliefTunnelMaterial()); + //this.addMaterial(new SquareTunnelMaterial()); + //this.addMaterial(new StarMaterial()); this.addMaterial(new TaperMaterial()); - this.addMaterial(new TunnelMaterial()); - this.addMaterial(new TwistMaterial()); + //this.addMaterial(new TunnelMaterial()); + //this.addMaterial(new TwistMaterial()); this.addMaterial(new TwistVertMaterial()); this.addMaterial(new UberMaterial()); this.addMaterial(new WaterMaterial()); - this.addMaterial(new ZInvertMaterial()); + //this.addMaterial(new ZInvertMaterial()); } }, @@ -251,24 +251,24 @@ 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; - case "reliefTunnel": mat = new ReliefTunnelMaterial(); break; - case "squareTunnel": mat = new SquareTunnelMaterial(); break; + //case "tunnel": mat = new TunnelMaterial(); break; + //case "reliefTunnel": mat = new ReliefTunnelMaterial(); break; + //case "squareTunnel": mat = new SquareTunnelMaterial(); break; case "flag": mat = new FlagMaterial(); break; - case "fly": mat = new FlyMaterial(); 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 "zinvert": mat = new ZInvertMaterial(); break; - case "deform": mat = new DeformMaterial(); break; - case "star": mat = new StarMaterial(); break; - case "twist": mat = new TwistMaterial(); break; - case "julia": mat = new JuliaMaterial(); break; - case "keleidoscope": mat = new KeleidoscopeMaterial(); break; - case "mandel": mat = new MandelMaterial(); 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; + //case "twist": mat = new TwistMaterial(); break; + //case "julia": mat = new JuliaMaterial(); break; + //case "keleidoscope": mat = new KeleidoscopeMaterial(); break; + //case "mandel": mat = new MandelMaterial(); break; default: diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index fde82d3d..abdacbe1 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json @@ -8,34 +8,14 @@ "label": "Bump Metal", "id" : "Bump Metal" }, - { - "label": "Deform", - "id" : "Deform" - }, { "label": "Flag", "id" : "Flag" }, - { - "label": "Fly", - "id" : "Fly" - }, - { - "label": "Julia", - "id" : "Julia" - }, - { - "label": "Keleidoscope", - "id" : "Keleidoscope" - }, { "label": "Linear Gradient", "id" : "Linear Gradient" }, - { - "label": "Mandel", - "id" : "Mandel" - }, { "label": "Paris", "id" : "Paris" @@ -48,42 +28,14 @@ "label": "Pulse", "id" : "Pulse" }, - { - "label": "Radial Blur", - "id" : "Radial Blur" - }, { "label": "Radial Gradient", "id" : "Radial Gradient" }, - { - "label": "Raiders", - "id" : "Raiders" - }, - { - "label": "Relief Tunnel", - "id" : "Relief Tunnel" - }, - { - "label": "Square Tunnel", - "id" : "Square Tunnel" - }, - { - "label": "Star", - "id" : "Star" - }, { "label": "Taper", "id" : "Taper" }, - { - "label": "Tunnel", - "id" : "Tunnel" - }, - { - "label": "Twist", - "id" : "Twist" - }, { "label": "Twist Vertex", "id" : "Twist Vertex" @@ -95,10 +47,6 @@ { "label": "Water", "id" : "Water" - }, - { - "label": "Z-Invert", - "id" : "Z-Invert" } ] }, -- cgit v1.2.3