Skip to content

Commit 4461232

Browse files
Caball009Caball009
authored
[GEN][ZH] Fix clang compile errors with enums FilterTypes, FilterModes, BodyDamageType (#1071)
1 parent 68d9f99 commit 4461232

File tree

20 files changed

+120
-112
lines changed

20 files changed

+120
-112
lines changed

‎Generals/Code/GameEngine/Include/GameClient/View.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ class ViewLocation;
4949
class Thing;
5050
class Waypoint;
5151
class LookAtTranslator;
52+
enum FilterTypes CPP_11(: Int);
53+
enum FilterModes CPP_11(: Int);
5254

5355
// ------------------------------------------------------------------------------------------------
5456
// ------------------------------------------------------------------------------------------------
@@ -145,11 +147,11 @@ class View : public Snapshot
145147
virtual void cameraModFinalLookToward(Coord3D *pLoc){} ///< Sets a look at point during camera movement.
146148
virtual void cameraModFinalMoveTo(Coord3D *pLoc){ }; ///< Sets a final move to.
147149

148-
virtual enum FilterModes getViewFilterMode(void) {return (enum FilterModes)0;} ///< Turns on viewport special effect (black & white mode)
149-
virtual enum FilterTypes getViewFilterType(void) {return (enum FilterTypes)0;} ///< Turns on viewport special effect (black & white mode)
150-
virtual Bool setViewFilterMode(enum FilterModes filterMode) { return FALSE; } ///< Turns on viewport special effect (black & white mode)
150+
virtual FilterModes getViewFilterMode(void) {return (FilterModes)0;} ///< Turns on viewport special effect (black & white mode)
151+
virtual FilterTypes getViewFilterType(void) {return (FilterTypes)0;} ///< Turns on viewport special effect (black & white mode)
152+
virtual Bool setViewFilterMode(FilterModes filterMode) { return FALSE; } ///< Turns on viewport special effect (black & white mode)
151153
virtual void setViewFilterPos(const Coord3D *pos) { }; ///< Passes a position to the special effect filter.
152-
virtual Bool setViewFilter( enum FilterTypes filter) { return FALSE;} ///< Turns on viewport special effect (black & white mode)
154+
virtual Bool setViewFilter( FilterTypes filter) { return FALSE;} ///< Turns on viewport special effect (black & white mode)
153155

154156
virtual void setFadeParameters(Int fadeFrames, Int direction) { };
155157
virtual void set3DWireFrameMode(Bool enable) { };

‎Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1958,7 +1958,7 @@ void AIPlayer::repairStructure(ObjectID structure)
19581958
if (structureObj==NULL) return;
19591959
if (structureObj->getBodyModule()==NULL) return;
19601960
// If the structure is not noticably damaged, don't bother.
1961-
enum BodyDamageType structureState = structureObj->getBodyModule()->getDamageState();
1961+
BodyDamageType structureState = structureObj->getBodyModule()->getDamageState();
19621962
if (structureState==BODY_PRISTINE) {
19631963
return;
19641964
}
@@ -2017,7 +2017,7 @@ void AIPlayer::updateBridgeRepair(void)
20172017
// Got a bridge to repair.
20182018
Object *dozer = NULL;
20192019
Coord3D bridgePos = *bridgeObj->getPosition();
2020-
enum BodyDamageType bridgeState = bridgeObj->getBodyModule()->getDamageState();
2020+
BodyDamageType bridgeState = bridgeObj->getBodyModule()->getDamageState();
20212021
if (m_repairDozer==INVALID_ID) {
20222022
m_dozerIsRepairing = false;
20232023
// Need a dozer.

‎Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -881,8 +881,8 @@ void Bridge::updateDamageState( void )
881881
if (bridge) {
882882
// get object damage state
883883
{
884-
enum BodyDamageType damageState = bridge->getBodyModule()->getDamageState();
885-
enum BodyDamageType curState = m_bridgeInfo.curDamageState;
884+
BodyDamageType damageState = bridge->getBodyModule()->getDamageState();
885+
BodyDamageType curState = m_bridgeInfo.curDamageState;
886886
if (damageState != curState) {
887887
m_bridgeInfo.curDamageState = damageState;
888888
if (damageState == BODY_RUBBLE) {

‎Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,7 +2874,7 @@ void ScriptActions::doCameraMotionBlur(Bool zoomIn, Bool saturate)
28742874
{
28752875
if (TheTacticalView->setViewFilter(FT_VIEW_MOTION_BLUR_FILTER))
28762876
{
2877-
enum FilterModes mode;
2877+
FilterModes mode;
28782878
if (saturate) {
28792879
if (zoomIn) {
28802880
mode = FM_VIEW_MB_IN_SATURATE;
@@ -6429,7 +6429,7 @@ void ScriptActions::executeAction( ScriptAction *pAction )
64296429
doCameraMotionBlurJump(pAction->getParameter(0)->getString(), pAction->getParameter(1)->getInt());
64306430
return;
64316431
case ScriptAction::CAMERA_MOTION_BLUR_FOLLOW:
6432-
TheTacticalView->setViewFilterMode((enum FilterModes)(FM_VIEW_MB_PAN_ALPHA+pAction->getParameter(0)->getInt()));
6432+
TheTacticalView->setViewFilterMode((FilterModes)(FM_VIEW_MB_PAN_ALPHA+pAction->getParameter(0)->getInt()));
64336433
TheTacticalView->setViewFilter(FT_VIEW_MOTION_BLUR_FILTER);
64346434
return;
64356435
case ScriptAction::CAMERA_MOTION_BLUR_END_FOLLOW:

‎Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class MeshClass;
6969
class W3DTerrainLogic;
7070
class W3DAssetManager;
7171
class SimpleSceneClass;
72+
enum BodyDamageType CPP_11(: Int);
7273

7374
//-----------------------------------------------------------------------------
7475
// Type Defines
@@ -111,7 +112,7 @@ class W3DBridge
111112
Int m_numPolygons; ///< Number of polygons to draw.
112113
Bool m_visible;
113114
AsciiString m_templateName; ///< Name of the bridge type.
114-
enum BodyDamageType m_curDamageState;
115+
BodyDamageType m_curDamageState;
115116
Bool m_enabled;
116117

117118
protected:
@@ -130,9 +131,9 @@ class W3DBridge
130131
AsciiString getTemplateName(void) {return m_templateName;}
131132
const Vector3* getStart(void) const {return &m_start;}
132133
const Vector3* getEnd(void) const { return &m_end;}
133-
Bool load(enum BodyDamageType curDamageState);
134-
enum BodyDamageType getDamageState(void) {return m_curDamageState;};
135-
void setDamageState(enum BodyDamageType state) { m_curDamageState = state;};
134+
Bool load(BodyDamageType curDamageState);
135+
BodyDamageType getDamageState(void) {return m_curDamageState;};
136+
void setDamageState(BodyDamageType state) { m_curDamageState = state;};
136137
void getIndicesNVertices(UnsignedShort *destination_ib, VertexFormatXYZNDUV1 *destination_vb, Int *curIndexP, Int *curVertexP, RefRenderObjListIterator *pLightsIterator);
137138
Bool cullBridge(CameraClass * camera); ///< Culls the bridges. Returns true if visibility changed.
138139
void clearBridge(void); ///< Frees all objects associated with a bridge.

‎Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
#include "WW3D2/texture.h"
4040
enum FilterTypes CPP_11(: Int);
41+
enum FilterModes CPP_11(: Int);
4142
enum CustomScenePassModes CPP_11(: Int);
4243
enum StaticGameLODLevel CPP_11(: Int);
4344
enum ChipsetType CPP_11(: Int);
@@ -93,8 +94,8 @@ class W3DShaderManager
9394

9495
// Filter methods
9596
static Bool filterPreRender(FilterTypes filter, Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render. Only applies to screen filter shaders.
96-
static Bool filterPostRender(FilterTypes filter, enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender); ///< Called after render. Only applies to screen filter shaders.
97-
static Bool filterSetup(FilterTypes filter, enum FilterModes mode);
97+
static Bool filterPostRender(FilterTypes filter, FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender); ///< Called after render. Only applies to screen filter shaders.
98+
static Bool filterSetup(FilterTypes filter, FilterModes mode);
9899

99100
// Support routines for filter methods.
100101
static Bool canRenderToTexture(void) { return (m_oldRenderSurface && m_newRenderSurface);}
@@ -127,10 +128,10 @@ class W3DFilterInterface
127128
virtual Int init(void) = 0; ///<perform any one time initialization and validation
128129
virtual Int shutdown(void) { return TRUE;}; ///<release resources used by shader
129130
virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode) {skipRender=false; return false;} ///< Set up at start of render. Only applies to screen filter shaders.
130-
virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender){return false;} ///< Called after render. Only applies to screen filter shaders.
131-
virtual Bool setup(enum FilterModes mode){return false;} ///< Called when the filter is started, one time before the first prerender.
131+
virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender){return false;} ///< Called after render. Only applies to screen filter shaders.
132+
virtual Bool setup(FilterModes mode){return false;} ///< Called when the filter is started, one time before the first prerender.
132133
protected:
133-
virtual Int set(enum FilterModes mode) = 0; ///<setup shader for the specified rendering pass.
134+
virtual Int set(FilterModes mode) = 0; ///<setup shader for the specified rendering pass.
134135
///do any custom resetting necessary to bring W3D in sync.
135136
virtual void reset(void) = 0;
136137
};
@@ -141,13 +142,13 @@ class W3DFilterInterface
141142
class ScreenMotionBlurFilter : public W3DFilterInterface
142143
{
143144
public:
144-
virtual Int set(enum FilterModes mode); ///<setup shader for the specified rendering pass.
145+
virtual Int set(FilterModes mode); ///<setup shader for the specified rendering pass.
145146
virtual Int init(void); ///<perform any one time initialization and validation
146147
virtual void reset(void); ///<do any custom resetting necessary to bring W3D in sync.
147148
virtual Int shutdown(void); ///<release resources used by shader
148149
virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render. Only applies to screen filter shaders.
149-
virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender); ///< Called after render. Only applies to screen filter shaders.
150-
virtual Bool setup(enum FilterModes mode); ///< Called when the filter is started, one time before the first prerender.
150+
virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta, Bool &doExtraRender); ///< Called after render. Only applies to screen filter shaders.
151+
virtual Bool setup(FilterModes mode); ///< Called when the filter is started, one time before the first prerender.
151152
ScreenMotionBlurFilter();
152153

153154
static void setZoomToPos(const Coord3D *pos) {m_zoomToPos = *pos; m_zoomToValid = true;}
@@ -180,16 +181,16 @@ class ScreenBWFilter : public W3DFilterInterface
180181
virtual Int init(void); ///<perform any one time initialization and validation
181182
virtual Int shutdown(void); ///<release resources used by shader
182183
virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render. Only applies to screen filter shaders.
183-
virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render. Only applies to screen filter shaders.
184-
virtual Bool setup(enum FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
184+
virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render. Only applies to screen filter shaders.
185+
virtual Bool setup(FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
185186
static void setFadeParameters(Int fadeFrames, Int direction)
186187
{
187188
m_curFadeFrame = 0;
188189
m_fadeFrames = fadeFrames;
189190
m_fadeDirection = direction;
190191
}
191192
protected:
192-
virtual Int set(enum FilterModes mode); ///<setup shader for the specified rendering pass.
193+
virtual Int set(FilterModes mode); ///<setup shader for the specified rendering pass.
193194
virtual void reset(void); ///<do any custom resetting necessary to bring W3D in sync.
194195
static Int m_fadeFrames;
195196
static Int m_fadeDirection;
@@ -203,10 +204,10 @@ class ScreenBWFilterDOT3 : public ScreenBWFilter
203204
virtual Int init(void); ///<perform any one time initialization and validation
204205
virtual Int shutdown(void); ///<release resources used by shader
205206
virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render. Only applies to screen filter shaders.
206-
virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render. Only applies to screen filter shaders.
207-
virtual Bool setup(enum FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
207+
virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render. Only applies to screen filter shaders.
208+
virtual Bool setup(FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
208209
protected:
209-
virtual Int set(enum FilterModes mode); ///<setup shader for the specified rendering pass.
210+
virtual Int set(FilterModes mode); ///<setup shader for the specified rendering pass.
210211
virtual void reset(void); ///<do any custom resetting necessary to bring W3D in sync.
211212
};
212213

@@ -218,8 +219,8 @@ class ScreenCrossFadeFilter : public W3DFilterInterface
218219
virtual Int init(void); ///<perform any one time initialization and validation
219220
virtual Int shutdown(void); ///<release resources used by shader
220221
virtual Bool preRender(Bool &skipRender, CustomScenePassModes &scenePassMode); ///< Set up at start of render. Only applies to screen filter shaders.
221-
virtual Bool postRender(enum FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render. Only applies to screen filter shaders.
222-
virtual Bool setup(enum FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
222+
virtual Bool postRender(FilterModes mode, Coord2D &scrollDelta,Bool &doExtraRender); ///< Called after render. Only applies to screen filter shaders.
223+
virtual Bool setup(FilterModes mode){return true;} ///< Called when the filter is started, one time before the first prerender.
223224
static void setFadeParameters(Int fadeFrames, Int direction)
224225
{
225226
m_curFadeFrame = 0;
@@ -229,7 +230,7 @@ class ScreenCrossFadeFilter : public W3DFilterInterface
229230
static Real getCurrentFadeValue(void) { return m_curFadeValue;}
230231
static TextureClass *getCurrentMaskTexture(void) { return m_fadePatternTexture;}
231232
protected:
232-
virtual Int set(enum FilterModes mode); ///<setup shader for the specified rendering pass.
233+
virtual Int set(FilterModes mode); ///<setup shader for the specified rendering pass.
233234
virtual void reset(void); ///<do any custom resetting necessary to bring W3D in sync.
234235
Bool updateFadeLevel(void); ///<updated current state of fade and return true if not finished.
235236
static Int m_fadeFrames;

‎Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,11 @@ class W3DView : public View, public SubsystemInterface
203203

204204
virtual Real getFXPitch( void ) const { return m_FXPitch; } ///< returns the FX pitch angle
205205

206-
virtual Bool setViewFilterMode(enum FilterModes filterMode); ///< Turns on viewport special effect (black & white mode)
207-
virtual Bool setViewFilter(enum FilterTypes filter); ///< Turns on viewport special effect (black & white mode)
206+
virtual Bool setViewFilterMode(FilterModes filterMode); ///< Turns on viewport special effect (black & white mode)
207+
virtual Bool setViewFilter(FilterTypes filter); ///< Turns on viewport special effect (black & white mode)
208208
virtual void setViewFilterPos(const Coord3D *pos); ///< Passes a position to the special effect filter.
209-
virtual enum FilterModes getViewFilterMode(void) {return m_viewFilterMode;} ///< Turns on viewport special effect (black & white mode)
210-
virtual enum FilterTypes getViewFilterType(void) {return m_viewFilter;} ///< Turns on viewport special effect (black & white mode)
209+
virtual FilterModes getViewFilterMode(void) {return m_viewFilterMode;} ///< Turns on viewport special effect (black & white mode)
210+
virtual FilterTypes getViewFilterType(void) {return m_viewFilter;} ///< Turns on viewport special effect (black & white mode)
211211
virtual void setFadeParameters(Int fadeFrames, Int direction);
212212
virtual void set3DWireFrameMode(Bool enable); ///<enables custom wireframe rendering of 3D viewport
213213

@@ -221,8 +221,8 @@ class W3DView : public View, public SubsystemInterface
221221

222222
CameraClass *m_3DCamera; ///< camera representation for 3D scene
223223
CameraClass *m_2DCamera; ///< camera for UI overlayed on top of 3D scene
224-
enum FilterModes m_viewFilterMode;
225-
enum FilterTypes m_viewFilter;
224+
FilterModes m_viewFilterMode;
225+
FilterTypes m_viewFilter;
226226
Bool m_isWireFrameEnabled;
227227
Bool m_nextWireFrameEnabled; ///< used to delay wireframe changes by 1 frame (needed for transitions).
228228

‎Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ void W3DBridge::init(Vector3 fromLoc, Vector3 toLoc, AsciiString bridgeTemplateN
194194
/** Loads a bridge model(if not already loaded) and gets meshes for use at
195195
specified location. */
196196
//=============================================================================
197-
Bool W3DBridge::load(enum BodyDamageType curDamageState)
197+
Bool W3DBridge::load(BodyDamageType curDamageState)
198198
{
199199
REF_PTR_RELEASE(m_bridgeTexture);
200200
REF_PTR_RELEASE(m_leftMesh);
@@ -1128,7 +1128,7 @@ void W3DBridgeBuffer::drawBridges(CameraClass * camera, Bool wireframe, TextureC
11281128
m_bridges[info.bridgeIndex].setEnabled(true);
11291129
if (m_bridges[info.bridgeIndex].getDamageState() != info.curDamageState) {
11301130
changed = true;
1131-
enum BodyDamageType curState = m_bridges[info.bridgeIndex].getDamageState();
1131+
BodyDamageType curState = m_bridges[info.bridgeIndex].getDamageState();
11321132
m_bridges[info.bridgeIndex].setDamageState(info.curDamageState);
11331133
if (!m_bridges[info.bridgeIndex].load(info.curDamageState)) {
11341134
// put the old model back.

0 commit comments

Comments
 (0)