refactor(w3dview): remove unused MEMBER_ADD/MEMBER_RELEASE macros

Remove obsolete macros now replaced by RefCountPtr<T> and core library macros.

- Removed: MEMBER_ADD, MEMBER_RELEASE, SAFE_ADD_REF, SAFE_RELEASE_REF
- Kept: SAFE_DELETE, SAFE_DELETE_ARRAY, COM_RELEASE, SAFE_CLOSE, SANITY_CHECK

Author: bobtista

Core/Tools/W3DView/EmitterInstanceList.cpp

@@ -34,6 +34,7 @@
 #include "StdAfx.h"
 #include "EmitterInstanceList.h"
 #include "refcount.h"
+#include "Utils.h"
 
 /////////////////////////////////////////////////////////////////////
 //

Core/Tools/W3DView/GraphicView.cpp

@@ -71,7 +71,6 @@ IMPLEMENT_DYNCREATE(CGraphicView, CView)
 ////////////////////////////////////////////////////////////////////////////
 CGraphicView::CGraphicView (void)
     : m_bInitialized (FALSE),
-      m_pCamera (NULL),
       m_TimerID (0),
       m_bMouseDown (FALSE),
       m_bRMouseDown (FALSE),
@@ -83,7 +82,6 @@ CGraphicView::CGraphicView (void)
       m_objectRotation (NoRotation),
 		m_LightRotation (NoRotation),
 		m_bLightMeshInScene (false),
-		m_pLightMesh (NULL),
 		m_ParticleCountUpdate (0),
 		m_CameraBonePosX (false),
 		m_UpdateCounter (0),
@@ -216,7 +214,7 @@ CGraphicView::InitializeGraphicView (void)
     if (bReturn && (m_pCamera == NULL))
     {
         // Instantiate a new camera class
-	    m_pCamera = new CameraClass ();
+	    m_pCamera = RefCountPtr<CameraClass>::Create_NoAddRef(new CameraClass ());
         bReturn = (m_pCamera != NULL);
 
         // Were we successful in creating a camera?
@@ -234,7 +232,7 @@ CGraphicView::InitializeGraphicView (void)
 		  //
 		  //	Attach the 'listener' to the camera
 		  //
-		  WWAudioClass::Get_Instance ()->Get_Sound_Scene ()->Attach_Listener_To_Obj (m_pCamera);
+		  WWAudioClass::Get_Instance ()->Get_Sound_Scene ()->Attach_Listener_To_Obj (m_pCamera.Peek());
     }
 
 	Reset_FOV ();
@@ -244,7 +242,7 @@ CGraphicView::InitializeGraphicView (void)
 		ResourceFileClass light_mesh_file (NULL, "Light.w3d");
 		WW3DAssetManager::Get_Instance()->Load_3D_Assets (light_mesh_file);
 
-		m_pLightMesh = WW3DAssetManager::Get_Instance()->Create_Render_Obj ("LIGHT");
+		m_pLightMesh = RefCountPtr<RenderObjClass>::Create_NoAddRef(WW3DAssetManager::Get_Instance()->Create_Render_Obj ("LIGHT"));
 		ASSERT (m_pLightMesh != NULL);
 		m_bLightMeshInScene = false;
 	 }
@@ -531,7 +529,7 @@ CGraphicView::RepaintView
 		// Wait for all previous rendering to complete before starting benchmark.
 		DWORD profile_time = ::Get_CPU_Clock (pt_high);
 
-		WW3D::Render (doc->GetScene (), m_pCamera, FALSE, FALSE);
+		WW3D::Render (doc->GetScene (), m_pCamera.Peek(), FALSE, FALSE);
 
 		// Wait for all rendering to complete before stopping benchmark.
 		DWORD milliseconds = (::Get_CPU_Clock (pt_high) - profile_time) / 1000;
@@ -542,7 +540,7 @@ CGraphicView::RepaintView
 		WW3D::Render (doc->GetCursorScene (), doc->Get2DCamera (), FALSE, FALSE);
 
 		// Render the dazzles
-		doc->Render_Dazzles(m_pCamera);
+		doc->Render_Dazzles(m_pCamera.Peek());
 
 		// Finish out the rendering process
 		WW3D::End_Render ();
@@ -601,7 +599,7 @@ CGraphicView::UpdateDisplay (void)
 
 		// Render the current view inside the frame
         WW3D::Begin_Render (TRUE, TRUE, Vector3 (0.2,0.4,0.6));
-		WW3D::Render (doc->GetScene (), m_pCamera, FALSE, FALSE);
+		WW3D::Render (doc->GetScene (), m_pCamera.Peek(), FALSE, FALSE);
 		WW3D::End_Render ();
     } */
 

Core/Tools/W3DView/GraphicView.h

@@ -201,7 +201,7 @@ class CGraphicView : public CView
 			//
 			//	Misc
 			//
-			RenderObjClass *	Get_Light_Mesh (void) const					{ return m_pLightMesh; }
+			RenderObjClass *	Get_Light_Mesh (void) const					{ return m_pLightMesh.Peek(); }
 			Vector3 &			Get_Object_Center (void)						{ return m_ObjectCenter; }
 
 			//

Core/Tools/W3DView/RingPropertySheet.cpp

@@ -245,9 +245,9 @@ RingPropertySheetClass::Initialize (void)
 	//
 	// Pass the object along to the pages
 	//
-	m_GeneralPage.Set_Ring (m_RenderObj);
-	m_ColorPage.Set_Ring (m_RenderObj);
-	m_ScalePage.Set_Ring (m_RenderObj);
+	m_GeneralPage.Set_Ring (m_RenderObj.Peek());
+	m_ColorPage.Set_Ring (m_RenderObj.Peek());
+	m_ScalePage.Set_Ring (m_RenderObj.Peek());
 
 	//
 	// Add the pages to the sheet
@@ -274,13 +274,13 @@ RingPropertySheetClass::Initialize (void)
 void
 RingPropertySheetClass::Create_New_Object (void)
 {
-	m_RenderObj = new RingRenderObjClass;
+	m_RenderObj = RefCountPtr<RingRenderObjClass>::Create_NoAddRef(new RingRenderObjClass);
 	m_RenderObj->Set_Name ("Ring");
 
 	//
 	//	Display the new object
 	//
-	::GetCurrentDocument ()->DisplayObject (m_RenderObj);
+	::GetCurrentDocument ()->DisplayObject (m_RenderObj.Peek());
 	return ;
 }
 

Core/Tools/W3DView/ScreenCursor.cpp

@@ -98,8 +98,6 @@ ScreenCursorClass::~ScreenCursorClass (void)
 void
 ScreenCursorClass::Initialize (void)
 {
-	m_pVertMaterial = NULL;
-
 	// Create default vertex material
 	m_pVertMaterial = RefCountPtr<VertexMaterialClass>::Create_NoAddRef(NEW_REF( VertexMaterialClass, ()));
 	m_pVertMaterial->Set_Diffuse (1.0F, 1.0F, 1.0F);
@@ -297,9 +295,9 @@ ScreenCursorClass::Render (RenderInfoClass &rinfo)
 	/*
 	** Apply the shader and material
 	*/
-	DX8Wrapper::Set_Material(m_pVertMaterial);
+	DX8Wrapper::Set_Material(m_pVertMaterial.Peek());
 	DX8Wrapper::Set_Shader(ShaderClass::_PresetATestBlend2DShader);
-	DX8Wrapper::Set_Texture(0,m_pTexture);
+	DX8Wrapper::Set_Texture(0,m_pTexture.Peek());
 
 	DX8Wrapper::Set_Vertex_Buffer(vbaccess);
 	DX8Wrapper::Set_Index_Buffer(ibaccess,0);

Core/Tools/W3DView/SpherePropertySheet.cpp

@@ -245,9 +245,9 @@ SpherePropertySheetClass::Initialize (void)
 	//
 	// Pass the object along to the pages
 	//
-	m_GeneralPage.Set_Sphere (m_RenderObj);
-	m_ColorPage.Set_Sphere (m_RenderObj);
-	m_ScalePage.Set_Sphere (m_RenderObj);
+	m_GeneralPage.Set_Sphere (m_RenderObj.Peek());
+	m_ColorPage.Set_Sphere (m_RenderObj.Peek());
+	m_ScalePage.Set_Sphere (m_RenderObj.Peek());
 
 	//
 	// Add the pages to the sheet
@@ -274,13 +274,13 @@ SpherePropertySheetClass::Initialize (void)
 void
 SpherePropertySheetClass::Create_New_Object (void)
 {
-	m_RenderObj = new SphereRenderObjClass;
+	m_RenderObj = RefCountPtr<SphereRenderObjClass>::Create_NoAddRef(new SphereRenderObjClass);
 	m_RenderObj->Set_Name ("Sphere");
 
 	//
 	//	Display the new object
 	//
-	::GetCurrentDocument ()->DisplayObject (m_RenderObj);
+	::GetCurrentDocument ()->DisplayObject (m_RenderObj.Peek());
 	return ;
 }
 

Core/Tools/W3DView/Utils.h

@@ -38,27 +38,6 @@ class RenderObjClass;
 #define SAFE_DELETE(pobject) { delete pobject; pobject = NULL; }
 #define SAFE_DELETE_ARRAY(pobject) { delete [] pobject; pobject = NULL; }
 
-#define SAFE_ADD_REF(pobject)					\
-			if (pobject) {							\
-				pobject->Add_Ref ();				\
-			}											\
-
-#define SAFE_RELEASE_REF(pobject)			\
-			if (pobject) {							\
-				pobject->Release_Ref ();		\
-			}											\
-
-#define MEMBER_RELEASE(pmember)				\
-			SAFE_RELEASE_REF(pmember);			\
-			pmember = NULL;						\
-
-
-#define MEMBER_ADD(pmember, pnew)			\
-			MEMBER_RELEASE (pmember);			\
-			pmember = pnew;						\
-			SAFE_ADD_REF (pmember);				\
-
-
 #define COM_RELEASE(pobject)					\
 			if (pobject) {							\
 				pobject->Release ();				\

Core/Tools/W3DView/W3DViewDoc.cpp

@@ -390,11 +390,11 @@ CW3DViewDoc::InitScene (void)
 		ASSERT (m_pC2DScene);
 
 		// Instantiate a new 2D cursor scene
-		m_pCursorScene = new SimpleSceneClass;
+		m_pCursorScene = RefCountPtr<SceneClass>::Create_NoAddRef(new SimpleSceneClass);
 		ASSERT (m_pCursorScene);
 
 		Create_Cursor ();
-		m_pCursorScene->Add_Render_Object (m_pCursor);
+		m_pCursorScene->Add_Render_Object (m_pCursor.Peek());
 
 
 		m_pCBackObjectScene = new SimpleSceneClass;
@@ -719,17 +719,17 @@ CW3DViewDoc::DisplayObject
             m_pCRenderObj->Set_Transform (Matrix3D (1));
 
             // Add this object to the scene
-				if (m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_BITMAP2D) {
-					m_pC2DScene->Add_Render_Object (m_pCRenderObj);
-				} else {
-					m_pCScene->Clear_Lineup();
-					m_pCScene->Add_Render_Object (m_pCRenderObj);
-				}
+			if (m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_BITMAP2D) {
+				m_pC2DScene->Add_Render_Object (m_pCRenderObj);
+			} else {
+				m_pCScene->Clear_Lineup();
+				m_pCScene->Add_Render_Object (m_pCRenderObj);
+			}
 
 				// Reset the current lod to be the lowest possible LOD...
 				if ((m_pCScene->Are_LODs_Switching ()) &&
 					 (m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_HLOD)) {
-					((HLodClass *)m_pCRenderObj.Peek())->Set_LOD_Level (0);
+					((HLodClass *)m_pCRenderObj)->Set_LOD_Level (0);
 				}
 
             CGraphicView *pCGraphicView = GetGraphicView ();
@@ -825,7 +825,7 @@ CW3DViewDoc::StepAnimation (int iFrameInc)
 
 			m_pCRenderObj->Set_Animation (m_pCAnimCombo);
 		} else {
-			m_pCRenderObj->Set_Animation (m_pCAnimation, m_CurrentFrame);
+			m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), m_CurrentFrame);
 		}
 
 		Update_Camera ();
@@ -873,7 +873,7 @@ CW3DViewDoc::PlayAnimation
         if (m_pCRenderObj)
         {
             // Update the animation frame
-            m_pCRenderObj->Set_Animation (m_pCAnimation, 0);
+            m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), 0);
 
             CGraphicView *pCGraphicView = GetGraphicView ();
             if (pCGraphicView)
@@ -1040,8 +1040,8 @@ CW3DViewDoc::Update_Camera (void)
 	// Should we update the camera's position as well?
 	if (m_bAnimateCamera && m_pCRenderObj != NULL) {
 
-		Matrix3D transform (1);
-		if (Get_Camera_Transform (m_pCRenderObj, transform)) {
+	Matrix3D transform (1);
+	if (Get_Camera_Transform (m_pCRenderObj.Peek(), transform)) {
 
 			// Convert the bone's transform into a camera transform
 			//Matrix3D	transform = m_pCRenderObj->Get_Bone_Transform (index);
@@ -1105,9 +1105,9 @@ CW3DViewDoc::UpdateFrame (float relativeTimeSlice)
 
 			m_pCRenderObj->Set_Animation (m_pCAnimCombo);
 		} else if (m_bAnimBlend) {
-			m_pCRenderObj->Set_Animation (m_pCAnimation, m_CurrentFrame);
+			m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), m_CurrentFrame);
 		} else {
-			m_pCRenderObj->Set_Animation (m_pCAnimation, (int)m_CurrentFrame);
+			m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), (int)m_CurrentFrame);
 		}
 
 		Update_Camera ();
@@ -1866,7 +1866,7 @@ CW3DViewDoc::Remove_Object_From_Scene (RenderObjClass *prender_obj)
 {
 	// If the render object is NULL, then remove the current render object
 	if (prender_obj == NULL) {
-		prender_obj = m_pCRenderObj;
+		prender_obj = m_pCRenderObj.Peek();
 	}
 
 	// Recursively remove objects from the scene (to make sure we get all particle buffers)
@@ -2430,7 +2430,7 @@ CW3DViewDoc::Make_Movie (void)
 			m_pCRenderObj->Set_Animation (m_pCAnimCombo);
 		}
 		else
-			m_pCRenderObj->Set_Animation (m_pCAnimation, (int)0);
+			m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), (int)0);
 		graphic_view->RepaintView (FALSE);
 
 		// Begin our movie
@@ -2452,7 +2452,7 @@ CW3DViewDoc::Make_Movie (void)
 				m_pCRenderObj->Set_Animation (m_pCAnimCombo);
 			}
 			else
-				m_pCRenderObj->Set_Animation (m_pCAnimation, frame);
+				m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), frame);
 
 			// Should we be updating the camera?
 			if (m_bAnimateCamera) {
@@ -2512,7 +2512,7 @@ CW3DViewDoc::Build_Emitter_List
 	// If the render object is NULL, then start from the current render object
 	//
 	if (render_obj == NULL) {
-		render_obj = m_pCRenderObj;
+		render_obj = m_pCRenderObj.Peek();
 	}
 
 	//
@@ -2591,7 +2591,7 @@ void
 CW3DViewDoc::Create_Cursor (void)
 {
 	if (m_pCursor == NULL) {
-		m_pCursor = new ScreenCursorClass;
+		m_pCursor = RefCountPtr<ScreenCursorClass>::Create_NoAddRef(new ScreenCursorClass);
 		m_pCursor->Set_Window (GetGraphicView ()->m_hWnd);
 		m_pCursor->Set_Texture (::Load_RC_Texture ("cursor.tga"));
 	}
@@ -2614,7 +2614,7 @@ CW3DViewDoc::Count_Particles (RenderObjClass *render_obj)
 	// If the render object is NULL, then start from the current render object
 	//
 	if (render_obj == NULL) {
-		render_obj = m_pCRenderObj;
+		render_obj = m_pCRenderObj.Peek();
 	}
 
 	//
@@ -2674,7 +2674,7 @@ CW3DViewDoc::Switch_LOD (int increment, RenderObjClass *render_obj)
 	// If the render object is NULL, then start from the current render object
 	//
 	if (render_obj == NULL) {
-		render_obj = m_pCRenderObj;
+		render_obj = m_pCRenderObj.Peek();
 	}
 
 	//
@@ -2714,7 +2714,7 @@ CW3DViewDoc::Toggle_Alternate_Materials(RenderObjClass * render_obj)
 	// If the render object is NULL, start from the current render object
 	//
 	if (render_obj == NULL) {
-		render_obj = m_pCRenderObj;
+		render_obj = m_pCRenderObj.Peek();
 	}
 
 	if (render_obj != NULL) {

Core/Tools/W3DView/W3DViewDoc.h

@@ -113,7 +113,7 @@ class CW3DViewDoc : public CDocument
 	CameraClass *			Get2DCamera (void) const				{ return m_pC2DCamera; }
 	CameraClass *			GetBackObjectCamera (void) const		{ return m_pCBackObjectCamera; }
 	SceneClass *			Get2DScene (void) const					{ return m_pC2DScene; }
-	SceneClass *			GetCursorScene (void) const			{ return m_pCursorScene; }
+	SceneClass *			GetCursorScene (void) const			{ return m_pCursorScene.Peek(); }
 	ViewerSceneClass *	GetScene (void) const					{ return m_pCScene; }
 	SceneClass *			GetBackObjectScene (void) const		{ return m_pCBackObjectScene; }
 	LightClass *			GetSceneLight (void) const				{ return m_pCSceneLight; }