diff --git a/polymer/eduke32/build/include/polymer.h b/polymer/eduke32/build/include/polymer.h index b4962c86c..2f77b8290 100644 --- a/polymer/eduke32/build/include/polymer.h +++ b/polymer/eduke32/build/include/polymer.h @@ -47,8 +47,6 @@ extern int32_t pr_overridespecular; extern float pr_specularpower; extern float pr_specularfactor; -extern int32_t glerror; - // MATERIAL typedef enum { PR_BIT_HEADER, // must be first @@ -131,8 +129,6 @@ typedef struct s_prrograminfo { // PR_BIT_SPOT_LIGHT GLint uniform_spotDir; GLint uniform_spotRadius; - // PR_BIT_POINT_LIGHT -// GLint uniform_lightCount; } _prprograminfo; #define PR_INFO_LOG_BUFFER_SIZE 16384 @@ -260,11 +256,6 @@ typedef struct s_pranimatespritesinfo { int32_t x, y, a, smoothratio; } _pranimatespritesinfo; -// PROGRAMS - -// CONTROL -extern int32_t updatesectors; - // EXTERNAL FUNCTIONS int32_t polymer_init(void); void polymer_glinit(void); diff --git a/polymer/eduke32/build/src/polymer.c b/polymer/eduke32/build/src/polymer.c index e1aa48d01..239c996bf 100644 --- a/polymer/eduke32/build/src/polymer.c +++ b/polymer/eduke32/build/src/polymer.c @@ -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_wireframe = 0; int32_t pr_vbos = 2; -int32_t pr_mirrordepth = 1; int32_t pr_gpusmoothing = 1; int32_t pr_overrideparallax = 0; float pr_parallaxscale = 0.1f; @@ -22,13 +21,9 @@ int32_t pr_overridespecular = 0; float pr_specularpower = 15.0f; float pr_specularfactor = 1.0f; -int32_t glerror; - GLenum mapvbousage = GL_STREAM_DRAW_ARB; GLenum modelvbousage = GL_STATIC_DRAW_ARB; -GLuint modelvp; - // BUILD DATA _prsector *prsectors[MAXSECTORS]; _prwall *prwalls[MAXWALLS]; @@ -529,11 +524,9 @@ _prrt *prrts; GLfloat spritemodelview[16]; GLfloat rootmodelviewmatrix[16]; GLfloat *curmodelviewmatrix; -GLfloat projectionmatrix[16]; float horizang; - -int32_t updatesectors = 1; +int16_t viewangle; int32_t depth; _prmirror mirrors[10]; @@ -542,10 +535,6 @@ GLUtesselator* prtess; int16_t cursky; -int16_t viewangle; - -int32_t rootsectnum; - _pranimatespritesinfo asi; // EXTERNAL FUNCTIONS @@ -643,9 +632,6 @@ void polymer_glinit(void) bglLoadIdentity(); 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); bglLoadIdentity(); @@ -781,8 +767,6 @@ void polymer_drawrooms(int32_t daposx, int32_t daposy, int32_t da return; } - rootsectnum = dacursectnum; - // GO! polymer_displayrooms(dacursectnum); @@ -3681,13 +3665,6 @@ static void polymer_compileprogram(int32_t programbits) prprograms[programbits].uniform_spotDir = bglGetUniformLocationARB(program, "spotDir"); 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 diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 8088bb4cc..bda332e81 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -12847,11 +12847,6 @@ static int32_t G_DoMoveThings(void) S_Pan3D(); } -#ifdef POLYMER - //polymer invalidate - updatesectors = 1; -#endif - return 0; }