Skip to content

Commit a20744f

Browse files
committed
refactor(scene): Clean formatting, comments in W3DScene (#1710)
1 parent 68efcde commit a20744f

File tree

4 files changed

+241
-211
lines changed

4 files changed

+241
-211
lines changed

Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include "WW3D2/rinfo.h"
4444
#include "WW3D2/coltest.h"
4545
#include "WW3D2/lightenvironment.h"
46+
4647
///////////////////////////////////////////////////////////////////////////////
4748
// PROTOTYPES /////////////////////////////////////////////////////////////////
4849
///////////////////////////////////////////////////////////////////////////////
@@ -64,7 +65,7 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
6465
public:
6566

6667
RTS3DScene(); ///< RTSScene constructor
67-
~RTS3DScene(); ///< RTSScene desctructor
68+
~RTS3DScene(); ///< RTSScene destructor
6869

6970
/// ray picking against objects in scene
7071
Bool castRay(RayCollisionTestClass & raytest, Bool testAll, Int collisionType);
@@ -85,13 +86,13 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
8586
void renderSpecificDrawables(RenderInfoClass &rinfo, Int numDrawables, Drawable **theDrawables) ;
8687

8788
/// Lighting methods
88-
void addDynamicLight(W3DDynamicLight * obj);
89-
void removeDynamicLight(W3DDynamicLight * obj);
90-
RefRenderObjListIterator * createLightsIterator(void);
91-
void destroyLightsIterator(RefRenderObjListIterator * it);
92-
RefRenderObjListClass *getDynamicLights(void) {return &m_dynamicLightList;};
89+
void addDynamicLight(W3DDynamicLight * obj);
90+
void removeDynamicLight(W3DDynamicLight * obj);
91+
RefRenderObjListIterator *createLightsIterator(void);
92+
void destroyLightsIterator(RefRenderObjListIterator * it);
93+
RefRenderObjListClass *getDynamicLights(void) {return &m_dynamicLightList;};
9394
W3DDynamicLight *getADynamicLight(void);
94-
void setGlobalLight(LightClass *pLight,Int lightIndex=0);
95+
void setGlobalLight(LightClass *pLight,Int lightIndex=0);
9596
LightEnvironmentClass &getDefaultLightEnv(void) {return m_defaultLightEnv;}
9697

9798
void init() {}
@@ -101,8 +102,8 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
101102
void doRender(CameraClass * cam);
102103

103104
protected:
104-
void renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, Int localPlayerIndex);
105-
void updateFixedLightEnvironments(RenderInfoClass & rinfo);
105+
void renderOneObject(RenderInfoClass &rinfo, RenderObjClass *robj, Int localPlayerIndex);
106+
void updateFixedLightEnvironments(RenderInfoClass & rinfo);
106107
void flushTranslucentObjects(RenderInfoClass & rinfo);
107108
void flushOccludedObjects(RenderInfoClass & rinfo);
108109
void flagOccludedObjects(CameraClass * camera);
@@ -147,7 +148,6 @@ class RTS3DScene : public SimpleSceneClass, public SubsystemInterface
147148
//-----------------------------------------------------------------------------
148149
class RTS2DScene : public SimpleSceneClass, public SubsystemInterface
149150
{
150-
151151
public:
152152

153153
RTS2DScene();
@@ -162,9 +162,9 @@ class RTS2DScene : public SimpleSceneClass, public SubsystemInterface
162162
void doRender(CameraClass * cam);
163163

164164
protected:
165+
165166
RenderObjClass *m_status;
166167
CameraClass *m_camera;
167-
168168
};
169169

170170
//-----------------------------------------------------------------------------
@@ -173,19 +173,14 @@ class RTS2DScene : public SimpleSceneClass, public SubsystemInterface
173173
/** Scene management for 3D interface overlay on top of 3D scene */
174174
//-----------------------------------------------------------------------------
175175
class RTS3DInterfaceScene : public SimpleSceneClass
176-
177176
{
178-
179177
public:
180178

181179
RTS3DInterfaceScene();
182180
~RTS3DInterfaceScene();
183181

184182
/// customizable renderer for the RTS3DInterfaceScene
185183
virtual void Customized_Render( RenderInfoClass &rinfo );
186-
187-
protected:
188-
189184
};
190185

191186
#endif // end __W3DSCENE_H_

0 commit comments

Comments
 (0)