From 1cdaafa20d64775941eae9842deb82481da408f8 Mon Sep 17 00:00:00 2001
From: Frederic Bouvier <fredfgfs01@free.fr>
Date: Sat, 14 Apr 2012 10:05:25 +0200
Subject: [PATCH] Change light animation internal parameters layout

---
 Effects/light-point.eff | 14 +++++++-------
 Effects/light-spot.eff  | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Effects/light-point.eff b/Effects/light-point.eff
index 34d5d027f..ae20e6d56 100644
--- a/Effects/light-point.eff
+++ b/Effects/light-point.eff
@@ -65,38 +65,38 @@
 			<uniform>
 				<name>LightPosition</name>
 				<type>float-vec4</type>
-				<value type="vec4d"><use>light-spot/position</use></value>
+				<value type="vec4d"><use>position</use></value>
 				<positioned type="bool">true</positioned>
 			</uniform>
 			<uniform>
 				<name>Ambient</name>
 				<type>float-vec4</type>
-				<value type="vec4d"><use>light-spot/ambient</use></value>
+				<value type="vec4d"><use>ambient</use></value>
 			</uniform>
 			<uniform>
 				<name>Diffuse</name>
 				<type>float-vec4</type>
-				<value type="vec4d"><use>light-spot/diffuse</use></value>
+				<value type="vec4d"><use>diffuse</use></value>
 			</uniform>
 			<uniform>
 				<name>Specular</name>
 				<type>float-vec4</type>
-				<value type="vec4d"><use>light-spot/specular</use></value>
+				<value type="vec4d"><use>specular</use></value>
 			</uniform>
 			<uniform>
 				<name>Attenuation</name>
 				<type>float-vec3</type>
-				<value type="vec3d"><use>light-spot/attenuation</use></value>
+				<value type="vec3d"><use>attenuation</use></value>
 			</uniform>
 			<uniform>
 				<name>Near</name>
 				<type>float</type>
-				<value type="float"><use>light-spot/near</use></value>
+				<value type="float"><use>near</use></value>
 			</uniform>
 			<uniform>
 				<name>Far</name>
 				<type>float</type>
-				<value type="float"><use>light-spot/far</use></value>
+				<value type="float"><use>far</use></value>
 			</uniform>
 		</pass>
 	</technique>
diff --git a/Effects/light-spot.eff b/Effects/light-spot.eff
index 210ac4323..6585e9aee 100644
--- a/Effects/light-spot.eff
+++ b/Effects/light-spot.eff
@@ -65,59 +65,59 @@
 			<uniform>
 				<name>LightPosition</name>
 				<type>float-vec4</type>
-				<value type="vec4d"><use>light-spot/position</use></value>
+				<value type="vec4d"><use>position</use></value>
 				<positioned type="bool">true</positioned>
 			</uniform>
 			<uniform>
 				<name>LightDirection</name>
 				<type>float-vec4</type>
-				<value type="vec4d"><use>light-spot/direction</use></value>
+				<value type="vec4d"><use>direction</use></value>
 				<positioned type="bool">true</positioned>
 			</uniform>
 			<uniform>
 				<name>Ambient</name>
 				<type>float-vec4</type>
-				<value type="vec4d"><use>light-spot/ambient</use></value>
+				<value type="vec4d"><use>ambient</use></value>
 			</uniform>
 			<uniform>
 				<name>Diffuse</name>
 				<type>float-vec4</type>
-				<value type="vec4d"><use>light-spot/diffuse</use></value>
+				<value type="vec4d"><use>diffuse</use></value>
 			</uniform>
 			<uniform>
 				<name>Specular</name>
 				<type>float-vec4</type>
-				<value type="vec4d"><use>light-spot/specular</use></value>
+				<value type="vec4d"><use>specular</use></value>
 			</uniform>
 			<uniform>
 				<name>Attenuation</name>
 				<type>float-vec3</type>
-				<value type="vec3d"><use>light-spot/attenuation</use></value>
+				<value type="vec3d"><use>attenuation</use></value>
 			</uniform>
 			<uniform>
 				<name>Exponent</name>
 				<type>float</type>
-				<value type="float"><use>light-spot/exponent</use></value>
+				<value type="float"><use>exponent</use></value>
 			</uniform>
 			<uniform>
 				<name>Cutoff</name>
 				<type>float</type>
-				<value type="float"><use>light-spot/cutoff</use></value>
+				<value type="float"><use>cutoff</use></value>
 			</uniform>
 			<uniform>
 				<name>CosCutoff</name>
 				<type>float</type>
-				<value type="float"><use>light-spot/cosCutoff</use></value>
+				<value type="float"><use>cosCutoff</use></value>
 			</uniform>
 			<uniform>
 				<name>Near</name>
 				<type>float</type>
-				<value type="float"><use>light-spot/near</use></value>
+				<value type="float"><use>near</use></value>
 			</uniform>
 			<uniform>
 				<name>Far</name>
 				<type>float</type>
-				<value type="float"><use>light-spot/far</use></value>
+				<value type="float"><use>far</use></value>
 			</uniform>
 		</pass>
 	</technique>