1 files changed, 120 insertions, 119 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/lightmanager.js b/js/helper-classes/RDGE/src/core/script/lightmanager.js
index e38418f5..94790ed0 100755
--- a/js/helper-classes/RDGE/src/core/script/lightmanager.js
+++ b/js/helper-classes/RDGE/src/core/script/lightmanager.js
@@ -1,119 +1,120 @@
-/* <copyright>
+/* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
-All Rights Reserved.
+All Rights Reserved.
-BSD License.
+Redistribution and use in source and binary forms, with or without
-Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
-modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice,
-  - Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
+* Redistributions in binary form must reproduce the above copyright notice,
-    notice, this list of conditions and the following disclaimer in the
+  this list of conditions and the following disclaimer in the documentation
-    documentation and/or other materials provided with the distribution.
+  and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
+* Neither the name of Motorola Mobility LLC nor the names of its
-    without specific prior written permission.
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-POSSIBILITY OF SUCH DAMAGE.
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-</copyright> */
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
-// RDGE namespaces
-var RDGE = RDGE || {};
+// RDGE namespaces
+var RDGE = RDGE || {};
-// manage light links
-RDGE.LightManager = function (lightUniformList) {
+// manage light links
-    // build a list of all light uniforms, contains a list of light uniform lists
+RDGE.LightManager = function (lightUniformList) {
-    this.lightUniforms = [[], [], [], []];
+    // build a list of all light uniforms, contains a list of light uniform lists
+    this.lightUniforms = [[], [], [], []];
-    // bucket the uniforms lists
-    for (var l in lightUniformList) {
+    // bucket the uniforms lists
-        // starts with
+    for (var l in lightUniformList) {
-        if (l.indexOf("u_light0") == 0) {
+        // starts with
-            this.lightUniforms[0][l] = l;
+        if (l.indexOf("u_light0") == 0) {
-        }
+            this.lightUniforms[0][l] = l;
-        else if (l.indexOf("u_light1") == 0) {
+        }
-            this.lightUniforms[1][l] = l;
+        else if (l.indexOf("u_light1") == 0) {
-        }
+            this.lightUniforms[1][l] = l;
-        else if (l.indexOf("u_light2") == 0) {
+        }
-            this.lightUniforms[2][l] = l;
+        else if (l.indexOf("u_light2") == 0) {
-        }
+            this.lightUniforms[2][l] = l;
-        else if (l.indexOf("u_light3") == 0) {
+        }
-            this.lightUniforms[3][l] = l;
+        else if (l.indexOf("u_light3") == 0) {
-        }
+            this.lightUniforms[3][l] = l;
-    }
+        }
+    }
-    // maps (takes a string returns an object)
-    this.lightToMesh = []; // pass light name, returns light of meshes
+    // maps (takes a string returns an object)
-    this.meshToLight = []; // pass mesh name, returns list of lights
+    this.lightToMesh = []; // pass light name, returns light of meshes
+    this.meshToLight = []; // pass mesh name, returns list of lights
-    // list of light objects by type
-    this.dirLights = [];
+    // list of light objects by type
-    this.pointLights = [];
+    this.dirLights = [];
-    this.spotLights = [];
+    this.pointLights = [];
-    this.ambLights = [];
+    this.spotLights = [];
-    this.unknLights = [];
+    this.ambLights = [];
+    this.unknLights = [];
-    // light types
-    this.typePointLight = "point_light";
+    // light types
-    this.typeSpotLight = "spot_light";
+    this.typePointLight = "point_light";
-    this.typeAmbLight = "amb_light";
+    this.typeSpotLight = "spot_light";
-    this.typeDirLight = "dir_light";
+    this.typeAmbLight = "amb_light";
+    this.typeDirLight = "dir_light";
-    this.defaultLights =
-        [
+    this.defaultLights =
-                RDGE.createLightNode("default0"),
+    [
-                RDGE.createLightNode("default1"),
+        RDGE.createLightNode("default0"),
-                RDGE.createLightNode("default2"),
+        RDGE.createLightNode("default1"),
-                RDGE.createLightNode("default3")
+        RDGE.createLightNode("default2"),
-        ];
+        RDGE.createLightNode("default3")
-};
+    ];
+};
-/*
-*  configuration function called when loading the scene
+/*
-*/
+*  configuration function called when loading the scene
-RDGE.LightManager.prototype.setMapping = function (theLightNode, theLinks) {
+*/
-    this.lightToMesh[theLightNode.name] = theLinks;
+RDGE.LightManager.prototype.setMapping = function (theLightNode, theLinks) {
+    this.lightToMesh[theLightNode.name] = theLinks;
-    for (var lghtIdx = 0; lghtIdx < theLinks.length; lghtIdx++) {
-        var lightList = this.meshToLight[theLinks[lghtIdx]]; // check if mapping list exists
+    for (var lghtIdx = 0; lghtIdx < theLinks.length; lghtIdx++) {
+        var lightList = this.meshToLight[theLinks[lghtIdx]]; // check if mapping list exists
-        if (lightList !== undefined) {
-            lightList.push(theLightNode);
+        if (lightList !== undefined) {
-        } else {
+            lightList.push(theLightNode);
-            // create new light list and add light list mapping
+        } else {
-            lightList = [];
+            // create new light list and add light list mapping
-            lightList.push(theLightNode);
+            lightList = [];
-            this.meshToLight[theLinks[lghtIdx]] = lightList;
+            lightList.push(theLightNode);
+            this.meshToLight[theLinks[lghtIdx]] = lightList;
-        }
-    }
+        }
+    }
-    if (theLightNode.typeName == this.typePointLight) {
-        this.pointLights.push(theLightNode);
+    if (theLightNode.typeName == this.typePointLight) {
-    } else if (theLightNode.typeName == this.typeSpotLight) {
+        this.pointLights.push(theLightNode);
-        this.spotLights.push(theLightNode);
+    } else if (theLightNode.typeName == this.typeSpotLight) {
-    } else if (theLightNode.typeName == this.typeAmbLight) {
+        this.spotLights.push(theLightNode);
-        this.ambLights.push(theLightNode);
+    } else if (theLightNode.typeName == this.typeAmbLight) {
-    } else if (theLightNode.typeName == this.typeDirLight) {
+        this.ambLights.push(theLightNode);
-        this.dirLights.push(theLightNode);
+    } else if (theLightNode.typeName == this.typeDirLight) {
-    } else {
+        this.dirLights.push(theLightNode);
-        this.unknLights.push(theLightNode);
+    } else {
-    }
+        this.unknLights.push(theLightNode);
+    }
-};
+};
-RDGE.LightManager.prototype.getLightsForMesh = function (mesh) {
-    return this.meshToLight[mesh];
+RDGE.LightManager.prototype.getLightsForMesh = function (mesh) {
-};
+    return this.meshToLight[mesh];
+};

diff --git a/js/helper-classes/RDGE/src/core/script/lightmanager.js b/js/helper-classes/RDGE/src/core/script/lightmanager.js index e38418f5..94790ed0 100755 --- a/js/helper-classes/RDGE/src/core/script/lightmanager.js +++ b/js/helper-classes/RDGE/src/core/script/lightmanager.js
@@ -1,119 +1,120 @@
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.	4
5		5	Redistribution and use in source and binary forms, with or without
6	Redistribution and use in source and binary forms, with or without	6	modification, are permitted provided that the following conditions are met:
7	modification, are permitted provided that the following conditions are met:	7
8		8	* Redistributions of source code must retain the above copyright notice,
9	- Redistributions of source code must retain the above copyright notice,	9	this list of conditions and the following disclaimer.
10	this list of conditions and the following disclaimer.	10
11	- Redistributions in binary form must reproduce the above copyright	11	* Redistributions in binary form must reproduce the above copyright notice,
12	notice, this list of conditions and the following disclaimer in the	12	this list of conditions and the following disclaimer in the documentation
13	documentation and/or other materials provided with the distribution.	13	and/or other materials provided with the distribution.
14	- Neither the name of Motorola Mobility nor the names of its contributors	14
15	may be used to endorse or promote products derived from this software	15	* Neither the name of Motorola Mobility LLC nor the names of its
16	without specific prior written permission.	16	contributors may be used to endorse or promote products derived from this
17		17	software without specific prior written permission.
18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	18
19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	19	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	20	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	21	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN	25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)	26	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	27	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28	POSSIBILITY OF SUCH DAMAGE.	28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	</copyright> */	29	POSSIBILITY OF SUCH DAMAGE.
30		30	</copyright> */
31	// RDGE namespaces	31
32	var RDGE = RDGE \|\| {};	32	// RDGE namespaces
33		33	var RDGE = RDGE \|\| {};
34	// manage light links	34
35	RDGE.LightManager = function (lightUniformList) {	35	// manage light links
36	// build a list of all light uniforms, contains a list of light uniform lists	36	RDGE.LightManager = function (lightUniformList) {
37	this.lightUniforms = [[], [], [], []];	37	// build a list of all light uniforms, contains a list of light uniform lists
38		38	this.lightUniforms = [[], [], [], []];
39	// bucket the uniforms lists	39
40	for (var l in lightUniformList) {	40	// bucket the uniforms lists
41	// starts with	41	for (var l in lightUniformList) {
42	if (l.indexOf("u_light0") == 0) {	42	// starts with
43	this.lightUniforms[0][l] = l;	43	if (l.indexOf("u_light0") == 0) {
44	}	44	this.lightUniforms[0][l] = l;
45	else if (l.indexOf("u_light1") == 0) {	45	}
46	this.lightUniforms[1][l] = l;	46	else if (l.indexOf("u_light1") == 0) {
47	}	47	this.lightUniforms[1][l] = l;
48	else if (l.indexOf("u_light2") == 0) {	48	}
49	this.lightUniforms[2][l] = l;	49	else if (l.indexOf("u_light2") == 0) {
50	}	50	this.lightUniforms[2][l] = l;
51	else if (l.indexOf("u_light3") == 0) {	51	}
52	this.lightUniforms[3][l] = l;	52	else if (l.indexOf("u_light3") == 0) {
53	}	53	this.lightUniforms[3][l] = l;
54	}	54	}
55		55	}
56	// maps (takes a string returns an object)	56
57	this.lightToMesh = []; // pass light name, returns light of meshes	57	// maps (takes a string returns an object)
58	this.meshToLight = []; // pass mesh name, returns list of lights	58	this.lightToMesh = []; // pass light name, returns light of meshes
59		59	this.meshToLight = []; // pass mesh name, returns list of lights
60	// list of light objects by type	60
61	this.dirLights = [];	61	// list of light objects by type
62	this.pointLights = [];	62	this.dirLights = [];
63	this.spotLights = [];	63	this.pointLights = [];
64	this.ambLights = [];	64	this.spotLights = [];
65	this.unknLights = [];	65	this.ambLights = [];
66		66	this.unknLights = [];
67	// light types	67
68	this.typePointLight = "point_light";	68	// light types
69	this.typeSpotLight = "spot_light";	69	this.typePointLight = "point_light";
70	this.typeAmbLight = "amb_light";	70	this.typeSpotLight = "spot_light";
71	this.typeDirLight = "dir_light";	71	this.typeAmbLight = "amb_light";
72		72	this.typeDirLight = "dir_light";
73	this.defaultLights =	73
74	[	74	this.defaultLights =
75	RDGE.createLightNode("default0"),	75	[
76	RDGE.createLightNode("default1"),	76	RDGE.createLightNode("default0"),
77	RDGE.createLightNode("default2"),	77	RDGE.createLightNode("default1"),
78	RDGE.createLightNode("default3")	78	RDGE.createLightNode("default2"),
79	];	79	RDGE.createLightNode("default3")
80	};	80	];
81		81	};
82	/*	82
83	* configuration function called when loading the scene	83	/*
84	*/	84	* configuration function called when loading the scene
85	RDGE.LightManager.prototype.setMapping = function (theLightNode, theLinks) {	85	*/
86	this.lightToMesh[theLightNode.name] = theLinks;	86	RDGE.LightManager.prototype.setMapping = function (theLightNode, theLinks) {
87		87	this.lightToMesh[theLightNode.name] = theLinks;
88	for (var lghtIdx = 0; lghtIdx < theLinks.length; lghtIdx++) {	88
89	var lightList = this.meshToLight[theLinks[lghtIdx]]; // check if mapping list exists	89	for (var lghtIdx = 0; lghtIdx < theLinks.length; lghtIdx++) {
90		90	var lightList = this.meshToLight[theLinks[lghtIdx]]; // check if mapping list exists
91	if (lightList !== undefined) {	91
92	lightList.push(theLightNode);	92	if (lightList !== undefined) {
93	} else {	93	lightList.push(theLightNode);
94	// create new light list and add light list mapping	94	} else {
95	lightList = [];	95	// create new light list and add light list mapping
96	lightList.push(theLightNode);	96	lightList = [];
97	this.meshToLight[theLinks[lghtIdx]] = lightList;	97	lightList.push(theLightNode);
98		98	this.meshToLight[theLinks[lghtIdx]] = lightList;
99	}	99
100	}	100	}
101		101	}
102	if (theLightNode.typeName == this.typePointLight) {	102
103	this.pointLights.push(theLightNode);	103	if (theLightNode.typeName == this.typePointLight) {
104	} else if (theLightNode.typeName == this.typeSpotLight) {	104	this.pointLights.push(theLightNode);
105	this.spotLights.push(theLightNode);	105	} else if (theLightNode.typeName == this.typeSpotLight) {
106	} else if (theLightNode.typeName == this.typeAmbLight) {	106	this.spotLights.push(theLightNode);
107	this.ambLights.push(theLightNode);	107	} else if (theLightNode.typeName == this.typeAmbLight) {
108	} else if (theLightNode.typeName == this.typeDirLight) {	108	this.ambLights.push(theLightNode);
109	this.dirLights.push(theLightNode);	109	} else if (theLightNode.typeName == this.typeDirLight) {
110	} else {	110	this.dirLights.push(theLightNode);
111	this.unknLights.push(theLightNode);	111	} else {
112	}	112	this.unknLights.push(theLightNode);
113		113	}
114		114
115	};	115
116		116	};
117	RDGE.LightManager.prototype.getLightsForMesh = function (mesh) {	117
118	return this.meshToLight[mesh];	118	RDGE.LightManager.prototype.getLightsForMesh = function (mesh) {
119	};	119	return this.meshToLight[mesh];
		120	};