summaryrefslogtreecommitdiffstats
path: root/src/extras/custompipes_gl.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-08-17 12:58:39 +0200
committeraap <aap@papnet.eu>2021-08-17 12:58:39 +0200
commite2014cfd9298c584617cc18dfa8f74c1dd29f4fa (patch)
tree40585847a652b67c60fe36de4d0219e7db148aa3 /src/extras/custompipes_gl.cpp
parentfix gl vehicle rendering (diff)
downloadre3-e2014cfd9298c584617cc18dfa8f74c1dd29f4fa.tar
re3-e2014cfd9298c584617cc18dfa8f74c1dd29f4fa.tar.gz
re3-e2014cfd9298c584617cc18dfa8f74c1dd29f4fa.tar.bz2
re3-e2014cfd9298c584617cc18dfa8f74c1dd29f4fa.tar.lz
re3-e2014cfd9298c584617cc18dfa8f74c1dd29f4fa.tar.xz
re3-e2014cfd9298c584617cc18dfa8f74c1dd29f4fa.tar.zst
re3-e2014cfd9298c584617cc18dfa8f74c1dd29f4fa.zip
Diffstat (limited to '')
-rw-r--r--src/extras/custompipes_gl.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/extras/custompipes_gl.cpp b/src/extras/custompipes_gl.cpp
index 47678fd1..0860d59e 100644
--- a/src/extras/custompipes_gl.cpp
+++ b/src/extras/custompipes_gl.cpp
@@ -41,7 +41,7 @@ static int32 u_emiss;
static int32 u_colorscale;
static int32 u_texMatrix;
-static int32 u_fxparams;
+static int32 u_shininess;
static int32 u_skyTop;
static int32 u_skyBot;
@@ -98,7 +98,7 @@ uploadEnvMatrix(rw::Frame *frame)
convMatrix(&invMtx, &invMat);
RawMatrix::mult(&envMtx, &invMtx, &normal2texcoord_flipU);
}
- glUniformMatrix4fv(U(u_texMatrix), 1, GL_FALSE, (float*)&envMtx);
+ setUniform(u_texMatrix, &envMtx);
}
static void
@@ -141,7 +141,7 @@ leedsVehicleRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
if(gGlassCarsCheat)
coef = 1.0f;
}
- glUniform1f(U(u_fxparams), coef);
+ glUniform1f(U(u_shininess), coef);
setMaterial(m->color, m->surfaceProps);
@@ -226,7 +226,7 @@ leedsVehicleRenderCB_mobile(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *hea
if(gGlassCarsCheat)
coef = 1.0f;
}
- glUniform1f(U(u_fxparams), coef);
+ glUniform1f(U(u_shininess), coef);
setMaterial(m->color, m->surfaceProps);
@@ -809,8 +809,8 @@ CustomPipeRegisterGL(void)
u_emiss = rw::gl3::registerUniform("u_emiss");
u_colorscale = rw::gl3::registerUniform("u_colorscale");
- u_texMatrix = rw::gl3::registerUniform("u_texMatrix");
- u_fxparams = rw::gl3::registerUniform("u_fxparams");
+ u_texMatrix = rw::gl3::registerUniform("u_texMatrix", rw::gl3::UNIFORM_MAT4);
+ u_shininess = rw::gl3::registerUniform("u_shininess");
u_skyTop = rw::gl3::registerUniform("u_skyTop");
u_skyBot = rw::gl3::registerUniform("u_skyBot");