diff options
Diffstat (limited to 'js/lib/rdge/materials/julia-material.js')
-rw-r--r-- | js/lib/rdge/materials/julia-material.js | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js index eed9e79a..c1d6d1f8 100644 --- a/js/lib/rdge/materials/julia-material.js +++ b/js/lib/rdge/materials/julia-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 |
@@ -90,16 +91,16 @@ var JuliaMaterial = function JuliaMaterial() { | |||
90 | 91 | ||
91 | /////////////////////////////////////////////////////////////////////////////////////// | 92 | /////////////////////////////////////////////////////////////////////////////////////// |
92 | // RDGE shader | 93 | // RDGE shader |
93 | 94 | ||
94 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) | 95 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) |
95 | var JuliaMaterialDef = | 96 | var JuliaMaterialDef = |
96 | {'shaders': | 97 | {'shaders': |
97 | { | 98 | { |
98 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", | 99 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", |
99 | 'defaultFShader':"assets/shaders/Julia.frag.glsl" | 100 | 'defaultFShader':"assets/shaders/Julia.frag.glsl" |
100 | }, | 101 | }, |
101 | 'techniques': | 102 | 'techniques': |
102 | { | 103 | { |
103 | 'default': | 104 | 'default': |
104 | [ | 105 | [ |
105 | { | 106 | { |
@@ -113,7 +114,7 @@ var JuliaMaterialDef = | |||
113 | 'texcoord' : { 'type' : 'vec2' } | 114 | 'texcoord' : { 'type' : 'vec2' } |
114 | }, | 115 | }, |
115 | // parameters | 116 | // parameters |
116 | 'params' : | 117 | 'params' : |
117 | { | 118 | { |
118 | 'u_time' : { 'type' : 'float' }, | 119 | 'u_time' : { 'type' : 'float' }, |
119 | 'u_speed' : { 'type' : 'float' }, | 120 | 'u_speed' : { 'type' : 'float' }, |
@@ -121,7 +122,7 @@ var JuliaMaterialDef = | |||
121 | }, | 122 | }, |
122 | 123 | ||
123 | // render states | 124 | // render states |
124 | 'states' : | 125 | 'states' : |
125 | { | 126 | { |
126 | 'depthEnable' : true, | 127 | 'depthEnable' : true, |
127 | 'offset':[1.0, 0.1] | 128 | 'offset':[1.0, 0.1] |