Skip to content

Commit f8fe8c4

Browse files
committed
Fixed r2_parallax_h console command.
1 parent f78a965 commit f8fe8c4

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

res/gamedata/shaders/r2/common.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
#ifndef SMAP_size
3838
#define SMAP_size 1024
3939
#endif
40-
#define PARALLAX_H 0.02
41-
#define parallax float2(PARALLAX_H, -PARALLAX_H/2)
4240

4341
#ifdef USE_R2_STATIC_SUN
4442
# define xmaterial half(1.0h/4.h)

res/gamedata/shaders/r2/shared/common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ uniform float3 eye_position;
2727
uniform half3 eye_direction;
2828
uniform half3 eye_normal;
2929
uniform float4 dt_params;
30+
uniform float4 parallax;
3031

3132
half3 unpack_normal (half3 v) { return 2*v-1; }
3233
half3 unpack_bx2 (half3 v) { return 2*v-1; }

res/gamedata/shaders/r3/common_defines.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#ifndef SMAP_size
1818
#define SMAP_size 1024
1919
#endif
20-
#define PARALLAX_H 0.02
21-
#define parallax float2(PARALLAX_H, -PARALLAX_H/2)
2220
//////////////////////////////////////////////////////////////////////////////////////////
2321

2422
#endif // common_defines_h_included

res/gamedata/shaders/r3/shared/common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ cbuffer static_globals
4646
uniform float4 pos_decompression_params;
4747
uniform float4 pos_decompression_params2;
4848

49+
uniform float4 parallax;
4950
// uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
5051
}
5152

0 commit comments

Comments
 (0)