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

Unify muzzle flash drawing code between structures and droids to reduce code duplication.

master
per 2013-10-20 11:45:49 +02:00
parent e779457906
commit 76edcb87fd
3 changed files with 45 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/component.cpp
View File

@ -354,6 +354,46 @@ static inline iIMDShape *getRightPropulsionIMD(DROID *psDroid)
return asBodyStats[bodyStat].ppIMDList[propStat * NUM_PROP_SIDES + RIGHT_PROP];
}
void drawMuzzleFlash(WEAPON sWeap, iIMDShape *weaponImd, iIMDShape *flashImd, PIELIGHT buildingBrightness, int pieFlag, int iPieData, UBYTE colour)
{
if (!weaponImd || !flashImd || !weaponImd->nconnectors || graphicsTime < sWeap.lastFired)
{
return;
}
int connector_num = 0;
// which barrel is firing if model have multiple muzzle connectors?
if (sWeap.shotsFired && (weaponImd->nconnectors > 1))
{
// shoot first, draw later - substract one shot to get correct results
connector_num = (sWeap.shotsFired - 1) % (weaponImd->nconnectors);
}
/* Now we need to move to the end of the firing barrel */
pie_TRANSLATE(weaponImd->connectors[connector_num].x,
weaponImd->connectors[connector_num].z,
weaponImd->connectors[connector_num].y);
// assume no clan colours for muzzle effects
if (flashImd->numFrames == 0 || flashImd->animInterval <= 0)
{
// no anim so display one frame for a fixed time
if (graphicsTime >= sWeap.lastFired && graphicsTime < sWeap.lastFired + BASE_MUZZLE_FLASH_DURATION)
{
pie_Draw3DShape(flashImd, 0, colour, buildingBrightness, pieFlag | pie_ADDITIVE, EFFECT_MUZZLE_ADDITIVE);
}
}
else if (graphicsTime >= sWeap.lastFired)
{
// animated muzzle
int frame = (graphicsTime - sWeap.lastFired) / flashImd->animInterval;
if (frame < flashImd->numFrames)
{
pie_Draw3DShape(flashImd, frame, colour, buildingBrightness, pieFlag | pie_ADDITIVE, EFFECT_MUZZLE_ADDITIVE);
}
}
}
/* Assumes matrix context is already set */
// this is able to handle multiple weapon graphics now
@ -363,7 +403,6 @@ static void displayCompObj(DROID *psDroid, bool bButton)
iIMDShape *psShape, *psMoveAnim, *psStillAnim, *psShapeTemp = NULL, *psMountShape;
SDWORD iConnector;
PROPULSION_STATS *psPropStats;
SDWORD frame;
SDWORD pieFlag, iPieData;
PIELIGHT brightness;
UDWORD colour;
@ -604,48 +643,7 @@ static void displayCompObj(DROID *psDroid, bool bButton)
if (psShape)
{
pie_Draw3DShape(psShape, 0, colour, brightness, pieFlag, iPieData);
if (psShape->nconnectors)
{
unsigned int connector_num = 0;
// which barrel is firing if model have multiple muzzle connectors?
if (psDroid->asWeaps[i].shotsFired && (psShape->nconnectors > 1))
{
// shoot first, draw later - substract one shot to get correct results
connector_num = (psDroid->asWeaps[i].shotsFired - 1) % (psShape->nconnectors);
}
/* Now we need to move to the end of the firing barrel (there maybe multiple barrels) */
pie_TRANSLATE(psShape->connectors[connector_num].x,
psShape->connectors[connector_num].z,
psShape->connectors[connector_num].y);
//and draw the muzzle flash
psShape = MUZZLE_FLASH_PIE(psDroid, i);
if (psShape && graphicsTime >= psDroid->asWeaps[i].lastFired)
{
//assume no clan colours for muzzle effects
if ((psShape->numFrames == 0) || (psShape->animInterval <= 0))
{
//no anim so display one frame for a fixed time
if (graphicsTime < psDroid->asWeaps[i].lastFired + BASE_MUZZLE_FLASH_DURATION)
{
pie_Draw3DShape(psShape, 0, 0, brightness, pieFlag | pie_ADDITIVE, EFFECT_MUZZLE_ADDITIVE);
}
}
else
{
// animated muzzle
frame = (graphicsTime - psDroid->asWeaps[i].lastFired) / psShape->animInterval;
if (frame < psShape->numFrames)
{
pie_Draw3DShape(psShape, frame, 0, brightness, pieFlag | pie_ADDITIVE, EFFECT_MUZZLE_ADDITIVE);
}
}
}
}
drawMuzzleFlash(psDroid->asWeaps[i], psShape, MUZZLE_FLASH_PIE(psDroid, i), brightness, pieFlag, iPieData);
}
/* Pop Matrix */
pie_MatEnd();

2
src/component.h
View File

@ -68,6 +68,8 @@ void compPersonToBits(DROID *psDroid);
SDWORD rescaleButtonObject(SDWORD radius, SDWORD baseScale,SDWORD baseRadius);
void destroyFXDroid(DROID *psDroid, unsigned impactTime);
void drawMuzzleFlash(WEAPON sWeap, iIMDShape *weaponImd, iIMDShape *flashImd, PIELIGHT buildingBrightness, int pieFlag, int pieFlagData, UBYTE colour = 0);
/* Pass in the stats you're interested in and the COMPONENT - double reference, but works. NOTE: Unused!*/
#define PART_IMD(STATS,DROID,COMPONENT,PLAYER) (STATS[DROID->asBits[COMPONENT]].pIMD)

36
src/display3d.cpp
View File

@ -2377,41 +2377,9 @@ void renderStructure(STRUCTURE *psStructure)
}
}
}
// we have a weapon so we draw a muzzle flash
if( weaponImd[i]->nconnectors && flashImd[i] && psStructure->pStructureType->type != REF_REPAIR_FACILITY)
else // we have a weapon so we draw a muzzle flash
{
unsigned int connector_num = 0;
// which barrel is firing if model have multiple muzzle connectors?
if (psStructure->asWeaps[i].shotsFired && (weaponImd[i]->nconnectors > 1))
{
// shoot first, draw later - substract one shot to get correct results
connector_num = (psStructure->asWeaps[i].shotsFired - 1) % (weaponImd[i]->nconnectors);
}
/* Now we need to move to the end of the firing barrel */
pie_TRANSLATE(weaponImd[i]->connectors[connector_num].x,
weaponImd[i]->connectors[connector_num].z,
weaponImd[i]->connectors[connector_num].y);
// assume no clan colours for muzzle effects
if (flashImd[i]->numFrames == 0 || flashImd[i]->animInterval <= 0)
{
// no anim so display one frame for a fixed time
if (graphicsTime >= psStructure->asWeaps[i].lastFired && graphicsTime < psStructure->asWeaps[i].lastFired + BASE_MUZZLE_FLASH_DURATION)
{
pie_Draw3DShape(flashImd[i], 0, colour, buildingBrightness, pieFlag | pie_ADDITIVE, EFFECT_MUZZLE_ADDITIVE);
}
}
else if (graphicsTime >= psStructure->asWeaps[i].lastFired)
{
// animated muzzle
frame = (graphicsTime - psStructure->asWeaps[i].lastFired)/flashImd[i]->animInterval;
if (frame < flashImd[i]->numFrames)
{
pie_Draw3DShape(flashImd[i], frame, colour, buildingBrightness, pieFlag | pie_ADDITIVE, EFFECT_MUZZLE_ADDITIVE);
}
}
drawMuzzleFlash(psStructure->asWeaps[i], weaponImd[i], flashImd[i], buildingBrightness, pieFlag, pieFlagData, colour);
}
}
pie_MatEnd();