archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-23 23:19:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miami' of http://git.jacksmininetwork.co.uk/re/re3 into miami

Browse Source
This commit is contained in:
erorcun
2021-03-06 19:31:47 +03:00
parent 62b8f0f553 ceb22d71dd
commit f6f8a24335
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/extras/custompipes_gl.cpp
View File

@ -155,7 +155,7 @@ CreateVehiclePipe(void)
{ {
#include "shaders/obj/neoVehicle_frag.inc" #include "shaders/obj/neoVehicle_frag.inc"
#include "shaders/obj/neoVehicle_vert.inc" #include "shaders/obj/neoVehicle_vert.inc"
const char *vs[] = { shaderDecl, header_vert_src, neoVehicle_vert_src, nil }; const char *vs[] = { shaderDecl, "#define DIRECTIONALS\n", header_vert_src, neoVehicle_vert_src, nil };
const char *fs[] = { shaderDecl, header_frag_src, neoVehicle_frag_src, nil }; const char *fs[] = { shaderDecl, header_frag_src, neoVehicle_frag_src, nil };
neoVehicleShader = Shader::create(vs, fs); neoVehicleShader = Shader::create(vs, fs);
assert(neoVehicleShader); assert(neoVehicleShader);
@ -516,7 +516,7 @@ CreateRimLightPipes(void)
{ {
#include "shaders/obj/simple_frag.inc" #include "shaders/obj/simple_frag.inc"
#include "shaders/obj/neoRimSkin_vert.inc" #include "shaders/obj/neoRimSkin_vert.inc"
const char *vs[] = { shaderDecl, header_vert_src, neoRimSkin_vert_src, nil }; const char *vs[] = { shaderDecl, "#define DIRECTIONALS\n", header_vert_src, neoRimSkin_vert_src, nil };
const char *fs[] = { shaderDecl, header_frag_src, simple_frag_src, nil }; const char *fs[] = { shaderDecl, header_frag_src, simple_frag_src, nil };
neoRimSkinShader = Shader::create(vs, fs); neoRimSkinShader = Shader::create(vs, fs);
assert(neoRimSkinShader); assert(neoRimSkinShader);
@ -525,7 +525,7 @@ CreateRimLightPipes(void)
{ {
#include "shaders/obj/simple_frag.inc" #include "shaders/obj/simple_frag.inc"
#include "shaders/obj/neoRim_vert.inc" #include "shaders/obj/neoRim_vert.inc"
const char *vs[] = { shaderDecl, header_vert_src, neoRim_vert_src, nil }; const char *vs[] = { shaderDecl, "#define DIRECTIONALS\n", header_vert_src, neoRim_vert_src, nil };
const char *fs[] = { shaderDecl, header_frag_src, simple_frag_src, nil }; const char *fs[] = { shaderDecl, header_frag_src, simple_frag_src, nil };
neoRimShader = Shader::create(vs, fs); neoRimShader = Shader::create(vs, fs);
assert(neoRimShader); assert(neoRimShader);

2
vendor/librw vendored

Submodule vendor/librw updated: 0102f88367...af20de4522