refactor(W3DMPO): Remove W3DMPO class to avoid unnecessary virtual classes

Core/GameEngine/Include/GameClient/Smudge.h

@@ -30,7 +30,7 @@ struct Smudge : public DLNodeClass<Smudge>
 {
 	typedef void *Identifier;
 
-	W3DMPO_GLUE(Smudge)
+	W3DMPO_CODE(Smudge)
 
 	Identifier m_identifier;	//a number or pointer to identify this smudge
 	Vector3 m_pos;	//position of smudge center
@@ -61,10 +61,10 @@ struct SmudgeSet : public DLNodeClass<SmudgeSet>
 {
 	friend class SmudgeManager;
 
-	W3DMPO_GLUE(SmudgeSet)
+	W3DMPO_CODE(SmudgeSet)
 
 	SmudgeSet();
-	virtual ~SmudgeSet() override;
+	~SmudgeSet();
 
 	void reset();
 	void resetDraw();

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

@@ -41,7 +41,7 @@ class WorldHeightMap;
 ***************************************************************************/
 class TerrainTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(TerrainTextureClass)
+	W3DMPO_CODE(TerrainTextureClass)
 protected:
 	virtual void Apply(unsigned int stage) override;
 
@@ -62,7 +62,7 @@ class TerrainTextureClass : public TextureClass
 
 class AlphaTerrainTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(AlphaTerrainTextureClass)
+	W3DMPO_CODE(AlphaTerrainTextureClass)
 protected:
 		virtual void Apply(unsigned int stage) override;
 public:
@@ -78,7 +78,7 @@ class AlphaTerrainTextureClass : public TextureClass
 ***************************************************************************/
 class AlphaEdgeTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(AlphaEdgeTextureClass)
+	W3DMPO_CODE(AlphaEdgeTextureClass)
 protected:
 	virtual void Apply(unsigned int stage) override;
 	int update256(WorldHeightMap *htMap);///< Sets the pixels, and returns the actual height of the texture.
@@ -95,7 +95,7 @@ class AlphaEdgeTextureClass : public TextureClass
 
 class LightMapTerrainTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(LightMapTerrainTextureClass)
+	W3DMPO_CODE(LightMapTerrainTextureClass)
 protected:
 		virtual void Apply(unsigned int stage) override;
 
@@ -108,7 +108,7 @@ class LightMapTerrainTextureClass : public TextureClass
 
 class ScorchTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(ScorchTextureClass)
+	W3DMPO_CODE(ScorchTextureClass)
 protected:
 		virtual void Apply(unsigned int stage) override;
 
@@ -121,7 +121,7 @@ class ScorchTextureClass : public TextureClass
 
 class CloudMapTerrainTextureClass : public TextureClass
 {
-	W3DMPO_GLUE(CloudMapTerrainTextureClass)
+	W3DMPO_CODE(CloudMapTerrainTextureClass)
 protected:
 		virtual void Apply(unsigned int stage) override;
 

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

@@ -44,9 +44,9 @@ class Drawable;
 /**
 This render object handles drawing tracks left by objects moving on the terrain.
 */
-class TerrainTracksRenderObjClass : public W3DMPO, public RenderObjClass
+class TerrainTracksRenderObjClass : public RenderObjClass
 {
-	W3DMPO_GLUE(TerrainTracksRenderObjClass)
+	W3DMPO_CODE(TerrainTracksRenderObjClass)
 
 	friend class TerrainTracksRenderObjClassSystem;
 

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

@@ -153,7 +153,7 @@ class W3DTreeBuffer : public Snapshot
 	//-----------------------------------------------------------------------------
 	class W3DTreeTextureClass : public TextureClass
 	{
-		W3DMPO_GLUE(W3DTreeTextureClass)
+		W3DMPO_CODE(W3DTreeTextureClass)
 	protected:
 		virtual void Apply(unsigned int stage) override;
 

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

@@ -79,9 +79,9 @@ struct BoxRayAPTContextStruct;
 ** is in MeshGeometryClass.  I moved these out into a separate file just to reduce the
 ** size of meshmdl.cpp.
 */
-class AABTreeClass : public W3DMPO, public RefCountClass
+class AABTreeClass : public RefCountClass
 {
-	W3DMPO_GLUE(AABTreeClass)
+	W3DMPO_CODE(AABTreeClass)
 public:
 
 	AABTreeClass();

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

@@ -194,9 +194,9 @@ class AggregateDefClass
 //
 //	AggregatePrototypeClass
 //
-class AggregatePrototypeClass : public W3DMPO, public PrototypeClass
+class AggregatePrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(AggregatePrototypeClass)
+	W3DMPO_CODE(AggregatePrototypeClass)
 	public:
 
 		///////////////////////////////////////////////////////////

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

@@ -117,9 +117,9 @@ class CollectionDefClass
 ** CollectionPrototypeClass this is the render object prototype for
 ** Collections.
 */
-class CollectionPrototypeClass : public W3DMPO, public PrototypeClass
+class CollectionPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(CollectionPrototypeClass)
+	W3DMPO_CODE(CollectionPrototypeClass)
 public:
 	CollectionPrototypeClass(CollectionDefClass * def)		{ ColDef = def; WWASSERT(ColDef); }
 

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

@@ -214,9 +214,9 @@ class DistLODDefClass
 /*
 ** Prototype for Dist-LOD objects
 */
-class DistLODPrototypeClass : public W3DMPO, public PrototypeClass
+class DistLODPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(DistLODPrototypeClass)
+	W3DMPO_CODE(DistLODPrototypeClass)
 public:
 	DistLODPrototypeClass( DistLODDefClass *def ) { Definition = def; }
 

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

@@ -79,18 +79,15 @@ class DLDestroyListClass : public DLListClass<T>
 };
 
 template <class T>
-class DLNodeClass : public W3DMPO
+class DLNodeClass
 {
-	// nope, this is an ABC
-	//W3DMPO_GLUE(DLNodeClass)
-
 	friend DLListClass<T>;
 	DLNodeClass<T>* succ;
 	DLNodeClass<T>* pred;
 	DLListClass<T>* list;
 public:
 	DLNodeClass() : succ(0), pred(0), list(0) {}
-	virtual ~DLNodeClass() override { Remove(); }
+	~DLNodeClass() { Remove(); }
 
 	void Insert_Before(DLNodeClass<T>* n)
 	{

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

@@ -52,7 +52,7 @@ class	IntersectionResultClass;
 */
 class DynamicMeshModel : public MeshGeometryClass
 {
-	W3DMPO_GLUE(DynamicMeshModel)
+	W3DMPO_CODE(DynamicMeshModel)
 
 public:
 

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

@@ -66,9 +66,9 @@ class HRawAnimClass;
 	by the HierarchyModelClass.
 
 */
-class HTreeClass : public W3DMPO
+class HTreeClass
 {
-	W3DMPO_GLUE(HTreeClass)
+	W3DMPO_CODE(HTreeClass)
 public:
 
 	enum
@@ -79,7 +79,7 @@ class HTreeClass : public W3DMPO
 
 	HTreeClass();
 	HTreeClass(const HTreeClass & src);
-	virtual ~HTreeClass() override;
+	~HTreeClass();
 
 	int					Load_W3D(ChunkLoadClass & cload);
 	void					Init_Default();

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

@@ -52,9 +52,9 @@ class RenderInfoClass;
 ** Line3DCLass objects are unlit, therefore only the sihouette needs to be
 ** approximated).
 */
-class Line3DClass : public W3DMPO, public RenderObjClass
+class Line3DClass : public RenderObjClass
 {
-	W3DMPO_GLUE(Line3DClass)
+	W3DMPO_CODE(Line3DClass)
 
 	public:
 

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

@@ -63,9 +63,9 @@ class MeshMatDescClass;
 ** that the mesh is using.
 **
 ***********************************************************************************************/
-class MaterialInfoClass : public W3DMPO, public RefCountClass
+class MaterialInfoClass : public RefCountClass
 {
-	W3DMPO_GLUE(MaterialInfoClass)
+	W3DMPO_CODE(MaterialInfoClass)
 public:
 
 	MaterialInfoClass();

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

@@ -86,9 +86,9 @@ RenderObjClass * PrimitivePrototypeClass::Create()
 }
 
 
-class HModelPrototypeClass : public W3DMPO, public PrototypeClass
+class HModelPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(HModelPrototypeClass)
+	W3DMPO_CODE(HModelPrototypeClass)
 public:
 	HModelPrototypeClass(HModelDefClass * def)				{ HModelDef = def; assert(HModelDef); }
 

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

@@ -102,9 +102,9 @@ class PrototypeClass
 	PrototypeClass & operator = (const PrototypeClass & that);
 };
 
-class PrimitivePrototypeClass : public W3DMPO, public PrototypeClass
+class PrimitivePrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(PrimitivePrototypeClass)
+	W3DMPO_CODE(PrimitivePrototypeClass)
 public:
 	PrimitivePrototypeClass(RenderObjClass * proto);
 

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

@@ -51,9 +51,9 @@ class	SurfaceClass;
 //
 //	Private data structures
 //
-class FontCharsClassCharDataStruct : public W3DMPO
+class FontCharsClassCharDataStruct
 {
-	W3DMPO_GLUE(FontCharsClassCharDataStruct)
+	W3DMPO_CODE(FontCharsClassCharDataStruct)
 public:
 	WCHAR				Value;
 	short				Width;
@@ -62,17 +62,17 @@ class FontCharsClassCharDataStruct : public W3DMPO
 
 enum { CHAR_BUFFER_LEN		= 32768 };
 
-class FontCharsBuffer : public W3DMPO
+class FontCharsBuffer
 {
-	W3DMPO_GLUE(FontCharsBuffer)
+	W3DMPO_CODE(FontCharsBuffer)
 public:
 	uint16			Buffer[CHAR_BUFFER_LEN];
 };
 
 
-class FontCharsClass : public W3DMPO, public RefCountClass
+class FontCharsClass : public RefCountClass
 {
-	W3DMPO_GLUE(FontCharsClass)
+	W3DMPO_CODE(FontCharsClass)
 
 public:
 	FontCharsClass();

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

@@ -324,9 +324,9 @@ class RingLoaderClass : public PrototypeLoaderClass
 /*
 ** Prototype for Ring objects
 */
-class RingPrototypeClass : public W3DMPO, public PrototypeClass
+class RingPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(RingPrototypeClass)
+	W3DMPO_CODE(RingPrototypeClass)
 
 public:
 	RingPrototypeClass ();

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

@@ -222,9 +222,9 @@ class SoundRenderObjDefClass : public RefCountClass
 //	SoundRenderObjPrototypeClass
 //
 ///////////////////////////////////////////////////////////////////////////////////
-class SoundRenderObjPrototypeClass : public W3DMPO, public PrototypeClass
+class SoundRenderObjPrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(SoundRenderObjPrototypeClass)
+	W3DMPO_CODE(SoundRenderObjPrototypeClass)
 public:
 
 	///////////////////////////////////////////////////////////

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

@@ -435,9 +435,9 @@ class SphereLoaderClass : public PrototypeLoaderClass
 /*
 ** Prototype for Sphere objects
 */
-class SpherePrototypeClass : public W3DMPO, public PrototypeClass
+class SpherePrototypeClass : public PrototypeClass
 {
-	W3DMPO_GLUE(SpherePrototypeClass)
+	W3DMPO_CODE(SpherePrototypeClass)
 public:
 	SpherePrototypeClass ();
 	SpherePrototypeClass (SphereRenderObjClass *sphere);

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

@@ -53,9 +53,9 @@ class Vector3;
 ** Hector Yee 2/12/01 - added in fills, blits etc for font3d class
 **
 *************************************************************************/
-class SurfaceClass : public W3DMPO, public RefCountClass
+class SurfaceClass : public RefCountClass
 {
-	W3DMPO_GLUE(SurfaceClass)
+	W3DMPO_CODE(SurfaceClass)
 	public:
 		typedef void *LockedSurfacePtr;
 

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

@@ -263,7 +263,7 @@ class TextureBaseClass : public RefCountClass
 *************************************************************************/
 class TextureClass : public TextureBaseClass
 {
-	W3DMPO_GLUE(TextureClass)
+	W3DMPO_CODE(TextureClass)
 //	friend DX8Wrapper;
 
 public:

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

@@ -83,7 +83,7 @@ class ThumbnailClass
 
 class ThumbnailManagerClass : public DLNodeClass<ThumbnailManagerClass>
 {
-	W3DMPO_GLUE(ThumbnailManagerClass);
+	W3DMPO_CODE(ThumbnailManagerClass);
 
 	friend ThumbnailClass;
 
@@ -96,7 +96,7 @@ class ThumbnailManagerClass : public DLNodeClass<ThumbnailManagerClass>
 	unsigned long DateTime;
 
 	ThumbnailManagerClass(const char* thumbnail_filename);
-	virtual ~ThumbnailManagerClass() override;
+	~ThumbnailManagerClass();
 
 	void Remove_From_Hash(ThumbnailClass* thumb);
 	void Insert_To_Hash(ThumbnailClass* thumb);