thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

01052019

Browse source
This commit is contained in:
Jaime Passos 2019-05-01 19:37:42 -03:00
parent c0c0576151
commit 2a3e885b9a
7 changed files with 47 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/doomdef.h
View file

@ -535,4 +535,8 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// SRB2CB itself ported this from PrBoom+ /// SRB2CB itself ported this from PrBoom+
//#define NEWCLIP //#define NEWCLIP
// GL4
#define GL_SHADERS
//#define GL_PORTALS
#endif // __DOOMDEF__ #endif // __DOOMDEF__

1
src/hardware/hw_drv.h
View file

@ -106,7 +106,6 @@ struct hwdriver_s
MakeScreenFinalTexture pfnMakeScreenFinalTexture; MakeScreenFinalTexture pfnMakeScreenFinalTexture;
DrawScreenFinalTexture pfnDrawScreenFinalTexture; DrawScreenFinalTexture pfnDrawScreenFinalTexture;
// jimita
LoadShaders pfnLoadShaders; LoadShaders pfnLoadShaders;
KillShaders pfnKillShaders; KillShaders pfnKillShaders;
SetShader pfnSetShader; SetShader pfnSetShader;

5
src/hardware/hw_main.c
View file

@ -1514,9 +1514,10 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(worldtop); wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(worldtop);
wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(worldbottom); wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(worldbottom);
#endif #endif
// I don't think that solid walls can use translucent linedef types...
if (gr_frontsector->numlights) if (gr_frontsector->numlights)
HWR_SplitWall(gr_frontsector, wallVerts, gr_midtexture, &Surf, FF_CUTLEVEL, NULL); HWR_SplitWall(gr_frontsector, wallVerts, gr_midtexture, &Surf, FF_CUTLEVEL, NULL);
// I don't think that solid walls can use translucent linedef types...
else else
{ {
if (grTex->mipmap.flags & TF_TRANSPARENT) if (grTex->mipmap.flags & TF_TRANSPARENT)
@ -4432,7 +4433,7 @@ void HWR_SetViewSize(void)
// ========================================================================== // ==========================================================================
// Render the current frame. // Render the current frame.
// ========================================================================== // ==========================================================================
static void HWR_RenderFrame(INT32 viewnumber, player_t *player, boolean skybox) void HWR_RenderFrame(INT32 viewnumber, player_t *player, boolean skybox)
{ {
angle_t a1; angle_t a1;
const float fpov = FIXED_TO_FLOAT(cv_grfov.value+player->fovadd); const float fpov = FIXED_TO_FLOAT(cv_grfov.value+player->fovadd);

3
src/hardware/hw_main.h
View file

@ -52,6 +52,7 @@ UINT8 *HWR_GetScreenshot(void);
boolean HWR_Screenshot(const char *lbmname); boolean HWR_Screenshot(const char *lbmname);
// hw_main.c // hw_main.c
void HWR_RenderFrame(INT32 viewnumber, player_t *player, boolean skybox);
void HWR_RenderPlayerView(INT32 viewnumber, player_t *player); void HWR_RenderPlayerView(INT32 viewnumber, player_t *player);
void HWR_LoadShaders(UINT16 wadnum, boolean PK3); void HWR_LoadShaders(UINT16 wadnum, boolean PK3);
void HWR_SetViewSize(void); void HWR_SetViewSize(void);
@ -107,8 +108,8 @@ void HWR_AddPolyObjectSegs(void);
void HWR_RenderBSPNode(INT32 bspnum); void HWR_RenderBSPNode(INT32 bspnum);
void HWR_Subsector(size_t num); void HWR_Subsector(size_t num);
void HWR_AddLine(seg_t *line); void HWR_AddLine(seg_t *line);
void HWR_RenderDrawNodes(void);
boolean HWR_CheckBBox(fixed_t *bspcoord); boolean HWR_CheckBBox(fixed_t *bspcoord);
void HWR_RenderDrawNodes(void);
// hw_main.c: Sprites // hw_main.c: Sprites
void HWR_AddSprites(sector_t *sec); void HWR_AddSprites(sector_t *sec);

75
src/hardware/r_opengl/r_opengl.c
View file

@ -223,6 +223,7 @@ FUNCPRINTF void GL_DBG_Printf(const char *format, ...)
#define pglLightfv glLightfv #define pglLightfv glLightfv
#define pglLightModelfv glLightModelfv #define pglLightModelfv glLightModelfv
#define pglMaterialfv glMaterialfv #define pglMaterialfv glMaterialfv
#define pglMateriali glMateriali
/* Raster functions */ /* Raster functions */
#define pglPixelStorei glPixelStorei #define pglPixelStorei glPixelStorei
@ -239,6 +240,7 @@ FUNCPRINTF void GL_DBG_Printf(const char *format, ...)
/* 1.1 functions */ /* 1.1 functions */
/* texture objects */ //GL_EXT_texture_object /* texture objects */ //GL_EXT_texture_object
#define pglGenTextures glGenTextures
#define pglDeleteTextures glDeleteTextures #define pglDeleteTextures glDeleteTextures
#define pglBindTexture glBindTexture #define pglBindTexture glBindTexture
/* texture mapping */ //GL_EXT_copy_texture /* texture mapping */ //GL_EXT_copy_texture
@ -335,6 +337,8 @@ typedef void (APIENTRY * PFNglLightModelfv) (GLenum pname, GLfloat *params);
static PFNglLightModelfv pglLightModelfv; static PFNglLightModelfv pglLightModelfv;
typedef void (APIENTRY * PFNglMaterialfv) (GLint face, GLenum pname, GLfloat *params); typedef void (APIENTRY * PFNglMaterialfv) (GLint face, GLenum pname, GLfloat *params);
static PFNglMaterialfv pglMaterialfv; static PFNglMaterialfv pglMaterialfv;
typedef void (APIENTRY * PFNglMateriali) (GLint face, GLenum pname, GLint param);
static PFNglMateriali pglMateriali;
/* Raster functions */ /* Raster functions */
typedef void (APIENTRY * PFNglPixelStorei) (GLenum pname, GLint param); typedef void (APIENTRY * PFNglPixelStorei) (GLenum pname, GLint param);
@ -358,6 +362,8 @@ static PFNglFogfv pglFogfv;
/* 1.1 functions */ /* 1.1 functions */
/* texture objects */ //GL_EXT_texture_object /* texture objects */ //GL_EXT_texture_object
typedef void (APIENTRY * PFNglGenTextures) (GLsizei n, const GLuint *textures);
static PFNglGenTextures pglGenTextures;
typedef void (APIENTRY * PFNglDeleteTextures) (GLsizei n, const GLuint *textures); typedef void (APIENTRY * PFNglDeleteTextures) (GLsizei n, const GLuint *textures);
static PFNglDeleteTextures pglDeleteTextures; static PFNglDeleteTextures pglDeleteTextures;
typedef void (APIENTRY * PFNglBindTexture) (GLenum target, GLuint texture); typedef void (APIENTRY * PFNglBindTexture) (GLenum target, GLuint texture);
@ -459,6 +465,7 @@ boolean SetupGLfunc(void)
GETOPENGLFUNC(pglLightfv, glLightfv) GETOPENGLFUNC(pglLightfv, glLightfv)
GETOPENGLFUNC(pglLightModelfv, glLightModelfv) GETOPENGLFUNC(pglLightModelfv, glLightModelfv)
GETOPENGLFUNC(pglMaterialfv, glMaterialfv) GETOPENGLFUNC(pglMaterialfv, glMaterialfv)
GETOPENGLFUNC(pglMateriali, glMateriali)
GETOPENGLFUNC(pglPixelStorei, glPixelStorei) GETOPENGLFUNC(pglPixelStorei, glPixelStorei)
GETOPENGLFUNC(pglReadPixels, glReadPixels) GETOPENGLFUNC(pglReadPixels, glReadPixels)
@ -470,6 +477,7 @@ boolean SetupGLfunc(void)
GETOPENGLFUNC(pglFogf, glFogf) GETOPENGLFUNC(pglFogf, glFogf)
GETOPENGLFUNC(pglFogfv, glFogfv) GETOPENGLFUNC(pglFogfv, glFogfv)
GETOPENGLFUNC(pglGenTextures, glGenTextures)
GETOPENGLFUNC(pglDeleteTextures, glDeleteTextures) GETOPENGLFUNC(pglDeleteTextures, glDeleteTextures)
GETOPENGLFUNC(pglBindTexture, glBindTexture) GETOPENGLFUNC(pglBindTexture, glBindTexture)
@ -481,19 +489,13 @@ boolean SetupGLfunc(void)
return true; return true;
} }
// jtc
// glstate
static INT32 glstate_fog_mode = 0; static INT32 glstate_fog_mode = 0;
static float glstate_fog_density = 0; static float glstate_fog_density = 0;
// hw_glob.h
INT32 gl_leveltime = 0; INT32 gl_leveltime = 0;
#define USE_SHADERS // GL4
#ifdef GL_SHADERS
// shaders
#ifdef USE_SHADERS
#define MAXSHADERS 16 #define MAXSHADERS 16
#define MAXSHADERPROGRAMS 16 #define MAXSHADERPROGRAMS 16
@ -556,7 +558,6 @@ static PFNglGetUniformLocation pglGetUniformLocation;
// Fragment shaders // Fragment shaders
// //
// Macro to reduce boilerplate code
#define GLSL_SHARED_FOG_FUNCTION \ #define GLSL_SHARED_FOG_FUNCTION \
"float fog(const float dist, const float density, const float globaldensity) {\n" \ "float fog(const float dist, const float density, const float globaldensity) {\n" \
"const float LOG2 = -1.442695;\n" \ "const float LOG2 = -1.442695;\n" \
@ -569,30 +570,31 @@ static PFNglGetUniformLocation pglGetUniformLocation;
"return 1.0 - clamp(exp2(d * d * globaldensity * LOG2), 0.0, 1.0);\n" \ "return 1.0 - clamp(exp2(d * d * globaldensity * LOG2), 0.0, 1.0);\n" \
"}\n" "}\n"
// Macro to reduce boilerplate code
#define GLSL_SHARED_FOG_MIX \ #define GLSL_SHARED_FOG_MIX \
"float fog_distance = gl_FragCoord.z / gl_FragCoord.w;\n" \ "float fog_distance = gl_FragCoord.z / gl_FragCoord.w;\n" \
"float fog_attenuation = fog(fog_distance, 0.0001 * ((256-lighting)/24), fog_density);\n" \ "float fog_attenuation = fog(fog_distance, 0.0001 * ((256-lighting)/24), fog_density);\n" \
"if (fog_mode == 2)\n" \ "if (fog_mode == 2)\n" \
"fog_attenuation = floor(fog_attenuation*10)/10;\n" \ "fog_attenuation = floor(fog_attenuation*10)/10;\n" \
"vec4 fog_color = vec4(fade_color[0], fade_color[1], fade_color[2], 1.0);\n" \ "vec4 fog_color = vec4(fade_color[0], fade_color[1], fade_color[2], 1.0);\n" \
"vec4 mixed_color = color * mix_color;\n" \ "vec4 mixed_color = texel * mix_color;\n" \
"vec4 final_color = mix(mixed_color, fog_color, fog_attenuation);\n" \ "vec4 final_color = mix(mixed_color, fog_color, fog_attenuation);\n" \
"final_color[3] = mixed_color[3];\n" "final_color[3] = mixed_color[3];\n"
// Macro to reduce boilerplate code #define GLSL_FRAGMENT_SHADER_HEADER \
#define SHARED_FRAGMENT_SHADER \
"uniform sampler2D tex;\n" \ "uniform sampler2D tex;\n" \
"uniform vec4 mix_color;\n" \ "uniform vec4 mix_color;\n" \
"uniform vec4 fade_color;\n" \ "uniform vec4 fade_color;\n" \
"uniform float lighting;\n" \ "uniform float lighting;\n" \
"uniform int fog_mode;\n" \ "uniform int fog_mode;\n" \
"uniform float fog_density;\n" \ "uniform float fog_density;\n" \
#define SHARED_FRAGMENT_SHADER \
GLSL_FRAGMENT_SHADER_HEADER \
GLSL_SHARED_FOG_FUNCTION \ GLSL_SHARED_FOG_FUNCTION \
"void main(void) {\n" \ "void main(void) {\n" \
"vec4 color = texture2D(tex, gl_TexCoord[0].st);\n" \ "vec4 texel = texture2D(tex, gl_TexCoord[0].st);\n" \
"if (fog_mode == 0)\n" \ "if (fog_mode == 0)\n" \
"gl_FragColor = color * mix_color;\n" \ "gl_FragColor = texel * mix_color;\n" \
"else\n" \ "else\n" \
"{\n" \ "{\n" \
GLSL_SHARED_FOG_MIX \ GLSL_SHARED_FOG_MIX \
@ -643,7 +645,6 @@ static const char *fragment_shaders[] = {
// Vertex shaders // Vertex shaders
// //
// Macro to reduce boilerplate code
#define DEFAULT_VERTEX_SHADER \ #define DEFAULT_VERTEX_SHADER \
"void main()\n" \ "void main()\n" \
"{\n" \ "{\n" \
@ -679,7 +680,7 @@ static const char *vertex_shaders[] = {
DEFAULT_VERTEX_SHADER, DEFAULT_VERTEX_SHADER,
}; };
#endif // USE_SHADERS #endif // GL_SHADERS
void SetupGLFunc4(void) void SetupGLFunc4(void)
{ {
@ -692,7 +693,7 @@ void SetupGLFunc4(void)
pglBufferData = GetGLFunc("glBufferData"); pglBufferData = GetGLFunc("glBufferData");
pglDeleteBuffers = GetGLFunc("glDeleteBuffers"); pglDeleteBuffers = GetGLFunc("glDeleteBuffers");
#ifdef USE_SHADERS #ifdef GL_SHADERS
pglCreateShader = GetGLFunc("glCreateShader"); pglCreateShader = GetGLFunc("glCreateShader");
pglShaderSource = GetGLFunc("glShaderSource"); pglShaderSource = GetGLFunc("glShaderSource");
pglCompileShader = GetGLFunc("glCompileShader"); pglCompileShader = GetGLFunc("glCompileShader");
@ -722,7 +723,7 @@ void SetupGLFunc4(void)
// jimita // jimita
EXPORT void HWRAPI(LoadShaders) (void) EXPORT void HWRAPI(LoadShaders) (void)
{ {
#ifdef USE_SHADERS #ifdef GL_SHADERS
GLuint gl_vertShader, gl_fragShader; GLuint gl_vertShader, gl_fragShader;
GLint i, result; GLint i, result;
@ -806,7 +807,7 @@ EXPORT void HWRAPI(LoadShaders) (void)
EXPORT void HWRAPI(LoadCustomShader) (int number, char *shader, size_t size, boolean fragment) EXPORT void HWRAPI(LoadCustomShader) (int number, char *shader, size_t size, boolean fragment)
{ {
#ifdef USE_SHADERS #ifdef GL_SHADERS
if (number < 1 || number > MAXSHADERS) if (number < 1 || number > MAXSHADERS)
I_Error("LoadCustomShader(): cannot load shader %d (max %d)", number, MAXSHADERS); I_Error("LoadCustomShader(): cannot load shader %d (max %d)", number, MAXSHADERS);
@ -827,7 +828,7 @@ EXPORT void HWRAPI(LoadCustomShader) (int number, char *shader, size_t size, boo
EXPORT void HWRAPI(InitCustomShaders) (void) EXPORT void HWRAPI(InitCustomShaders) (void)
{ {
#ifdef USE_SHADERS #ifdef GL_SHADERS
KillShaders(); KillShaders();
LoadShaders(); LoadShaders();
#endif #endif
@ -835,7 +836,7 @@ EXPORT void HWRAPI(InitCustomShaders) (void)
EXPORT void HWRAPI(SetShader) (int shader) EXPORT void HWRAPI(SetShader) (int shader)
{ {
#ifdef USE_SHADERS #ifdef GL_SHADERS
if (gl_allowshaders) if (gl_allowshaders)
{ {
gl_shadersenabled = true; gl_shadersenabled = true;
@ -848,7 +849,7 @@ EXPORT void HWRAPI(SetShader) (int shader)
EXPORT void HWRAPI(UnSetShader) (void) EXPORT void HWRAPI(UnSetShader) (void)
{ {
#ifdef USE_SHADERS #ifdef GL_SHADERS
gl_shadersenabled = false; gl_shadersenabled = false;
gl_currentshaderprogram = 0; gl_currentshaderprogram = 0;
#endif #endif
@ -856,7 +857,7 @@ EXPORT void HWRAPI(UnSetShader) (void)
EXPORT void HWRAPI(KillShaders) (void) EXPORT void HWRAPI(KillShaders) (void)
{ {
#ifdef USE_SHADERS #ifdef GL_SHADERS
GLint total_shaders = gl_totalshaders; GLint total_shaders = gl_totalshaders;
GLint i; GLint i;
@ -951,8 +952,6 @@ void SetModelView(GLint w, GLint h)
// -----------------+ // -----------------+
void SetStates(void) void SetStates(void)
{ {
pglShadeModel(GL_SMOOTH); // iterate vertice colors
pglEnable(GL_TEXTURE_2D); // two-dimensional texturing pglEnable(GL_TEXTURE_2D); // two-dimensional texturing
pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@ -982,7 +981,6 @@ void SetStates(void)
pglGetFloatv(GL_MODELVIEW_MATRIX, modelMatrix); // added for new coronas' code (without depth buffer) pglGetFloatv(GL_MODELVIEW_MATRIX, modelMatrix); // added for new coronas' code (without depth buffer)
} }
// -----------------+ // -----------------+
// Flush : flush OpenGL textures // Flush : flush OpenGL textures
// : Clear list of downloaded mipmaps // : Clear list of downloaded mipmaps
@ -1586,7 +1584,7 @@ EXPORT void HWRAPI(SetTexture) (FTextureInfo *pTexInfo)
// jimita // jimita
static void load_shaders(FSurfaceInfo *Surface, GLRGBAFloat *mix, GLRGBAFloat *fade) static void load_shaders(FSurfaceInfo *Surface, GLRGBAFloat *mix, GLRGBAFloat *fade)
{ {
#ifdef USE_SHADERS #ifdef GL_SHADERS
if (gl_shadersenabled) if (gl_shadersenabled)
{ {
if (gl_shaderprograms[gl_currentshaderprogram]) if (gl_shaderprograms[gl_currentshaderprogram])
@ -1596,15 +1594,17 @@ static void load_shaders(FSurfaceInfo *Surface, GLRGBAFloat *mix, GLRGBAFloat *f
// //
// set uniforms // set uniforms
// //
GLint UNIFORM_fog_mode = pglGetUniformLocation(gl_shaderprograms[gl_currentshaderprogram], "fog_mode"); #define GETUNI(uniform) pglGetUniformLocation(gl_shaderprograms[gl_currentshaderprogram], uniform);
GLint UNIFORM_fog_density = pglGetUniformLocation(gl_shaderprograms[gl_currentshaderprogram], "fog_density"); GLint UNIFORM_fog_mode = GETUNI("fog_mode");
GLint UNIFORM_fog_density = GETUNI("fog_density");
GLint UNIFORM_mix_color = pglGetUniformLocation(gl_shaderprograms[gl_currentshaderprogram], "mix_color"); GLint UNIFORM_mix_color = GETUNI("mix_color");
GLint UNIFORM_fade_color = pglGetUniformLocation(gl_shaderprograms[gl_currentshaderprogram], "fade_color"); GLint UNIFORM_fade_color = GETUNI("fade_color");
GLint UNIFORM_lighting = pglGetUniformLocation(gl_shaderprograms[gl_currentshaderprogram], "lighting"); GLint UNIFORM_lighting = GETUNI("lighting");
GLint UNIFORM_resolution = pglGetUniformLocation(gl_shaderprograms[gl_currentshaderprogram], "resolution"); GLint UNIFORM_resolution = GETUNI("resolution");
GLint UNIFORM_leveltime = pglGetUniformLocation(gl_shaderprograms[gl_currentshaderprogram], "leveltime"); GLint UNIFORM_leveltime = GETUNI("leveltime");
#undef GETUNI
#define UNIFORM_1(uniform, a, function) \ #define UNIFORM_1(uniform, a, function) \
if (uniform != -1) \ if (uniform != -1) \
@ -1695,7 +1695,7 @@ EXPORT void HWRAPI(DrawPolygon) (FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUI
if (PolyFlags & PF_ForceWrapY) if (PolyFlags & PF_ForceWrapY)
Clamp2D(GL_TEXTURE_WRAP_T); Clamp2D(GL_TEXTURE_WRAP_T);
#ifdef USE_SHADERS #ifdef GL_SHADERS
pglUseProgram(0); pglUseProgram(0);
#endif #endif
} }
@ -2170,7 +2170,7 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
pglDisable(GL_CULL_FACE); pglDisable(GL_CULL_FACE);
pglDisable(GL_NORMALIZE); pglDisable(GL_NORMALIZE);
#ifdef USE_SHADERS #ifdef GL_SHADERS
pglUseProgram(0); pglUseProgram(0);
#endif #endif
} }
@ -2359,6 +2359,7 @@ EXPORT void HWRAPI(FlushScreenTextures) (void)
pglDeleteTextures(1, &startScreenWipe); pglDeleteTextures(1, &startScreenWipe);
pglDeleteTextures(1, &endScreenWipe); pglDeleteTextures(1, &endScreenWipe);
pglDeleteTextures(1, &finalScreenTexture); pglDeleteTextures(1, &finalScreenTexture);
screentexture = 0; screentexture = 0;
startScreenWipe = 0; startScreenWipe = 0;
endScreenWipe = 0; endScreenWipe = 0;

1
src/sdl/hwsym_sdl.c
View file

@ -101,7 +101,6 @@ void *hwSym(const char *funcName,void *handle)
GETFUNC(MakeScreenFinalTexture); GETFUNC(MakeScreenFinalTexture);
GETFUNC(DrawScreenFinalTexture); GETFUNC(DrawScreenFinalTexture);
// jimita
GETFUNC(LoadShaders); GETFUNC(LoadShaders);
GETFUNC(KillShaders); GETFUNC(KillShaders);
GETFUNC(SetShader); GETFUNC(SetShader);

1
src/sdl/i_video.c
View file

@ -1499,7 +1499,6 @@ void I_StartupGraphics(void)
HWD.pfnMakeScreenFinalTexture=hwSym("MakeScreenFinalTexture",NULL); HWD.pfnMakeScreenFinalTexture=hwSym("MakeScreenFinalTexture",NULL);
HWD.pfnDrawScreenFinalTexture=hwSym("DrawScreenFinalTexture",NULL); HWD.pfnDrawScreenFinalTexture=hwSym("DrawScreenFinalTexture",NULL);
// jimita
HWD.pfnLoadShaders = hwSym("LoadShaders",NULL); HWD.pfnLoadShaders = hwSym("LoadShaders",NULL);
HWD.pfnKillShaders = hwSym("KillShaders",NULL); HWD.pfnKillShaders = hwSym("KillShaders",NULL);
HWD.pfnSetShader = hwSym("SetShader",NULL); HWD.pfnSetShader = hwSym("SetShader",NULL);