Skip to content

Commit b6a6007

Browse files
authored
refactor: Remove the W3DMPO class to remove clutter and unnecessary vtables (TheSuperHackers#2607)
1 parent 9f0d2fb commit b6a6007

67 files changed

Lines changed: 241 additions & 281 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Core/GameEngine/Include/GameClient/Smudge.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct Smudge : public DLNodeClass<Smudge>
3030
{
3131
typedef void *Identifier;
3232

33-
W3DMPO_GLUE(Smudge)
33+
W3DMPO_CODE(Smudge)
3434

3535
Identifier m_identifier; //a number or pointer to identify this smudge
3636
Vector3 m_pos; //position of smudge center
@@ -61,10 +61,10 @@ struct SmudgeSet : public DLNodeClass<SmudgeSet>
6161
{
6262
friend class SmudgeManager;
6363

64-
W3DMPO_GLUE(SmudgeSet)
64+
W3DMPO_CODE(SmudgeSet)
6565

6666
SmudgeSet();
67-
virtual ~SmudgeSet() override;
67+
~SmudgeSet();
6868

6969
void reset();
7070
void resetDraw();

Core/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class WorldHeightMap;
4141
***************************************************************************/
4242
class TerrainTextureClass : public TextureClass
4343
{
44-
W3DMPO_GLUE(TerrainTextureClass)
44+
W3DMPO_CODE(TerrainTextureClass)
4545
protected:
4646
virtual void Apply(unsigned int stage) override;
4747

@@ -62,7 +62,7 @@ class TerrainTextureClass : public TextureClass
6262

6363
class AlphaTerrainTextureClass : public TextureClass
6464
{
65-
W3DMPO_GLUE(AlphaTerrainTextureClass)
65+
W3DMPO_CODE(AlphaTerrainTextureClass)
6666
protected:
6767
virtual void Apply(unsigned int stage) override;
6868
public:
@@ -78,7 +78,7 @@ class AlphaTerrainTextureClass : public TextureClass
7878
***************************************************************************/
7979
class AlphaEdgeTextureClass : public TextureClass
8080
{
81-
W3DMPO_GLUE(AlphaEdgeTextureClass)
81+
W3DMPO_CODE(AlphaEdgeTextureClass)
8282
protected:
8383
virtual void Apply(unsigned int stage) override;
8484
int update256(WorldHeightMap *htMap);///< Sets the pixels, and returns the actual height of the texture.
@@ -95,7 +95,7 @@ class AlphaEdgeTextureClass : public TextureClass
9595

9696
class LightMapTerrainTextureClass : public TextureClass
9797
{
98-
W3DMPO_GLUE(LightMapTerrainTextureClass)
98+
W3DMPO_CODE(LightMapTerrainTextureClass)
9999
protected:
100100
virtual void Apply(unsigned int stage) override;
101101

@@ -108,7 +108,7 @@ class LightMapTerrainTextureClass : public TextureClass
108108

109109
class ScorchTextureClass : public TextureClass
110110
{
111-
W3DMPO_GLUE(ScorchTextureClass)
111+
W3DMPO_CODE(ScorchTextureClass)
112112
protected:
113113
virtual void Apply(unsigned int stage) override;
114114

@@ -121,7 +121,7 @@ class ScorchTextureClass : public TextureClass
121121

122122
class CloudMapTerrainTextureClass : public TextureClass
123123
{
124-
W3DMPO_GLUE(CloudMapTerrainTextureClass)
124+
W3DMPO_CODE(CloudMapTerrainTextureClass)
125125
protected:
126126
virtual void Apply(unsigned int stage) override;
127127

Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ class Drawable;
4444
/**
4545
This render object handles drawing tracks left by objects moving on the terrain.
4646
*/
47-
class TerrainTracksRenderObjClass : public W3DMPO, public RenderObjClass
47+
class TerrainTracksRenderObjClass : public RenderObjClass
4848
{
49-
W3DMPO_GLUE(TerrainTracksRenderObjClass)
49+
W3DMPO_CODE(TerrainTracksRenderObjClass)
5050

5151
friend class TerrainTracksRenderObjClassSystem;
5252

Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class W3DTreeBuffer : public Snapshot
153153
//-----------------------------------------------------------------------------
154154
class W3DTreeTextureClass : public TextureClass
155155
{
156-
W3DMPO_GLUE(W3DTreeTextureClass)
156+
W3DMPO_CODE(W3DTreeTextureClass)
157157
protected:
158158
virtual void Apply(unsigned int stage) override;
159159

Core/Libraries/Source/WWVegas/WW3D2/aabtree.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ struct BoxRayAPTContextStruct;
7979
** is in MeshGeometryClass. I moved these out into a separate file just to reduce the
8080
** size of meshmdl.cpp.
8181
*/
82-
class AABTreeClass : public W3DMPO, public RefCountClass
82+
class AABTreeClass : public RefCountClass
8383
{
84-
W3DMPO_GLUE(AABTreeClass)
84+
W3DMPO_CODE(AABTreeClass)
8585
public:
8686

8787
AABTreeClass();

Core/Libraries/Source/WWVegas/WW3D2/agg_def.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ class AggregateDefClass
194194
//
195195
// AggregatePrototypeClass
196196
//
197-
class AggregatePrototypeClass : public W3DMPO, public PrototypeClass
197+
class AggregatePrototypeClass : public PrototypeClass
198198
{
199-
W3DMPO_GLUE(AggregatePrototypeClass)
199+
W3DMPO_CODE(AggregatePrototypeClass)
200200
public:
201201

202202
///////////////////////////////////////////////////////////

Core/Libraries/Source/WWVegas/WW3D2/collect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ class CollectionDefClass
117117
** CollectionPrototypeClass this is the render object prototype for
118118
** Collections.
119119
*/
120-
class CollectionPrototypeClass : public W3DMPO, public PrototypeClass
120+
class CollectionPrototypeClass : public PrototypeClass
121121
{
122-
W3DMPO_GLUE(CollectionPrototypeClass)
122+
W3DMPO_CODE(CollectionPrototypeClass)
123123
public:
124124
CollectionPrototypeClass(CollectionDefClass * def) { ColDef = def; WWASSERT(ColDef); }
125125

Core/Libraries/Source/WWVegas/WW3D2/distlod.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ class DistLODDefClass
214214
/*
215215
** Prototype for Dist-LOD objects
216216
*/
217-
class DistLODPrototypeClass : public W3DMPO, public PrototypeClass
217+
class DistLODPrototypeClass : public PrototypeClass
218218
{
219-
W3DMPO_GLUE(DistLODPrototypeClass)
219+
W3DMPO_CODE(DistLODPrototypeClass)
220220
public:
221221
DistLODPrototypeClass( DistLODDefClass *def ) { Definition = def; }
222222

Core/Libraries/Source/WWVegas/WW3D2/dllist.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,15 @@ class DLDestroyListClass : public DLListClass<T>
7979
};
8080

8181
template <class T>
82-
class DLNodeClass : public W3DMPO
82+
class DLNodeClass
8383
{
84-
// nope, this is an ABC
85-
//W3DMPO_GLUE(DLNodeClass)
86-
8784
friend DLListClass<T>;
8885
DLNodeClass<T>* succ;
8986
DLNodeClass<T>* pred;
9087
DLListClass<T>* list;
9188
public:
9289
DLNodeClass() : succ(0), pred(0), list(0) {}
93-
virtual ~DLNodeClass() override { Remove(); }
90+
~DLNodeClass() { Remove(); }
9491

9592
void Insert_Before(DLNodeClass<T>* n)
9693
{

Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class IntersectionResultClass;
5252
*/
5353
class DynamicMeshModel : public MeshGeometryClass
5454
{
55-
W3DMPO_GLUE(DynamicMeshModel)
55+
W3DMPO_CODE(DynamicMeshModel)
5656

5757
public:
5858

0 commit comments

Comments
 (0)