From f775fb752cac57a0c1f6c42c8c60f5ff329eab32 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:36:19 -0800
Subject: Revert "Integrating canvas-2d drawing and WebGL fixes, including
adding back WebGL materials."
This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
---
js/helper-classes/RDGE/Materials/DeformMaterial.js | 133 -----------
js/helper-classes/RDGE/Materials/FlyMaterial.js | 133 -----------
js/helper-classes/RDGE/Materials/JuliaMaterial.js | 150 ------------
.../RDGE/Materials/KeleidoscopeMaterial.js | 149 ------------
js/helper-classes/RDGE/Materials/MandelMaterial.js | 151 ------------
js/helper-classes/RDGE/Materials/PlasmaMaterial.js | 134 -----------
js/helper-classes/RDGE/Materials/PulseMaterial.js | 253 ---------------------
.../RDGE/Materials/RadialBlurMaterial.js | 246 --------------------
.../RDGE/Materials/ReliefTunnelMaterial.js | 133 -----------
.../RDGE/Materials/SquareTunnelMaterial.js | 133 -----------
js/helper-classes/RDGE/Materials/StarMaterial.js | 133 -----------
js/helper-classes/RDGE/Materials/TaperMaterial.js | 223 ------------------
js/helper-classes/RDGE/Materials/TunnelMaterial.js | 133 -----------
js/helper-classes/RDGE/Materials/TwistMaterial.js | 149 ------------
.../RDGE/Materials/TwistVertMaterial.js | 248 --------------------
js/helper-classes/RDGE/Materials/WaterMaterial.js | 133 -----------
.../RDGE/Materials/ZInvertMaterial.js | 133 -----------
17 files changed, 2767 deletions(-)
delete mode 100644 js/helper-classes/RDGE/Materials/DeformMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/FlyMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/JuliaMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/MandelMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/PlasmaMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/PulseMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/StarMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/TaperMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/TunnelMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/TwistMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/TwistVertMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/WaterMaterial.js
delete mode 100644 js/helper-classes/RDGE/Materials/ZInvertMaterial.js
(limited to 'js/helper-classes/RDGE/Materials')
diff --git a/js/helper-classes/RDGE/Materials/DeformMaterial.js b/js/helper-classes/RDGE/Materials/DeformMaterial.js
deleted file mode 100644
index ddc97383..00000000
--- a/js/helper-classes/RDGE/Materials/DeformMaterial.js
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function DeformMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = PulseMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "DeformMaterial";
- this._shaderName = "deform";
-
- this._texMap = 'assets/images/rocky-normal.jpg';
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Properties
- ///////////////////////////////////////////////////////////////////////
- // all defined in parent PulseMaterial.js
- // load the local default value
- this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new DeformMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function FlyMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = PulseMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "FlyMaterial";
- this._shaderName = "fly";
-
- this._texMap = 'assets/images/rocky-normal.jpg';
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Properties
- ///////////////////////////////////////////////////////////////////////
- // all defined in parent PulseMaterial.js
- // load the local default value
- this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new FlyMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function JuliaMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = PulseMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "JuliaMaterial";
- this._shaderName = "julia";
-
- this._texMap = 'assets/images/rocky-normal.jpg';
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Properties
- ///////////////////////////////////////////////////////////////////////
- // no properties
- this._propNames = [];
- this._propLabels = [];
- this._propTypes = [];
- this._propValues = [];
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new JuliaMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function KeleidoscopeMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = PulseMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "KeleidoscopeMaterial";
- this._shaderName = "keleidoscope";
-
- this._texMap = 'assets/images/rocky-normal.jpg';
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Properties
- ///////////////////////////////////////////////////////////////////////
- // all defined in parent PulseMaterial.js
- // load the local default value
- this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new KeleidoscopeMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function MandelMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = PulseMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "MandelMaterial";
- this._shaderName = "mandel";
-
- this._texMap = 'assets/images/rocky-normal.jpg';
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Properties
- ///////////////////////////////////////////////////////////////////////
- // no properties
- this._propNames = [];
- this._propLabels = [];
- this._propTypes = [];
- this._propValues = [];
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
-
- this.isAnimated = function() { return true; }
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new MandelMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function PlasmaMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = GLMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "PlasmaMaterial";
- this._shaderName = "plasma";
-
- this._time = 0.0;
- this._dTime = 0.01;
- this._speed = 1.0;
-
- this._color = [1,0,0,1];
-
-
- ///////////////////////////////////////////////////////////////////////
- // Property Accessors
- ///////////////////////////////////////////////////////////////////////
- this.getShaderName = function() { return this._shaderName; }
-
- this.isAnimated = function() { return true; }
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
- this._propNames = ["color"];
- this._propLabels = ["Color"];
- this._propTypes = ["color"];
- this._propValues = [];
-
- this._propValues[ this._propNames[0] ] = this._color;
-
- this.setProperty = function( prop, value )
- {
- // make sure we have legitimate imput
- if (this.validateProperty( prop, value ))
- {
- this._color = value.slice(0);
- this._shader.default[prop].set(value);
- }
- }
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function() { return new PlasmaMaterial(); }
-
- this.init = function()
- {
- // set up the shader
- this._shader = new jshader();
- this._shader.def = plasmaShaderDef;
- this._shader.init();
-
- // set the default value
- this._time = 0;
- this._shader.default.u_time = this._time;
- this.setProperty( "color", [this._time, 0, 0, 1] );
-
- // set up the material node
- this._materialNode = createMaterialNode("plasmaMaterial");
- this._materialNode.setShader(this._shader);
- }
-
- this.update = function( time )
- {
- this._shader.default.u_time = this._time;
- var color = this.getProperty( "color" );
- color[0] = this._time;
- this.setProperty( "color", color );
- //console.log( "update color to: " + color );
- this._time += this._dTime;
- }
-
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-// RDGE shader
-
-// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
-var plasmaShaderDef =
-{'shaders':
- {
- 'defaultVShader':"assets/shaders/plasma.vert.glsl",
- 'defaultFShader':"assets/shaders/plasma.frag.glsl",
- },
- 'techniques':
- {
- 'default':
- [
- {
- 'vshader' : 'defaultVShader',
- 'fshader' : 'defaultFShader',
- // attributes
- 'attributes' :
- {
- 'vert' : { 'type' : 'vec3' },
- 'normal' : { 'type' : 'vec3' },
- 'texcoord' : { 'type' : 'vec2' },
- },
- // parameters
- 'params' :
- {
- 'u_time' : { 'type' : 'float' },
- 'color' : { 'type' : 'vec4' }
- },
-
- // render states
- 'states' :
- {
- 'depthEnable' : true,
- 'offset':[1.0, 0.1]
- },
- },
- ]
- }
-};
-
diff --git a/js/helper-classes/RDGE/Materials/PulseMaterial.js b/js/helper-classes/RDGE/Materials/PulseMaterial.js
deleted file mode 100644
index 6f7e9fe0..00000000
--- a/js/helper-classes/RDGE/Materials/PulseMaterial.js
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function PulseMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = GLMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "PulseMaterial";
- this._shaderName = "pulse";
-
- this._texMap = 'assets/images/cubelight.png';
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Property Accessors
- ///////////////////////////////////////////////////////////////////////
- this.getName = function() { return this._name; }
- this.getShaderName = function() { return this._shaderName; }
-
- this.getTextureMap = function() { return this._propValues[this._propNames[0]] ? this._propValues[this._propNames[0]].slice() : null }
- this.setTextureMap = function(m) { this._propValues[this._propNames[0]] = m ? m.slice(0) : null; this.updateTexture(); }
-
- this.isAnimated = function() { return true; }
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
- this._propNames = ["texmap"];
- this._propLabels = ["Texture map"];
- this._propTypes = ["file"];
- this._propValues = [];
-
- this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-
- this.setProperty = function( prop, value )
- {
- // make sure we have legitimate imput
- var ok = this.validateProperty( prop, value );
- if (!ok)
- console.log( "invalid property in Radial Gradient Material:" + prop + " : " + value );
-
- switch (prop)
- {
- case "texmap":
- this.setTextureMap(value);
- break;
-
- case "color":
- break;
- }
- }
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // save the world
- if (world) this.setWorld( world );
-
- // allocate a new uber material
- var newMat = new PulseMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i 200.0) this._time = 0.0;
- }
- }
- }
-
- this.setResolution = function( res )
- {
- var material = this._materialNode;
- if (material)
- {
- var technique = material.shaderProgram.default;
- var renderer = g_Engine.getContext().renderer;
- if (renderer && technique)
- {
- technique.u_resolution.set( res );
- }
- }
- }
-
- this.export = function()
- {
- // every material needs the base type and instance name
- var exportStr = "material: " + this.getShaderName() + "\n";
- exportStr += "name: " + this.getName() + "\n";
-
- // every material needs to terminate like this
- exportStr += "endMaterial\n";
-
- return exportStr;
- }
-
- this.import = function( importStr )
- {
- var pu = new ParseUtils( importStr );
- var material = pu.nextValue( "material: " );
- if (material != this.getShaderName()) throw new Error( "ill-formed material" );
- this.setName( pu.nextValue( "name: ") );
-
- var rtnStr;
-
- return rtnStr;
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-// RDGE shader
-
-// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
-var pulseMaterialDef =
-{'shaders':
- {
- 'defaultVShader':"assets/shaders/Basic.vert.glsl",
- 'defaultFShader':"assets/shaders/Pulse.frag.glsl"
- },
- 'techniques':
- {
- 'default':
- [
- {
- 'vshader' : 'defaultVShader',
- 'fshader' : 'defaultFShader',
- // attributes
- 'attributes' :
- {
- 'vert' : { 'type' : 'vec3' },
- 'normal' : { 'type' : 'vec3' },
- 'texcoord' : { 'type' : 'vec2' }
- },
- // parameters
- 'params' :
- {
- 'u_tex0': { 'type' : 'tex2d' },
- 'u_time' : { 'type' : 'float' },
- 'u_resolution' : { 'type' : 'vec2' },
- },
-
- // render states
- 'states' :
- {
- 'depthEnable' : true,
- 'offset':[1.0, 0.1]
- },
- },
- ]
- }
-};
-
-
-
-
diff --git a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
deleted file mode 100644
index 732800cf..00000000
--- a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function RadialBlurMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = GLMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "RadialBlurMaterial";
- this._shaderName = "radialBlur";
-
- this._texMap = 'assets/images/cubelight.png';
- this._color = [1,0,0,1];
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Property Accessors
- ///////////////////////////////////////////////////////////////////////
- this.getName = function() { return this._name; }
- this.getShaderName = function() { return this._shaderName; }
-
- this.getTextureMap = function() { return this._texMap.slice(0); }
- this.setTextureMap = function(m) { this._propValues[this._propNames[0]] = m.slice(0); this.updateTexture(); }
-
- this.isAnimated = function() { return true; }
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
- this._propNames = ["texmap", "color"];
- this._propLabels = ["Texture map", "Color"];
- this._propTypes = ["file", "color"];
- this._propValues = [];
-
- this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
- this._propValues[ this._propNames[1] ] = this._color.slice(0);
-
- this.setProperty = function( prop, value )
- {
- // make sure we have legitimate imput
- var ok = this.validateProperty( prop, value );
- if (!ok)
- console.log( "invalid property in Radial Gradient Material:" + prop + " : " + value );
-
- switch (prop)
- {
- case "texmap":
- this.setTextureMap(value);
- break;
-
- case "color":
- this._propValues[prop] = value.slice(0);
- if (this._shader && this._shader.default)
- this._shader.default[prop].set(value);
- break;
- }
- }
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new RadialBlurMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function ReliefTunnelMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = PulseMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "ReliefTunnelMaterial";
- this._shaderName = "reliefTunnel";
-
- this._texMap = 'assets/images/rocky-normal.jpg';
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Properties
- ///////////////////////////////////////////////////////////////////////
- // all defined in parent PulseMaterial.js
- // load the local default value
- this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new ReliefTunnelMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function SquareTunnelMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = PulseMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "SquareTunnelMaterial";
- this._shaderName = "squareTunnel";
-
- this._texMap = 'assets/images/rocky-normal.jpg';
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Properties
- ///////////////////////////////////////////////////////////////////////
- // all defined in parent PulseMaterial.js
- // load the local default value
- this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new SquareTunnelMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function StarMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = PulseMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "StarMaterial";
- this._shaderName = "star";
-
- this._texMap = 'assets/images/rocky-normal.jpg';
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Properties
- ///////////////////////////////////////////////////////////////////////
- // all defined in parent PulseMaterial.js
- // load the local default value
- this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new StarMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function TaperMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = GLMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "TaperMaterial";
- this._shaderName = "taper";
-
- this._color = [1,0,0,1];
-
- this._deltaTime = 0.0;
-
- ///////////////////////////////////////////////////////////////////////
- // Property Accessors
- ///////////////////////////////////////////////////////////////////////
- this.getColor = function() { return this._color; }
- this.getShaderName = function() { return this._shaderName; }
-
- this.isAnimated = function() { return true; }
- this.hasVertexDeformation = function() { return this._hasVertexDeformation; }
- this._hasVertexDeformation = true;
- this._vertexDeformationTolerance = 0.02; // should be a property
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function() { return new TaperMaterial(); }
-
- this.init = function()
- {
- // set up the shader
- this._shader = new jshader();
- this._shader.def = taperShaderDef;
- this._shader.init();
-
- // set the defaults
- this._shader.colorMe.color.set( this.getColor() );
-
- // set up the material node
- this._materialNode = createMaterialNode("taperMaterial");
- this._materialNode.setShader(this._shader);
-
- // initialize the taper properties
- this.updateShaderValues();
- }
-
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
- this._propNames = ["color", "u_limit1", "u_limit2", "u_limit3", "u_minVal", "u_maxVal", "u_center", "u_taperAmount" ];
- this._propLabels = ["Color", "Minimum Parameter Value", "Center Paramater Value", "Maximum Parameter Value", "Minimum Data Bounds", "Maximum Data Bounds", "Center", "Taper Amount"];
- this._propTypes = ["color", "float", "float", "float", "float", "float", "float", "float"];
- this._propValues = [];
-
- // initialize the property values
- this._propValues[ this._propNames[0] ] = this._color.slice();
- this._propValues[ this._propNames[1] ] = 0.25;
- this._propValues[ this._propNames[2] ] = 0.50;
- this._propValues[ this._propNames[3] ] = 0.75;
- this._propValues[ this._propNames[4] ] = -1;
- this._propValues[ this._propNames[5] ] = 1;
- this._propValues[ this._propNames[6] ] = 0.0;
- this._propValues[ this._propNames[7] ] = 0.9;
-
- this.setProperty = function( prop, value )
- {
- // make sure we have legitimate input
- if (this.validateProperty( prop, value ))
- {
- switch (prop)
- {
- case "color": this._propValues[prop] = value.slice(); break;
- default: this._propValues[prop] = value; break;
- }
-
- this.updateShaderValues();
- }
- }
- ///////////////////////////////////////////////////////////////////////
-
- this.export = function()
- {
- // this function should be overridden by subclasses
- var exportStr = "material: " + this.getShaderName() + "\n";
- exportStr += "name: " + this.getName() + "\n";
-
- if (this._shader)
- exportStr += "color: " + String(this._shader.colorMe.color) + "\n";
- else
- exportStr += "color: " + this.getColor() + "\n";
- exportStr += "endMaterial\n";
-
- return exportStr;
- }
-
- this.import = function( importStr )
- {
- var pu = new ParseUtils( importStr );
- var material = pu.nextValue( "material: " );
- if (material != this.getShaderName()) throw new Error( "ill-formed material" );
- this.setName( pu.nextValue( "name: ") );
-
- var rtnStr;
- try
- {
- var color = eval( "[" + pu.nextValue( "color: " ) + "]" );
-
- this.setProperty( "color", color);
-
- var endKey = "endMaterial\n";
- var index = importStr.indexOf( endKey );
- index += endKey.length;
- rtnStr = importStr.substr( index );
- }
- catch (e)
- {
- throw new Error( "could not import material: " + importStr );
- }
-
- return rtnStr;
- }
-
- this.update = function( time )
- {
- //var speed = 0.01;
- //time *= speed;
- this._deltaTime += 0.01;
-
- if (this._shader && this._shader.colorMe)
- {
- var t3 = this._propValues[ this._propNames[3] ] - this._deltaTime;
- if (t3 < 0)
- {
- this._deltaTime = this._propValues[ this._propNames[1] ] - 1.0;
- t3 = this._propValues[ this._propNames[3] ] - this._deltaTime;
- }
- var t1 = this._propValues[ this._propNames[1] ] - this._deltaTime,
- t2 = this._propValues[ this._propNames[2] ] - this._deltaTime;
-
-
- this._shader.colorMe[this._propNames[1]].set( [t1] );
- this._shader.colorMe[this._propNames[2]].set( [t2] );
- this._shader.colorMe[this._propNames[3]].set( [t3] );
- }
- }
-
- this.updateShaderValues = function()
- {
- if (this._shader && this._shader.colorMe)
- {
- var nProps = this._propNames.length;
- for (var i=0; i
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function TunnelMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = PulseMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "TunnelMaterial";
- this._shaderName = "tunnel";
-
- this._texMap = 'assets/images/rocky-normal.jpg';
-
- this._time = 0.0;
- this._dTime = 0.001;
-
- ///////////////////////////////////////////////////////////////////////
- // Properties
- ///////////////////////////////////////////////////////////////////////
- // all defined in parent PulseMaterial.js
- // load the local default value
- this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new TunnelMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels