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/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.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; }