aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/backup-delete/Materials/WaterMaterial.js
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-02 16:28:39 -0700
committerJohn Mayhew2012-04-02 16:28:39 -0700
commitb4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/helper-classes/backup-delete/Materials/WaterMaterial.js
parent5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parentc6de22bf42be90b403491b5f87b1818d9020310c (diff)
downloadninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/runtime/GLRuntime.js js/helper-classes/RDGE/src/core/script/MeshManager.js js/helper-classes/RDGE/src/core/script/engine.js js/helper-classes/RDGE/src/core/script/fx/ssao.js js/helper-classes/RDGE/src/core/script/init_state.js js/helper-classes/RDGE/src/core/script/run_state.js js/helper-classes/RDGE/src/core/script/scenegraphNodes.js js/helper-classes/RDGE/src/core/script/utilities.js js/helper-classes/RDGE/src/tools/compile-rdge-core.bat js/helper-classes/RDGE/src/tools/compile-rdge-core.sh js/helper-classes/RDGE/src/tools/rdge-compiled.js js/lib/drawing/world.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/linear-gradient-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-blur-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js js/preloader/Preloader.js
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/WaterMaterial.js')
-rw-r--r--js/helper-classes/backup-delete/Materials/WaterMaterial.js133
1 files changed, 0 insertions, 133 deletions
diff --git a/js/helper-classes/backup-delete/Materials/WaterMaterial.js b/js/helper-classes/backup-delete/Materials/WaterMaterial.js
deleted file mode 100644
index 101a8c0c..00000000
--- a/js/helper-classes/backup-delete/Materials/WaterMaterial.js
+++ /dev/null
@@ -1,133 +0,0 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */
6
7
8
9///////////////////////////////////////////////////////////////////////
10// Class GLMaterial
11// RDGE representation of a material.
12///////////////////////////////////////////////////////////////////////
13function WaterMaterial()
14{
15 // initialize the inherited members
16 this.inheritedFrom = PulseMaterial;
17 this.inheritedFrom();
18
19 ///////////////////////////////////////////////////////////////////////
20 // Instance variables
21 ///////////////////////////////////////////////////////////////////////
22 this._name = "WaterMaterial";
23 this._shaderName = "water";
24
25 this._texMap = 'assets/images/rocky-normal.jpg';
26
27 this._time = 0.0;
28 this._dTime = 0.01;
29
30 ///////////////////////////////////////////////////////////////////////
31 // Properties
32 ///////////////////////////////////////////////////////////////////////
33 // all defined in parent PulseMaterial.js
34 // load the local default value
35 this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
36
37 ///////////////////////////////////////////////////////////////////////
38 // Material Property Accessors
39 ///////////////////////////////////////////////////////////////////////
40
41 ///////////////////////////////////////////////////////////////////////
42
43
44 ///////////////////////////////////////////////////////////////////////
45 // Methods
46 ///////////////////////////////////////////////////////////////////////
47 // duplcate method requirde
48 this.dup = function( world )
49 {
50 // allocate a new uber material
51 var newMat = new WaterMaterial();
52
53 // copy over the current values;
54 var propNames = [], propValues = [], propTypes = [], propLabels = [];
55 this.getAllProperties( propNames, propValues, propTypes, propLabels);
56 var n = propNames.length;
57 for (var i=0; i<n; i++)
58 newMat.setProperty( propNames[i], propValues[i] );
59
60 return newMat;
61 }
62
63 this.init = function( world )
64 {
65 // save the world
66 if (world) this.setWorld( world );
67
68 // set up the shader
69 this._shader = new jshader();
70 this._shader.def = waterMaterialDef;
71 this._shader.init();
72
73 // set up the material node
74 this._materialNode = createMaterialNode("waterMaterial");
75 this._materialNode.setShader(this._shader);
76
77 this._time = 0;
78 if (this._shader && this._shader.default)
79 this._shader.default.u_time.set( [this._time] );
80
81 // set the shader values in the shader
82 this.updateTexture();
83 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
84 this.update( 0 );
85 }
86}
87
88///////////////////////////////////////////////////////////////////////////////////////
89// RDGE shader
90
91// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
92var waterMaterialDef =
93{'shaders':
94 {
95 'defaultVShader':"assets/shaders/Basic.vert.glsl",
96 'defaultFShader':"assets/shaders/Water2.frag.glsl"
97 },
98 'techniques':
99 {
100 'default':
101 [
102 {
103 'vshader' : 'defaultVShader',
104 'fshader' : 'defaultFShader',
105 // attributes
106 'attributes' :
107 {
108 'vert' : { 'type' : 'vec3' },
109 'normal' : { 'type' : 'vec3' },
110 'texcoord' : { 'type' : 'vec2' }
111 },
112 // parameters
113 'params' :
114 {
115 'u_tex0': { 'type' : 'tex2d' },
116 'u_time' : { 'type' : 'float' },
117 'u_resolution' : { 'type' : 'vec2' },
118 },
119
120 // render states
121 'states' :
122 {
123 'depthEnable' : true,
124 'offset':[1.0, 0.1]
125 },
126 },
127 ]
128 }
129};
130
131
132
133