Skip to content

Commit

Permalink
Cleanup shaders
Browse files Browse the repository at this point in the history
  • Loading branch information
TokisanGames committed Dec 7, 2023
1 parent 2d0b261 commit 2db1317
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
15 changes: 0 additions & 15 deletions src/shaders/auto_shader.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ uniform float auto_height_reduction : hint_range(0, 1) = 0.1;
uniform int auto_base_texture : hint_range(0,31) = 0;
uniform int auto_overlay_texture : hint_range(0,31) = 1;


//INSERT: AUTO_SHADER_TEXTURE_ID
// Enable Autoshader if outside regions or painted in regions, otherwise manual painted
bool auto_shader = region<0 || bool(control & 0x1u);
Expand All @@ -20,20 +19,6 @@ uniform int auto_overlay_texture : hint_range(0,31) = 1;
, 0., 1.) +
float(!auto_shader)*float(control >>14u & 0xFFu) * 0.003921568627450; // 1./255.0

// ) {
// out_mat.base = auto_base_texture;
// out_mat.over = auto_overlay_texture;
// out_mat.blend = clamp(
// dot(vec3(0., 1., 0.), normal * auto_slope*2. - (auto_slope*2.-1.))
// - auto_height_reduction*.01*v_vertex.y // Reduce as vertices get higher
// , 0., 1.);
// } else {
// // Manually painted
// out_mat.base = int(control >>27u & 0x1Fu);
// out_mat.over = int(control >> 22u & 0x1Fu);
// out_mat.blend = float(control >>14u & 0xFFu) * 0.003921568627450; // 1./255.0
// }

//INSERT: TEXTURE_ID
out_mat.base = int(control >>27u & 0x1Fu);
out_mat.over = int(control >> 22u & 0x1Fu);
Expand Down
1 change: 0 additions & 1 deletion src/shaders/dual_scaling.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,4 @@ varying float v_far_factor;
normal_rg2 = mix(normal_rg2, normal_far, v_far_factor);
}


)"

0 comments on commit 2db1317

Please sign in to comment.