[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/0.82.7.1+dfsg1-2-6-gb5ca8b6

[Jan Dittberner]

The following commit has been merged in the master branch:
commit 6ab74728e578ea74e34f10ddcdb294a022888b46
Author: Jan Dittberner <jandd at debian.org>
Date:   Tue May 3 14:12:51 2011 +0200

    fix ShadowHandler g++ 4.6.0 compilation issue

diff --git a/debian/patches/ftbfs-fix-625097.patch b/debian/patches/ftbfs-fix-625097.patch
index 216759f..55354f8 100644
--- a/debian/patches/ftbfs-fix-625097.patch
+++ b/debian/patches/ftbfs-fix-625097.patch
@@ -12,3 +12,36 @@ Bug: http://springrts.com/mantis/view.php?id=2415
  
  class AAStar {
  	public:
+--- a/rts/Rendering/ShadowHandler.cpp
++++ b/rts/Rendering/ShadowHandler.cpp
+@@ -318,6 +318,11 @@
+ 	xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1))));
+ 	ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1))));
+ 
++	shadowParams.x = xmid;
++	shadowParams.y = ymid;
++	shadowParams.z = p17;
++	shadowParams.w = p18;
++
+ 	shadowMatrix[ 0] =   cross1.x / maxLengthX;
+ 	shadowMatrix[ 4] =   cross1.y / maxLengthX;
+ 	shadowMatrix[ 8] =   cross1.z / maxLengthX;
+--- a/rts/Rendering/ShadowHandler.h
++++ b/rts/Rendering/ShadowHandler.h
+@@ -38,7 +38,7 @@
+ 	CMatrix44f shadowMatrix;
+ 	void CalcMinMaxView(void);
+ 
+-	const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); }
++	const float4& GetShadowParams() const { return shadowParams; }
+ 
+ 	enum ShadowGenProgram {
+ 		SHADOWGEN_PROGRAM_MODEL      = 0,
+@@ -76,6 +76,7 @@
+ 	//! to write the (FBO) depth-buffer texture
+ 	std::vector<Shader::IProgramObject*> shadowGenProgs;
+ 
++	float4 shadowParams;
+ 	float x1, x2, y1, y2;
+ 	float xmid, ymid;
+ 	float p17, p18;

-- 
advanced 3D real time strategy game engine