Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rendering cleanup, by Safety0ff. Closes ticket 2664.

master
Per Inge Mathisen 2011-04-25 12:29:26 +02:00
parent 6adf3a7f70
commit 86a92ed314
9 changed files with 30 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ivis_opengl/piematrix.cpp
View File

@ -115,21 +115,6 @@ void pie_MatEnd(void)
}
void pie_MATTRANS(float x, float y, float z)
{
GLfloat matrix[16];
psMatrix->j = x * FP12_MULTIPLIER;
psMatrix->k = y * FP12_MULTIPLIER;
psMatrix->l = z * FP12_MULTIPLIER;
glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
matrix[12] = x;
matrix[13] = y;
matrix[14] = z;
glLoadMatrixf(matrix);
}
void pie_TRANSLATE(int32_t x, int32_t y, int32_t z)
{
/*

1
lib/ivis_opengl/piematrix.h
View File

@ -64,7 +64,6 @@ extern void pie_MatInit(void);
extern void pie_MatBegin(void);
extern void pie_MatEnd(void);
extern void pie_MATTRANS(float x, float y, float z);
extern void pie_TRANSLATE(int32_t x, int32_t y, int32_t z);
extern void pie_MatScale(float scale);
extern void pie_MatRotX(uint16_t x);

5
src/atmos.cpp
View File

@ -342,7 +342,7 @@ UDWORD i;
void renderParticle( ATPART *psPart )
{
Vector3i dv;
SDWORD x, y, z, rx, rz;
SDWORD x, y, z;
x = psPart->position.x;
y = psPart->position.y;
@ -353,9 +353,6 @@ void renderParticle( ATPART *psPart )
dv.z = terrainMidY * TILE_UNITS - ((UDWORD)z - player.p.z);
pie_MatBegin(); /* Push the identity matrix */
pie_TRANSLATE(dv.x,dv.y,dv.z);
rx = map_round(player.p.x); /* Get the x,z translation components */
rz = map_round(player.p.z);
pie_TRANSLATE(rx,0,-rz); /* Translate */
/* Make it face camera */
pie_MatRotY(-player.r.y);
pie_MatRotY(-player.r.x);

8
src/bridge.cpp
View File

@ -114,7 +114,6 @@ bool bridgeValid(int startX, int startY, int endX, int endY)
*/
bool renderBridgeSection(STRUCTURE *psStructure)
{
SDWORD rx, rz;
Vector3i dv;
/* Bomb out if it's not visible */
@ -134,13 +133,6 @@ bool renderBridgeSection(STRUCTURE *psStructure)
/* Translate */
pie_TRANSLATE(dv.x, dv.y, dv.z);
/* Get the x,z translation components */
rx = map_round(player.p.x);
rz = map_round(player.p.z);
/* Translate */
pie_TRANSLATE(rx, 0, -rz);
pie_Draw3DShape(psStructure->sDisplay.imd, 0, 0, WZCOL_WHITE, 0, 0);
pie_MatEnd();

52
src/bucket3d.cpp
View File

@ -59,7 +59,6 @@ static std::vector<BUCKET_TAG> bucketArray;
static SDWORD bucketCalculateZ(RENDER_TYPE objectType, void* pObject)
{
SDWORD z = 0, radius;
SDWORD px, pz;
Vector2i pixel;
Vector3i position;
UDWORD droidSize;
@ -75,12 +74,6 @@ static SDWORD bucketCalculateZ(RENDER_TYPE objectType, void* pObject)
switch(objectType)
{
case RENDER_PARTICLE:
px = player.p.x & (TILE_UNITS-1);
pz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(px,0,-pz);
position.x = ((ATPART*)pObject)->position.x;
position.y = ((ATPART*)pObject)->position.y;
position.z = ((ATPART*)pObject)->position.z;
@ -118,12 +111,6 @@ static SDWORD bucketCalculateZ(RENDER_TYPE objectType, void* pObject)
//the weapon stats holds the reference to which graphic to use
pImd = ((PROJECTILE*)pObject)->psWStats->pInFlightGraphic;
px = player.p.x & (TILE_UNITS-1);
pz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(px,0,-pz);
psSimpObj = (SIMPLE_OBJECT*) pObject;
position.x = (psSimpObj->pos.x - player.p.x) - terrainMidX*TILE_UNITS;
position.z = terrainMidY*TILE_UNITS - (psSimpObj->pos.y - player.p.z);
@ -147,12 +134,6 @@ static SDWORD bucketCalculateZ(RENDER_TYPE objectType, void* pObject)
}
break;
case RENDER_STRUCTURE://not depth sorted
px = player.p.x & (TILE_UNITS-1);
pz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(px,0,-pz);
psSimpObj = (SIMPLE_OBJECT*) pObject;
position.x = (psSimpObj->pos.x - player.p.x) - terrainMidX*TILE_UNITS;
position.z = terrainMidY*TILE_UNITS - (psSimpObj->pos.y - player.p.z);
@ -189,12 +170,6 @@ static SDWORD bucketCalculateZ(RENDER_TYPE objectType, void* pObject)
}
break;
case RENDER_FEATURE://not depth sorted
px = player.p.x & (TILE_UNITS-1);
pz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(px,0,-pz);
psSimpObj = (SIMPLE_OBJECT*) pObject;
position.x = (psSimpObj->pos.x - player.p.x) - terrainMidX*TILE_UNITS;
position.z = terrainMidY*TILE_UNITS - (psSimpObj->pos.y - player.p.z);
@ -217,12 +192,6 @@ static SDWORD bucketCalculateZ(RENDER_TYPE objectType, void* pObject)
}
break;
case RENDER_ANIMATION://not depth sorted
px = player.p.x & (TILE_UNITS-1);
pz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(px,0,-pz);
psCompObj = (COMPONENT_OBJECT *) pObject;
spacetime = interpolateObjectSpacetime((SIMPLE_OBJECT *)psCompObj->psParent, graphicsTime);
position.x = (spacetime.pos.x - player.p.x) - terrainMidX*TILE_UNITS;
@ -249,11 +218,6 @@ static SDWORD bucketCalculateZ(RENDER_TYPE objectType, void* pObject)
case RENDER_DROID:
case RENDER_SHADOW:
psDroid = (DROID*) pObject;
px = player.p.x & (TILE_UNITS-1);
pz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(px,0,-pz);
psSimpObj = (SIMPLE_OBJECT*) pObject;
position.x = (psSimpObj->pos.x - player.p.x) - terrainMidX*TILE_UNITS;
@ -282,11 +246,6 @@ static SDWORD bucketCalculateZ(RENDER_TYPE objectType, void* pObject)
}
break;
case RENDER_PROXMSG:
px = player.p.x & (TILE_UNITS-1);
pz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(px,0,-pz);
if (((PROXIMITY_DISPLAY *)pObject)->type == POS_PROXDATA)
{
position.x = (((VIEW_PROXIMITY *)((VIEWDATA *)((PROXIMITY_DISPLAY *)
@ -326,12 +285,6 @@ static SDWORD bucketCalculateZ(RENDER_TYPE objectType, void* pObject)
}
break;
case RENDER_EFFECT:
px = player.p.x & (TILE_UNITS-1);
pz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(px,0,-pz);
position.x = (SDWORD)(((EFFECT*)pObject)->position.x - player.p.x) - terrainMidX*TILE_UNITS;
position.z = (SDWORD)(terrainMidY*TILE_UNITS - (((EFFECT*)pObject)->position.z - player.p.z));
position.y = (SDWORD)((EFFECT*)pObject)->position.y;
@ -359,11 +312,6 @@ static SDWORD bucketCalculateZ(RENDER_TYPE objectType, void* pObject)
break;
case RENDER_DELIVPOINT:
px = player.p.x & (TILE_UNITS-1);
pz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(px,0,-pz);
position.x = (((FLAG_POSITION *)pObject)->coords.x - player.p.x) -
terrainMidX * TILE_UNITS;
position.z = terrainMidY*TILE_UNITS - (((FLAG_POSITION*)pObject)->

8
src/component.cpp
View File

@ -992,7 +992,6 @@ void displayComponentButtonObject(DROID *psDroid, Vector3i *Rotation, Vector3i *
void displayComponentObject(DROID *psDroid)
{
Vector3i position, rotation;
int32_t xShift,zShift;
SDWORD frame;
UDWORD tileX,tileY;
MAPTILE *psTile;
@ -1003,13 +1002,6 @@ void displayComponentObject(DROID *psDroid)
/* Push the matrix */
pie_MatBegin();
/* Get internal tile units coordinates */
xShift = map_round(player.p.x);
zShift = map_round(player.p.z);
/* Mask out to tile_units resolution */
pie_TRANSLATE(xShift,0,-zShift);
/* Get the real position */
position.x = (st.pos.x - player.p.x) - terrainMidX*TILE_UNITS;
position.z = terrainMidY*TILE_UNITS - (st.pos.y - player.p.z);

136
src/display3d.cpp
View File

@ -891,7 +891,6 @@ static void calcAverageTerrainHeight(iView *player)
static void drawTiles(iView *player)
{
UDWORD i, j;
SDWORD rx, rz;
Vector3f theSun;
/* ---------------------------------------------------------------- */
@ -905,10 +904,6 @@ static void drawTiles(iView *player)
playerXTile = map_coord(player->p.x);
playerZTile = map_coord(player->p.z);
/* Get the x,z translation components */
rx = (player->p.x) & (TILE_UNITS-1);
rz = (player->p.z) & (TILE_UNITS-1);
/* ---------------------------------------------------------------- */
/* Set up the geometry */
/* ---------------------------------------------------------------- */
@ -917,19 +912,19 @@ static void drawTiles(iView *player)
/* Push identity matrix onto stack */
pie_MatBegin();
/* Set the camera position */
pie_TRANSLATE(0, 0, distance);
// Now, scale the world according to what resolution we're running in
pie_MatScale(pie_GetResScalingFactor() / 100.f);
/* Set the camera position */
pie_MATTRANS(0, 0, distance);
/* Rotate for the player */
pie_MatRotZ(player->r.z);
pie_MatRotX(player->r.x);
pie_MatRotY(player->r.y);
/* Translate */
pie_TRANSLATE(-rx, -player->p.y, rz);
pie_TRANSLATE(0, -player->p.y, 0);
// this also detemines the length of the shadows
theSun = getTheSun();
@ -969,11 +964,11 @@ static void drawTiles(iView *player)
// now we are about to draw the terrain
pie_SetAlphaTest(false);
pie_SetFogStatus(true);
glPushMatrix();
// also, make sure we can use world coordinates directly
glTranslatef(world_coord(-playerXTile-terrainMidX), 0.0f, world_coord(playerZTile+terrainMidY));
glTranslatef(-player->p.x-world_coord(visibleTiles.x/2), 0.0f, player->p.z+world_coord(visibleTiles.y/2));
// and draw it
drawTerrain();
@ -982,7 +977,7 @@ static void drawTiles(iView *player)
// draw skybox
renderSurroundings();
// and prepare for rendering the models
pie_SetRendMode(REND_OPAQUE);
pie_SetAlphaTest(true);
@ -1001,24 +996,24 @@ static void drawTiles(iView *player)
display3DProjectiles(); // bucket render implemented
atmosDrawParticles();
// prepare for the water and the lightmap
pie_SetAlphaTest(false);
pie_SetFogStatus(true);
glPushMatrix();
// also, make sure we can use world coordinates directly
glTranslatef(world_coord(-playerXTile-terrainMidX), 0.0f, world_coord(playerZTile+terrainMidY));
glTranslatef(-player->p.x-world_coord(visibleTiles.x/2), 0.0f, player->p.z+world_coord(visibleTiles.y/2));
drawWater();
// and to the warzone modelview transform
glPopMatrix();
bucketRenderCurrentList();
displayBlueprints();
pie_RemainingPasses(); // draws shadows and transparent shapes
pie_EndLighting();
@ -1075,7 +1070,7 @@ bool init3DView(void)
// distance is not saved, so initialise it now
distance = START_DISTANCE; // distance
disp3d_resetView(); // clear player view variables
if (!initTerrain())
@ -1205,7 +1200,6 @@ void renderProjectile(PROJECTILE *psCurr)
WEAPON_STATS *psStats;
Vector3i dv;
iIMDShape *pIMD;
SDWORD rx, rz;
Spacetime st;
psStats = psCurr->psWStats;
@ -1242,12 +1236,6 @@ void renderProjectile(PROJECTILE *psCurr)
/* Translate to the correct position */
pie_TRANSLATE(dv.x,dv.y,dv.z);
/* Get the x,z translation components */
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(rx,0,-rz);
/* Rotate it to the direction it's facing */
imdRot2.y = st.rot.direction;
@ -1279,7 +1267,6 @@ void renderAnimComponent( const COMPONENT_OBJECT *psObj )
Spacetime spacetime = interpolateObjectSpacetime(psParentObj, graphicsTime);
const SDWORD posX = spacetime.pos.x + psObj->position.x,
posY = spacetime.pos.y + psObj->position.y;
int rx, rz;
ASSERT( psParentObj != NULL, "renderAnimComponent: invalid parent object pointer" );
@ -1310,13 +1297,6 @@ void renderAnimComponent( const COMPONENT_OBJECT *psObj )
/* parent object translation */
pie_TRANSLATE(dv.x, dv.y, dv.z);
/* Get the x,z translation components */
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(rx, 0, -rz);
/* parent object rotations */
imdRot2.y = spacetime.rot.direction;
pie_MatRotY(-imdRot2.y);
@ -1868,7 +1848,7 @@ void setViewDistance(UDWORD dist)
/// Draw a feature (tree/rock/etc.)
void renderFeature(FEATURE *psFeature)
{
SDWORD rotation, rx, rz;
SDWORD rotation;
PIELIGHT brightness;
Vector3i dv;
bool bForceDraw = ( !getRevealStatus() && psFeature->psStats->visibleAtStart);
@ -1901,12 +1881,6 @@ void renderFeature(FEATURE *psFeature)
buildings to face different ways - Don't know if this is necessary - should be IMO */
pie_TRANSLATE(dv.x,dv.y,dv.z);
/* Get the x,z translation components */
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(rx,0,-rz);
rotation = psFeature->rot.direction;
pie_MatRotY(-rotation);
@ -1958,7 +1932,7 @@ void renderProximityMsg(PROXIMITY_DISPLAY *psProxDisp)
UDWORD msgX = 0, msgY = 0;
Vector3i dv(0, 0, 0);
VIEW_PROXIMITY *pViewProximity = NULL;
SDWORD x, y, r, rx, rz;
SDWORD x, y, r;
iIMDShape *proxImd = NULL;
//store the frame number for when deciding what has been clicked on
@ -2005,12 +1979,7 @@ void renderProximityMsg(PROXIMITY_DISPLAY *psProxDisp)
/* Translate the message */
pie_TRANSLATE(dv.x,dv.y,dv.z);
/* Get the x,z translation components */
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(rx,0,-rz);
//get the appropriate IMD
if (pViewProximity)
{
@ -2081,7 +2050,7 @@ static PIELIGHT getBlueprintColour(STRUCT_STATES state)
/// Draw the structures
void renderStructure(STRUCTURE *psStructure)
{
int i, structX, structY, rx, rz, colour, rotation, frame, animFrame, pieFlag, pieFlagData;
int i, structX, structY, colour, rotation, frame, animFrame, pieFlag, pieFlagData;
PIELIGHT buildingBrightness;
Vector3i dv;
bool bHitByElectronic = false;
@ -2137,13 +2106,6 @@ void renderStructure(STRUCTURE *psStructure)
buildings to face different ways - Don't know if this is necessary - should be IMO */
pie_TRANSLATE(dv.x,dv.y,dv.z);
/* Get the x,z translation components */
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(rx, 0, -rz);
/* OK - here is where we establish which IMD to draw for the building - luckily static objects,
* buildings in other words are NOT made up of components - much quicker! */
@ -2451,9 +2413,9 @@ void renderStructure(STRUCTURE *psStructure)
/// draw the delivery points
void renderDeliveryPoint(FLAG_POSITION *psPosition, bool blueprint)
{
Vector3i dv;
SDWORD x, y, r, rx, rz;
Vector3f *temp = NULL;
Vector3i dv;
SDWORD x, y, r;
Vector3f* temp = NULL;
int pieFlag, pieFlagData;
PIELIGHT colour;
//store the frame number for when deciding what has been clicked on
@ -2468,13 +2430,6 @@ void renderDeliveryPoint(FLAG_POSITION *psPosition, bool blueprint)
pie_TRANSLATE(dv.x,dv.y,dv.z);
/* Get the x,z translation components */
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(rx,0,-rz);
//quick check for invalid data
ASSERT( psPosition->factoryType < NUM_FLAG_TYPES && psPosition->factoryInc < MAX_FACTORY, "Invalid assembly point" );
@ -2519,7 +2474,7 @@ void renderDeliveryPoint(FLAG_POSITION *psPosition, bool blueprint)
/// Draw a piece of wall
static bool renderWallSection(STRUCTURE *psStructure)
{
SDWORD structX, structY, rx, rz, height;
SDWORD structX, structY, height;
PIELIGHT brightness;
iIMDShape *imd;
SDWORD rotation;
@ -2586,13 +2541,6 @@ static bool renderWallSection(STRUCTURE *psStructure)
/* Translate */
pie_TRANSLATE(dv.x,dv.y,dv.z);
/* Get the x,z translation components */
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(rx, 0, -rz);
rotation = psStructure->rot.direction;
pie_MatRotY(-rotation);
@ -2663,7 +2611,6 @@ static bool renderWallSection(STRUCTURE *psStructure)
void renderShadow( DROID *psDroid, iIMDShape *psShadowIMD )
{
Vector3i dv;
SDWORD rx, rz;
dv.x = (psDroid->pos.x - player.p.x) - terrainMidX*TILE_UNITS;
if(psDroid->droidType == DROID_TRANSPORTER)
@ -2678,13 +2625,6 @@ void renderShadow( DROID *psDroid, iIMDShape *psShadowIMD )
pie_TRANSLATE(dv.x,dv.y,dv.z);
/* Get the x,z translation components */
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
/* Translate */
pie_TRANSLATE(rx,0,-rz);
pie_MatRotY(-psDroid->rot.direction);
pie_MatRotX(psDroid->rot.pitch);
pie_MatRotZ(psDroid->rot.roll);
@ -3636,21 +3576,16 @@ static void renderSurroundings(void)
static float wind = 0.0f;
const float skybox_scale = 10000.0f;
// Push identity matrix onto stack
// Push current matrix onto stack
pie_MatBegin();
// Now, scale the world according to what resolution we're running in
pie_MatScale(pie_GetResScalingFactor() / 100.f);
// Set the camera position
pie_MATTRANS(0, 0, distance);
// Render skybox relative to ground (i.e. undo player y translation)
// then move it somewhat below ground level for the blending effect
pie_TRANSLATE(0, player.p.y-skybox_scale/8, 0);
// rotate it
pie_MatRotY(DEG(wind));
// move it somewhat below ground level for the blending effect
pie_TRANSLATE(0, -skybox_scale/8, 0);
// Set the texture page
pie_SetTexturePage(iV_GetTexture(skyboxPageName));
@ -4287,7 +4222,6 @@ static void addConstructionLine(DROID *psDroid, STRUCTURE *psStructure)
UDWORD pointIndex;
SDWORD realY;
Vector3i null, vec;
SDWORD rx,rz;
PIELIGHT colour;
null.x = null.y = null.z = 0;
@ -4299,11 +4233,7 @@ static void addConstructionLine(DROID *psDroid, STRUCTURE *psStructure)
vec.z = terrainMidY*TILE_UNITS - (each.z - player.p.z);
vec.y = each.y;
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
pts[0].x = vec.x + rx;
pts[0].y = vec.y;
pts[0].z = vec.z - rz;
pts[0] = vec;
pointIndex = rand()%(psStructure->sDisplay.imd->npoints-1);
point = &(psStructure->sDisplay.imd->points[pointIndex]);
@ -4323,11 +4253,7 @@ static void addConstructionLine(DROID *psDroid, STRUCTURE *psStructure)
vec.z = terrainMidY*TILE_UNITS - (each.z - player.p.z);
vec.y = each.y;
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
pts[1].x = vec.x + rx;
pts[1].y = vec.y;
pts[1].z = vec.z - rz;
pts[1] = vec;
pointIndex = rand()%(psStructure->sDisplay.imd->npoints-1);
point = &(psStructure->sDisplay.imd->points[pointIndex]);
@ -4341,11 +4267,7 @@ static void addConstructionLine(DROID *psDroid, STRUCTURE *psStructure)
vec.z = terrainMidY*TILE_UNITS - (each.z - player.p.z);
vec.y = each.y;
rx = player.p.x & (TILE_UNITS-1);
rz = player.p.z & (TILE_UNITS-1);
pts[2].x = vec.x + rx;
pts[2].y = vec.y;
pts[2].z = vec.z - rz;
pts[2] = vec;
// set the colour
colour = pal_SetBrightness(UBYTE_MAX);

9
src/effects.cpp
View File

@ -427,8 +427,6 @@ void initEffectsSystem(void)
static void positionEffect(const EFFECT *psEffect)
{
int rx, rz;
/* Establish world position */
Vector3i dv(
(psEffect->position.x - player.p.x) - terrainMidX * TILE_UNITS,
@ -441,13 +439,6 @@ static void positionEffect(const EFFECT *psEffect)
/* Move to position */
pie_TRANSLATE(dv.x, dv.y, dv.z);
/* Get the x,z translation components */
rx = map_round(player.p.x);
rz = map_round(player.p.z);
/* Move to camera reference */
pie_TRANSLATE(rx, 0, -rz);
}
static void killEffect(EFFECT *e)

8
src/terrain.cpp
View File

@ -1339,14 +1339,6 @@ void drawTerrain(void)
glDisable(GL_TEXTURE_GEN_S); glError();
glDisable(GL_TEXTURE_GEN_T); glError();
#ifdef MESA_BUG
// prevent the terrain from getting corrupted by the decal drawing code
// (something with VBO + changing the texture)
// this happens on radeon + mesa
// FIXME: remove this after the driver is fixed
glFlush();
#endif
//////////////////////////////////
// decals