Skip to content

Commit b8ffcf2

Browse files
committed
Additional fix.
1 parent 6296123 commit b8ffcf2

7 files changed

Lines changed: 7 additions & 12 deletions

File tree

src/shadermng.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ static void adaptShader(std::string& vs, std::string& fs, int opengl_profile)
161161
fs = std::regex_replace(fs, std::regex("gl_FragColor"), "fragColor");
162162
break;
163163
}
164+
fs = std::regex_replace(fs, std::regex("#insertHalftoneTest"), "if (uHalftone != 0 && mod(floor(gl_FragCoord.x)+floor(gl_FragCoord.y), 2.0) < 0.5) discard;");
164165
}
165166

166167
void ShaderMng::init()

src/shaders/car.fs.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ varying vec3 vCubeRay;
1414

1515
void main()
1616
{
17-
if (uHalftone != 0 && mod(mod(gl_FragCoord.x, 2.0)+mod(gl_FragCoord.y, 2.0)+0.5, 2.0) < 1.0)
18-
discard;
17+
#insertHalftoneTest
1918
vec4 texColor = texture2D(uTex0, vTex);
2019
vec4 envColor = textureCube(uCube, vCubeRay);
2120
vec3 normal = vNormal;

src/shaders/car_top.fs.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ varying vec3 vCubeRay;
1414

1515
void main()
1616
{
17-
if (uHalftone != 0 && mod(mod(gl_FragCoord.x, 2.0)+mod(gl_FragCoord.y, 2.0)+0.5, 2.0) < 1.0)
18-
discard;
17+
#insertHalftoneTest
1918
vec4 texColor = texture2D( uTex0, vTex );
2019
if (texColor.a < 0.5)
2120
discard;

src/shaders/color_tex.fs.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ varying vec4 vColor;
99

1010
void main()
1111
{
12-
if (uHalftone != 0 && mod(mod(gl_FragCoord.x, 2.0)+mod(gl_FragCoord.y, 2.0)+0.5, 2.0) < 1.0)
13-
discard;
12+
#insertHalftoneTest
1413
gl_FragColor = texture2D( uTex0, vTex ) * vColor;
1514
if (uAlphaDiscard != 0 && gl_FragColor.a < 0.5)
1615
discard;

src/shaders/glass_reflection.fs.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ varying vec3 vCubeRay;
1414

1515
void main()
1616
{
17-
if (uHalftone != 0 && mod(mod(gl_FragCoord.x, 2.0)+mod(gl_FragCoord.y, 2.0)+0.5, 2.0) < 1.0)
18-
discard;
17+
#insertHalftoneTest
1918
vec4 texColor = texture2D(uTex0, vTex);
2019
if (texColor.a >= 0.5)
2120
discard;

src/shaders/glass_tint.fs.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ varying vec3 vCubeRay;
99

1010
void main()
1111
{
12-
if (uHalftone != 0 && mod(mod(gl_FragCoord.x, 2.0)+mod(gl_FragCoord.y, 2.0)+0.5, 2.0) < 1.0)
13-
discard;
12+
#insertHalftoneTest
1413
vec4 texColor = texture2D( uTex0, vTex );
1514
if (texColor.a >= 0.5)
1615
discard;

src/shaders/light_tex.fs.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ varying vec3 vNormal;
1313

1414
void main()
1515
{
16-
if (uHalftone != 0 && mod(mod(gl_FragCoord.x, 2.0)+mod(gl_FragCoord.y, 2.0)+0.5, 2.0) < 1.0)
17-
discard;
16+
#insertHalftoneTest
1817
vec3 normal = vNormal;
1918
if (!gl_FrontFacing)
2019
{

0 commit comments

Comments
 (0)