From 2599e0de7cda0f73770222787983d44e1a22139d Mon Sep 17 00:00:00 2001
From: SkyLoader <skyloader1@mail.ru>
Date: Wed, 31 Oct 2018 02:50:29 +0300
Subject: [PATCH] OpenGL: soft water works now

---
 res/gamedata/shaders/gl/water.ps       | Bin 2719 -> 2679 bytes
 res/gamedata/shaders/gl/water_soft.ps  | Bin 80 -> 43 bytes
 res/gamedata/shaders/gl/water_soft.vs  |   2 +-
 res/gamedata/shaders/gl/waterd.ps      | Bin 1388 -> 1262 bytes
 res/gamedata/shaders/gl/waterd.vs      |   8 ++++----
 res/gamedata/shaders/gl/waterd_soft.ps | Bin 81 -> 44 bytes
 res/gamedata/shaders/gl/waterd_soft.vs |   2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/gamedata/shaders/gl/water.ps b/res/gamedata/shaders/gl/water.ps
index 561c12aacd87121f99c9dadf56e878b8cdc6a602..a44ae66c05e54c1d034a42d0cd3b5a61716ea797 100644
GIT binary patch
delta 38
ucmbO)`dwtgZjREt%(VQXT!oFh*RpJ$!`i{jqF0ojG&zn_db2%e0wVx1%nl6z

delta 72
zcmew^GGBDU?v01nvKZ^@bEf6wCzhBf#0MzYDsYyhRv5Vy6y;}WC=|yR<QHd_Waj7T
bD0u3XBm<?=Q}Z;fH|Mi<GH?FFQOyVd!TuTP

diff --git a/res/gamedata/shaders/gl/water_soft.ps b/res/gamedata/shaders/gl/water_soft.ps
index 3ae7e813ba507251f97d565bcc6d957330e7649f..f9d21df8965d91c105b0b85e70b2af863fd29f06 100644
GIT binary patch
literal 43
ycmY#RNlnYlOXc))b#;jk_IC@34|fc44dPPH%uCKGO-WTyDo-p)Ez&C}RssMjwhh_<

delta 63
zcmdN6VA9v0Aa1Upudh&?U73@gn37s#rBITZTaaIrSd^JlsgROcoS2l8n!=@=nU|bX
Snv$xZRGwIpTBKJ{tONjrRTVh^

diff --git a/res/gamedata/shaders/gl/water_soft.vs b/res/gamedata/shaders/gl/water_soft.vs
index 925157ec739..51a726ee39a 100644
--- 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"
\ No newline at end of file
diff --git a/res/gamedata/shaders/gl/waterd.ps b/res/gamedata/shaders/gl/waterd.ps
index e20b116f39cb01c441cc891693c1b7a8a63de4c9..1252bad99de1b5967a7bedf9dec045e0fe4cb19b 100644
GIT binary patch
delta 42
vcmaFE^^S8x3KIusT26jqi4o`I^-SA%z-$wR_y7f4g~_X#6*r${p3evXL52>8

delta 169
zcmaFI`G#vl3X`|KK4)4^eqxCUXM6ystwKp^g^^1^QGS*J3}_U`7vvXbmSpDV>A=Jk
zJoQSFflAX;^E9owAO;vIOwM82=BBR?F-{>qK*3gl6QNlzI5D>%CsjkCIJY1^FF!3a
frzEvVM<F1;I3yWvhzV5NWIbj@M$XOt%<~xmB^)z7

diff --git a/res/gamedata/shaders/gl/waterd.vs b/res/gamedata/shaders/gl/waterd.vs
index 49d8af8ae43..afea7358f60 100644
--- 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
index 6aa1a4edbcf9d9a4a0a37b99937438d3c3d5bc56..26a96c2bc72994a3958dcac225aedbc4a70f41f6 100644
GIT binary patch
literal 44
zcmY#RNlnYlOXc))b#;jk_IC@34|fc44dPPH%uCKGO-WTyDo-p)ElSZVC{_XhIZ+Ni

delta 64
zcmdN1WYX84Aa0?cudh&?U73@gn37s#rBITZTaaIrSd^JlsgROcoS2l8n!=@=nU|bX
Tnv$xZRGwIpT9l$!P^<(1n+Fx3

diff --git a/res/gamedata/shaders/gl/waterd_soft.vs b/res/gamedata/shaders/gl/waterd_soft.vs
index 4371ee34157..430dbc3986f 100644
--- 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"
\ No newline at end of file