mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-18 22:55:12 +00:00
Code Issues Releases Wiki Activity

support for model transition in shader

Browse Source
This commit is contained in:
Zeno Rogue
2025-09-09 16:20:12 +02:00
parent 49e3116d74
commit b4a5cb648c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
glhr.cpp
View File

@@ -306,7 +306,7 @@ struct GLprogram {
GLint uFog, uFogColor, uColor, tTexture, tInvExpTable, tAirMap, uMV, uProjection, uAlpha, uFogBase, uPP; GLint uFog, uFogColor, uColor, tTexture, tInvExpTable, tAirMap, uMV, uProjection, uAlpha, uFogBase, uPP;
GLint uPRECX, uPRECY, uPRECZ, uIndexSL, uIterations, uLevelLines, uSV, uRadarTransform; GLint uPRECX, uPRECY, uPRECZ, uIndexSL, uIterations, uLevelLines, uSV, uRadarTransform;
GLint uRotSin, uRotCos, uRotNil; GLint uRotSin, uRotCos, uRotNil;
GLint uDepthScaling, uCamera, uDepth; GLint uDepthScaling, uCamera, uDepth, uModelTrans;
flagtype shader_flags; flagtype shader_flags;
@@ -377,7 +377,7 @@ GLprogram::GLprogram(string vsh, string fsh) {
uAlpha = -1; uAlpha = -1;
uLevelLines = -1; uLevelLines = -1;
uFogColor = -1; uFogColor = -1;
uDepthScaling = uCamera = uDepth = -1; uDepthScaling = uCamera = uDepth = uModelTrans = -1;
uColor = tTexture = tInvExpTable = tAirMap = -1; uColor = tTexture = tInvExpTable = tAirMap = -1;
uFogBase = -1; uFogBase = -1;
@@ -443,6 +443,7 @@ GLprogram::GLprogram(string vsh, string fsh) {
uDepth = glGetUniformLocation(_program, "uDepth"); uDepth = glGetUniformLocation(_program, "uDepth");
uDepthScaling = glGetUniformLocation(_program, "uDepthScaling"); uDepthScaling = glGetUniformLocation(_program, "uDepthScaling");
uCamera = glGetUniformLocation(_program, "uCamera"); uCamera = glGetUniformLocation(_program, "uCamera");
uModelTrans = glGetUniformLocation(_program, "uModelTrans");
uPRECX = glGetUniformLocation(_program, "PRECX"); uPRECX = glGetUniformLocation(_program, "PRECX");
uPRECY = glGetUniformLocation(_program, "PRECY"); uPRECY = glGetUniformLocation(_program, "PRECY");

3
shaders.cpp
View File

@@ -837,6 +837,9 @@ void display_data::set_projection(int ed, ld shift) {
if(selected->uDepth != -1) if(selected->uDepth != -1)
glUniform1f(selected->uDepth, vid.depth); glUniform1f(selected->uDepth, vid.depth);
if(selected->uModelTrans != -1)
glUniform1f(selected->uModelTrans, pconf.model_transition);
if(selected->uCamera != -1) if(selected->uCamera != -1)
glUniform1f(selected->uCamera, vid.camera); glUniform1f(selected->uCamera, vid.camera);