From 2c4a3b5f5ee328f204558bf4f0aebf07c2e517a1 Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 17 Aug 2021 11:21:32 +0200 Subject: [PATCH] fix gl vehicle rendering --- src/extras/custompipes_gl.cpp | 8 ++++---- vendor/librw | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/extras/custompipes_gl.cpp b/src/extras/custompipes_gl.cpp index ed6a529a..47678fd1 100644 --- a/src/extras/custompipes_gl.cpp +++ b/src/extras/custompipes_gl.cpp @@ -368,9 +368,9 @@ CreateVehiclePipe(void) { #include "shaders/obj/leedsDefault_vert.inc" #include "shaders/obj/leedsDefault_frag.inc" - const char *vs[] = { shaderDecl, header_vert_src, "#define ENVMAP\n", leedsDefault_vert_src, nil }; - const char *fs_add[] = { shaderDecl, header_frag_src, "#define PASS_ADD\n", leedsDefault_frag_src, nil }; - const char *fs_blend[] = { shaderDecl, header_frag_src, "#define PASS_BLEND\n", leedsDefault_frag_src, nil }; + const char *vs[] = { shaderDecl, "#define ENVMAP\n#define DIRECTIONALS\n", header_vert_src, leedsDefault_vert_src, nil }; + const char *fs_add[] = { shaderDecl, "#define PASS_ADD\n", header_frag_src, leedsDefault_frag_src, nil }; + const char *fs_blend[] = { shaderDecl, "#define PASS_BLEND\n", header_frag_src, leedsDefault_frag_src, nil }; leedsVehicleShader_add = Shader::create(vs, fs_add); assert(leedsVehicleShader_add); leedsVehicleShader_blend = Shader::create(vs, fs_blend); @@ -380,7 +380,7 @@ CreateVehiclePipe(void) { #include "shaders/obj/leedsVehicle_mobile_frag.inc" #include "shaders/obj/leedsVehicle_mobile_vert.inc" - const char *vs[] = { shaderDecl, header_vert_src, leedsVehicle_mobile_vert_src, nil }; + const char *vs[] = { shaderDecl, "#define DIRECTIONALS\n", header_vert_src, leedsVehicle_mobile_vert_src, nil }; const char *fs[] = { shaderDecl, header_frag_src, leedsVehicle_mobile_frag_src, nil }; leedsVehicleShader_mobile = Shader::create(vs, fs); assert(leedsVehicleShader_mobile); diff --git a/vendor/librw b/vendor/librw index a5bc9723..65c619b3 160000 --- a/vendor/librw +++ b/vendor/librw @@ -1 +1 @@ -Subproject commit a5bc97232293250ae1bbd6ef6642532a541034ca +Subproject commit 65c619b3e7dcec6f5dbd05d3203b530d667ba90f