diff options
Diffstat (limited to 'js/lib/rdge/materials/deform-material.js')
-rw-r--r-- | js/lib/rdge/materials/deform-material.js | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js index 234f22e4..68084d0e 100644 --- a/js/lib/rdge/materials/deform-material.js +++ b/js/lib/rdge/materials/deform-material.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -102,16 +103,16 @@ var DeformMaterial = function DeformMaterial() { | |||
102 | 103 | ||
103 | /////////////////////////////////////////////////////////////////////////////////////// | 104 | /////////////////////////////////////////////////////////////////////////////////////// |
104 | // RDGE shader | 105 | // RDGE shader |
105 | 106 | ||
106 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) | 107 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) |
107 | var deformMaterialDef = | 108 | var deformMaterialDef = |
108 | {'shaders': | 109 | {'shaders': |
109 | { | 110 | { |
110 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", | 111 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", |
111 | 'defaultFShader':"assets/shaders/Deform.frag.glsl" | 112 | 'defaultFShader':"assets/shaders/Deform.frag.glsl" |
112 | }, | 113 | }, |
113 | 'techniques': | 114 | 'techniques': |
114 | { | 115 | { |
115 | 'default': | 116 | 'default': |
116 | [ | 117 | [ |
117 | { | 118 | { |
@@ -125,7 +126,7 @@ var deformMaterialDef = | |||
125 | 'texcoord' : { 'type' : 'vec2' } | 126 | 'texcoord' : { 'type' : 'vec2' } |
126 | }, | 127 | }, |
127 | // parameters | 128 | // parameters |
128 | 'params' : | 129 | 'params' : |
129 | { | 130 | { |
130 | 'u_tex0': { 'type' : 'tex2d' }, | 131 | 'u_tex0': { 'type' : 'tex2d' }, |
131 | 'u_time' : { 'type' : 'float' }, | 132 | 'u_time' : { 'type' : 'float' }, |
@@ -134,7 +135,7 @@ var deformMaterialDef = | |||
134 | }, | 135 | }, |
135 | 136 | ||
136 | // render states | 137 | // render states |
137 | 'states' : | 138 | 'states' : |
138 | { | 139 | { |
139 | 'depthEnable' : true, | 140 | 'depthEnable' : true, |
140 | 'offset':[1.0, 0.1] | 141 | 'offset':[1.0, 0.1] |