zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up a bit of dead code.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1306 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-04-12 16:39:54 +00:00
parent b7449a87b9
commit 82153bd763
3 changed files with 1 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/build/include/polymer.h
View file

@ -47,8 +47,6 @@ extern int32_t pr_overridespecular;
extern float pr_specularpower; extern float pr_specularpower;
extern float pr_specularfactor; extern float pr_specularfactor;
extern int32_t glerror;
// MATERIAL // MATERIAL
typedef enum { typedef enum {
PR_BIT_HEADER, // must be first PR_BIT_HEADER, // must be first
@ -131,8 +129,6 @@ typedef struct s_prrograminfo {
// PR_BIT_SPOT_LIGHT // PR_BIT_SPOT_LIGHT
GLint uniform_spotDir; GLint uniform_spotDir;
GLint uniform_spotRadius; GLint uniform_spotRadius;
// PR_BIT_POINT_LIGHT
// GLint uniform_lightCount;
} _prprograminfo; } _prprograminfo;
#define PR_INFO_LOG_BUFFER_SIZE 16384 #define PR_INFO_LOG_BUFFER_SIZE 16384
@ -260,11 +256,6 @@ typedef struct s_pranimatespritesinfo {
int32_t x, y, a, smoothratio; int32_t x, y, a, smoothratio;
} _pranimatespritesinfo; } _pranimatespritesinfo;
// PROGRAMS
// CONTROL
extern int32_t updatesectors;
// EXTERNAL FUNCTIONS // EXTERNAL FUNCTIONS
int32_t polymer_init(void); int32_t polymer_init(void);
void polymer_glinit(void); void polymer_glinit(void);

25
polymer/eduke32/build/src/polymer.c
View file

@ -13,7 +13,6 @@ int32_t pr_billboardingmode = 1;
int32_t pr_verbosity = 1; // 0: silent, 1: errors and one-times, 2: multiple-times, 3: flood int32_t pr_verbosity = 1; // 0: silent, 1: errors and one-times, 2: multiple-times, 3: flood
int32_t pr_wireframe = 0; int32_t pr_wireframe = 0;
int32_t pr_vbos = 2; int32_t pr_vbos = 2;
int32_t pr_mirrordepth = 1;
int32_t pr_gpusmoothing = 1; int32_t pr_gpusmoothing = 1;
int32_t pr_overrideparallax = 0; int32_t pr_overrideparallax = 0;
float pr_parallaxscale = 0.1f; float pr_parallaxscale = 0.1f;
@ -22,13 +21,9 @@ int32_t pr_overridespecular = 0;
float pr_specularpower = 15.0f; float pr_specularpower = 15.0f;
float pr_specularfactor = 1.0f; float pr_specularfactor = 1.0f;
int32_t glerror;
GLenum mapvbousage = GL_STREAM_DRAW_ARB; GLenum mapvbousage = GL_STREAM_DRAW_ARB;
GLenum modelvbousage = GL_STATIC_DRAW_ARB; GLenum modelvbousage = GL_STATIC_DRAW_ARB;
GLuint modelvp;
// BUILD DATA // BUILD DATA
_prsector *prsectors[MAXSECTORS]; _prsector *prsectors[MAXSECTORS];
_prwall *prwalls[MAXWALLS]; _prwall *prwalls[MAXWALLS];
@ -529,11 +524,9 @@ _prrt *prrts;
GLfloat spritemodelview[16]; GLfloat spritemodelview[16];
GLfloat rootmodelviewmatrix[16]; GLfloat rootmodelviewmatrix[16];
GLfloat *curmodelviewmatrix; GLfloat *curmodelviewmatrix;
GLfloat projectionmatrix[16];
float horizang; float horizang;
int16_t viewangle;
int32_t updatesectors = 1;
int32_t depth; int32_t depth;
_prmirror mirrors[10]; _prmirror mirrors[10];
@ -542,10 +535,6 @@ GLUtesselator* prtess;
int16_t cursky; int16_t cursky;
int16_t viewangle;
int32_t rootsectnum;
_pranimatespritesinfo asi; _pranimatespritesinfo asi;
// EXTERNAL FUNCTIONS // EXTERNAL FUNCTIONS
@ -643,9 +632,6 @@ void polymer_glinit(void)
bglLoadIdentity(); bglLoadIdentity();
bgluPerspective((float)(pr_fov) / (2048.0f / 360.0f), (float)xdim / (float)ydim, 0.01f, 100.0f); bgluPerspective((float)(pr_fov) / (2048.0f / 360.0f), (float)xdim / (float)ydim, 0.01f, 100.0f);
// get the new projection matrix
bglGetFloatv(GL_PROJECTION_MATRIX, projectionmatrix);
bglMatrixMode(GL_MODELVIEW); bglMatrixMode(GL_MODELVIEW);
bglLoadIdentity(); bglLoadIdentity();
@ -781,8 +767,6 @@ void polymer_drawrooms(int32_t daposx, int32_t daposy, int32_t da
return; return;
} }
rootsectnum = dacursectnum;
// GO! // GO!
polymer_displayrooms(dacursectnum); polymer_displayrooms(dacursectnum);
@ -3681,13 +3665,6 @@ static void polymer_compileprogram(int32_t programbits)
prprograms[programbits].uniform_spotDir = bglGetUniformLocationARB(program, "spotDir"); prprograms[programbits].uniform_spotDir = bglGetUniformLocationARB(program, "spotDir");
prprograms[programbits].uniform_spotRadius = bglGetUniformLocationARB(program, "spotRadius"); prprograms[programbits].uniform_spotRadius = bglGetUniformLocationARB(program, "spotRadius");
} }
// PR_BIT_POINT_LIGHT
if (programbits & prprogrambits[PR_BIT_POINT_LIGHT].bit && glinfo.sm4)
{
// prprograms[programbits].uniform_lightCount = bglGetUniformLocationARB(program, "lightCount");
}
} }
// LIGHTS // LIGHTS

5
polymer/eduke32/source/game.c
View file

@ -12847,11 +12847,6 @@ static int32_t G_DoMoveThings(void)
S_Pan3D(); S_Pan3D();
} }
#ifdef POLYMER
//polymer invalidate
updatesectors = 1;
#endif
return 0; return 0;
} }