From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 5 Jun 2011 14:55:40 +0000 (+0000)
Subject: fix r_trippy compile with DRI/Mesa
X-Git-Tag: xonotic-v0.6.0~163^2~366
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=af372e0fe5486d894987080a2a782bc78b6cf60a;p=xonotic%2Fdarkplaces.git

fix r_trippy compile with DRI/Mesa

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11180 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/shader_glsl.h b/shader_glsl.h
index 6021148b..b02bd3c0 100644
--- a/shader_glsl.h
+++ b/shader_glsl.h
@@ -110,10 +110,10 @@
 "	position *= 0.125;\n"
 "	//~tweaked for Quake\n"
 "	float distanceSquared = (position.x * position.x + position.z * position.z);\n"
-"	position.y += 5*sin(distanceSquared*sin(float(worldTime)/143.0)/1000.0);\n"
+"	position.y += 5.0*sin(distanceSquared*sin(worldTime/143.0)/1000.0);\n"
 "	float y = position.y;\n"
 "	float x = position.x;\n"
-"	float om = sin(distanceSquared*sin(float(worldTime)/256.0)/5000.0) * sin(float(worldTime)/200.0);\n"
+"	float om = sin(distanceSquared*sin(worldTime/256.0)/5000.0) * sin(worldTime/200.0);\n"
 "	position.y = x*sin(om)+y*cos(om);\n"
 "	position.x = x*cos(om)-y*sin(om);\n"
 "	return position;\n"