diff options
author | Kris Kowal | 2012-07-09 16:38:08 -0700 |
---|---|---|
committer | Kris Kowal | 2012-07-09 16:38:08 -0700 |
commit | 7bee50379c1df86bb571e0e8d6c08e24d25231f5 (patch) | |
tree | 5b11abd0414e0a3ab50ec6276b6334fbd168db7e /js/lib/rdge/materials/flat-material.js | |
parent | 26d4b5ce30e6e0ea6e0fde870853c1e2a673a7b4 (diff) | |
download | ninja-7bee50379c1df86bb571e0e8d6c08e24d25231f5.tar.gz |
BSD License
Diffstat (limited to 'js/lib/rdge/materials/flat-material.js')
-rwxr-xr-x | js/lib/rdge/materials/flat-material.js | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js index 6b8bd2c5..14eddadb 100755 --- a/js/lib/rdge/materials/flat-material.js +++ b/js/lib/rdge/materials/flat-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 |
@@ -70,7 +71,7 @@ var FlatMaterial = function FlatMaterial() | |||
70 | // set up the material node | 71 | // set up the material node |
71 | this._materialNode = RDGE.createMaterialNode("flatMaterial_" + world.generateUniqueNodeID()); | 72 | this._materialNode = RDGE.createMaterialNode("flatMaterial_" + world.generateUniqueNodeID()); |
72 | this._materialNode.setShader(this._shader); | 73 | this._materialNode.setShader(this._shader); |
73 | 74 | ||
74 | this.setShaderValues(); | 75 | this.setShaderValues(); |
75 | } | 76 | } |
76 | else | 77 | else |
@@ -91,9 +92,9 @@ var FlatMaterial = function FlatMaterial() | |||
91 | 92 | ||
92 | /////////////////////////////////////////////////////////////////////////////////////// | 93 | /////////////////////////////////////////////////////////////////////////////////////// |
93 | // RDGE shader | 94 | // RDGE shader |
94 | 95 | ||
95 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) | 96 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) |
96 | flatShaderDef = | 97 | flatShaderDef = |
97 | { | 98 | { |
98 | 'shaders': { // shader files | 99 | 'shaders': { // shader files |
99 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", | 100 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", |
@@ -104,7 +105,7 @@ flatShaderDef = | |||
104 | { | 105 | { |
105 | 'vshader' : 'defaultVShader', | 106 | 'vshader' : 'defaultVShader', |
106 | 'fshader' : 'defaultFShader', | 107 | 'fshader' : 'defaultFShader', |
107 | 108 | ||
108 | // attributes | 109 | // attributes |
109 | 'attributes' : | 110 | 'attributes' : |
110 | { | 111 | { |