Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: fix heightmap orientation, black is low and white is high #170

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/engine/renderer/glsl_source/forwardLighting_fp.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@ void main()
Vts = normalize(Vts);

// size and start position of search in texture space
vec2 S = Vts.xy * -u_DepthScale / Vts.z;
vec2 S = Vts.xy * u_DepthScale / Vts.z;

float depth = RayIntersectDisplaceMap(texNormal, S, u_NormalMap);

Expand Down
2 changes: 1 addition & 1 deletion src/engine/renderer/glsl_source/lightMapping_fp.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void main()
V = normalize(V);

// size and start position of search in texture space
vec2 S = V.xy * -u_DepthScale / V.z;
vec2 S = V.xy * u_DepthScale / V.z;

#if 0
vec2 texOffset = vec2(0.0);
Expand Down
4 changes: 2 additions & 2 deletions src/engine/renderer/glsl_source/liquid_fp.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ void main()
// ray intersect in view direction

// size and start position of search in texture space
//vec2 S = V.xy * -u_DepthScale / V.z;
vec2 S = V.xy * -0.03 / V.z;
//vec2 S = V.xy * u_DepthScale / V.z;
vec2 S = V.xy * 0.03 / V.z;

float depth = RayIntersectDisplaceMap(texNormal, S);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void main()
Vts = normalize(Vts);

// size and start position of search in texture space
vec2 S = Vts.xy * -u_DepthScale / Vts.z;
vec2 S = Vts.xy * u_DepthScale / Vts.z;

#if 0
vec2 texOffset = vec2(0.0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ void main()
Vts = normalize(Vts);

// size and start position of search in texture space
vec2 S = Vts.xy * -u_DepthScale / Vts.z;
vec2 S = Vts.xy * u_DepthScale / Vts.z;

#if 0
vec2 texOffset = vec2(0.0);
Expand Down