From 2db1317a5d444b414da4c103e350bbefb6ee0cbb Mon Sep 17 00:00:00 2001 From: Cory Petkovsek <632766+TokisanGames@users.noreply.github.com> Date: Thu, 7 Dec 2023 22:36:31 +0700 Subject: [PATCH] Cleanup shaders --- src/shaders/auto_shader.glsl | 15 --------------- src/shaders/dual_scaling.glsl | 1 - 2 files changed, 16 deletions(-) diff --git a/src/shaders/auto_shader.glsl b/src/shaders/auto_shader.glsl index 2a79b203d..5d3cb1e72 100644 --- a/src/shaders/auto_shader.glsl +++ b/src/shaders/auto_shader.glsl @@ -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); @@ -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); diff --git a/src/shaders/dual_scaling.glsl b/src/shaders/dual_scaling.glsl index a706cb281..83ef08570 100644 --- a/src/shaders/dual_scaling.glsl +++ b/src/shaders/dual_scaling.glsl @@ -42,5 +42,4 @@ varying float v_far_factor; normal_rg2 = mix(normal_rg2, normal_far, v_far_factor); } - )" \ No newline at end of file