OpenGL: soft water works now

OpenXRay · Oct 30, 2018 · 2599e0d · 2599e0d
1 parent cb49699
commit 2599e0d
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/res/gamedata/shaders/gl/water.ps b/res/gamedata/shaders/gl/water.ps
diff --git a/res/gamedata/shaders/gl/water_soft.ps b/res/gamedata/shaders/gl/water_soft.ps
diff --git a/res/gamedata/shaders/gl/water_soft.vs b/res/gamedata/shaders/gl/water_soft.vs
@@ -1,2 +1,2 @@
-//#define	NEED_SOFT_WATER // skyloader: temporarily disabled
+#define	NEED_SOFT_WATER
 #include "water.vs"
diff --git a/res/gamedata/shaders/gl/waterd.ps b/res/gamedata/shaders/gl/waterd.ps
diff --git a/res/gamedata/shaders/gl/waterd.vs b/res/gamedata/shaders/gl/waterd.vs
@@ -7,10 +7,10 @@ uniform float4x4	m_texgen;
 
 v2p _main (v_vert v)
 {
-	v.N		= unpack_D3DCOLOR(v.N);
-	v.T		= unpack_D3DCOLOR(v.T);
-	v.B		= unpack_D3DCOLOR(v.B);
-	v.color		= unpack_D3DCOLOR(v.color);
+	//v.N		= unpack_D3DCOLOR(v.N);
+	//v.T		= unpack_D3DCOLOR(v.T);
+	//v.B		= unpack_D3DCOLOR(v.B);
+	//v.color		= unpack_D3DCOLOR(v.color);
 
 	v2p 		o;
 

diff --git a/res/gamedata/shaders/gl/waterd_soft.ps b/res/gamedata/shaders/gl/waterd_soft.ps
diff --git a/res/gamedata/shaders/gl/waterd_soft.vs b/res/gamedata/shaders/gl/waterd_soft.vs
@@ -1,2 +1,2 @@
-//#define	NEED_SOFT_WATER // skyloader: temporarily disabled
+#define	NEED_SOFT_WATER
 #include "waterd.vs"