refactor(w3dview): migrate AssetInfo, ScreenCursor, PlaySoundDialog to RefCountPtr<T>

Replace MEMBER_ADD/MEMBER_RELEASE macros with RefCountPtr<T> smart pointers.

- AssetInfo: m_pRenderObj now RefCountPtr<RenderObjClass>
- ScreenCursor: m_pTexture and m_pVertMaterial now RefCountPtr
- PlaySoundDialog: SoundObj now RefCountPtr<AudibleSoundClass>

Author: bobtista

Core/Tools/W3DView/AssetInfo.cpp

@@ -52,8 +52,8 @@ AssetInfoClass::Initialize (void)
 	if (m_AssetType != TypeMaterial) {
 
 		// Assume we are wrapping an instance as apposed to an asset 'name'.
-		RenderObjClass *prender_obj = m_pRenderObj;
-		SAFE_ADD_REF (prender_obj);
+		RenderObjClass *prender_obj = m_pRenderObj.Peek();
+		if (prender_obj) prender_obj->Add_Ref();
 
 		// If we are wrapping an asset name, then create an instance of it.
 		if (prender_obj == NULL) {
@@ -72,7 +72,7 @@ AssetInfoClass::Initialize (void)
 		}
 
 		// Release our hold on the temporary object
-		MEMBER_RELEASE (prender_obj);
+		REF_PTR_RELEASE (prender_obj);
 	}
 
 	return ;

Core/Tools/W3DView/AssetInfo.h

@@ -37,7 +37,7 @@
 #pragma once
 
 #include "rendobj.h"
-#include "Utils.h"
+#include "ref_ptr.h"
 #include "AssetTypes.h"
 
 
@@ -58,16 +58,15 @@ class AssetInfoClass
 		//
 		AssetInfoClass (void)
 			: m_AssetType (TypeUnknown),
-			  m_dwUserData (0L),
-			  m_pRenderObj (NULL)			{ Initialize (); }
+			  m_dwUserData (0L)			{ Initialize (); }
 
 		AssetInfoClass (LPCTSTR passet_name, ASSET_TYPE type, RenderObjClass *prender_obj = NULL, DWORD user_data = 0L)
 			: m_Name (passet_name),
 			  m_AssetType (type),
 			  m_dwUserData (user_data),
-			  m_pRenderObj (NULL)			{ MEMBER_ADD (m_pRenderObj, prender_obj); Initialize (); }
+			  m_pRenderObj (RefCountPtr<RenderObjClass>::Create_AddRef(prender_obj))			{ Initialize (); }
 
-		virtual ~AssetInfoClass (void)	{ MEMBER_RELEASE (m_pRenderObj); }
+		virtual ~AssetInfoClass (void)	{}
 
 		//////////////////////////////////////////////////////////////
 		//
@@ -83,14 +82,14 @@ class AssetInfoClass
 		ASSET_TYPE			Get_Type (void) const						{ return m_AssetType; }
 		DWORD					Get_User_Number (void) const				{ return m_dwUserData; }
 		const CString &	Get_User_String (void) const				{ return m_UserString; }
-		RenderObjClass *	Get_Render_Obj (void) const				{ SAFE_ADD_REF (m_pRenderObj); return m_pRenderObj; }
-		RenderObjClass *	Peek_Render_Obj (void) const				{ return m_pRenderObj; }
+		RenderObjClass *	Get_Render_Obj (void) const				{ RenderObjClass *ptr = m_pRenderObj.Peek(); if (ptr) ptr->Add_Ref(); return ptr; }
+		RenderObjClass *	Peek_Render_Obj (void) const				{ return m_pRenderObj.Peek(); }
 		void					Set_Name (LPCTSTR pname)					{ m_Name = pname; }
 		void					Set_Hierarchy_Name (LPCTSTR pname)		{ m_HierarchyName = pname; }
 		void					Set_Type (ASSET_TYPE type)					{ m_AssetType = type; }
 		void					Set_User_Number (DWORD user_data)		{ m_dwUserData = user_data; }
 		void					Set_User_String (LPCTSTR string)			{ m_UserString = string; }
-		void					Set_Render_Obj (RenderObjClass *pobj)	{ MEMBER_ADD (m_pRenderObj, pobj); }
+		void					Set_Render_Obj (RenderObjClass *pobj)	{ m_pRenderObj = RefCountPtr<RenderObjClass>::Create_AddRef(pobj); }
 
 		//
 		//	Information methods
@@ -118,5 +117,5 @@ class AssetInfoClass
 		CString				m_OriginalName;
 		ASSET_TYPE			m_AssetType;
 		DWORD					m_dwUserData;
-		RenderObjClass *	m_pRenderObj;
+		RefCountPtr<RenderObjClass>		m_pRenderObj;
 };

Core/Tools/W3DView/PlaySoundDialog.cpp

@@ -39,7 +39,6 @@ static char THIS_FILE[] = __FILE__;
 /////////////////////////////////////////////////////////////////////////////
 PlaySoundDialogClass::PlaySoundDialogClass(LPCTSTR filename, CWnd* pParent /*=NULL*/)
 	:	Filename (filename),
-		SoundObj (NULL),
 		CDialog(PlaySoundDialogClass::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(PlaySoundDialogClass)
@@ -100,7 +99,6 @@ void
 PlaySoundDialogClass::OnCancel (void)
 {
 	SoundObj->Stop ();
-	MEMBER_RELEASE (SoundObj);
 
 	CDialog::OnCancel ();
 	return ;
@@ -125,7 +123,7 @@ PlaySoundDialogClass::OnInitDialog (void)
 	//
 	//	Create the sound effect so we can play it
 	//
-	SoundObj = WWAudioClass::Get_Instance ()->Create_Sound_Effect (Filename);
+	SoundObj = RefCountPtr<AudibleSoundClass>::Create_NoAddRef(WWAudioClass::Get_Instance ()->Create_Sound_Effect (Filename));
 	if (SoundObj == NULL) {
 		CString message;
 		message.Format ("Cannot find sound file: %s!", (LPCTSTR)Filename, MB_OK);

Core/Tools/W3DView/PlaySoundDialog.h

@@ -20,6 +20,7 @@
 
 #include "resource.h"
 #include "WWAudio.h"
+#include "ref_ptr.h"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -61,7 +62,7 @@ class PlaySoundDialogClass : public CDialog
 
 private:
 	CString					Filename;
-	AudibleSoundClass *	SoundObj;
+	RefCountPtr<AudibleSoundClass>	SoundObj;
 };
 
 //{{AFX_INSERT_LOCATION}}

Core/Tools/W3DView/ScreenCursor.cpp

@@ -53,8 +53,6 @@
 ///////////////////////////////////////////////////////////////////
 ScreenCursorClass::ScreenCursorClass (void)
 	:	m_ScreenPos (0, 0),
-		m_pTexture (NULL),
-		m_pVertMaterial (NULL),
 		m_Width (0),
 		m_Height (0),
 		m_hWnd (NULL)
@@ -71,9 +69,7 @@ ScreenCursorClass::ScreenCursorClass (void)
 ///////////////////////////////////////////////////////////////////
 ScreenCursorClass::ScreenCursorClass (const ScreenCursorClass &src)
 	:	m_ScreenPos (0, 0),
-		m_pTexture (NULL),
 		m_hWnd (NULL),
-		m_pVertMaterial (NULL),
 		m_Width (0),
 		m_Height (0),
 		RenderObjClass (src)
@@ -90,8 +86,6 @@ ScreenCursorClass::ScreenCursorClass (const ScreenCursorClass &src)
 ///////////////////////////////////////////////////////////////////
 ScreenCursorClass::~ScreenCursorClass (void)
 {
-	REF_PTR_RELEASE (m_pTexture);
-	REF_PTR_RELEASE (m_pVertMaterial);
 	return ;
 }
 
@@ -104,10 +98,10 @@ ScreenCursorClass::~ScreenCursorClass (void)
 void
 ScreenCursorClass::Initialize (void)
 {
-	REF_PTR_RELEASE(m_pVertMaterial);
+	m_pVertMaterial = NULL;
 
 	// Create default vertex material
-	m_pVertMaterial = NEW_REF( VertexMaterialClass, ());
+	m_pVertMaterial = RefCountPtr<VertexMaterialClass>::Create_NoAddRef(NEW_REF( VertexMaterialClass, ()));
 	m_pVertMaterial->Set_Diffuse (1.0F, 1.0F, 1.0F);
 	m_pVertMaterial->Set_Emissive (0.0F, 0.0F, 0.0F);
 	m_pVertMaterial->Set_Specular (1.0F, 1.0F, 1.0F);
@@ -153,7 +147,7 @@ ScreenCursorClass::Initialize (void)
 void
 ScreenCursorClass::Set_Texture (TextureClass *texture)
 {
-	MEMBER_ADD (m_pTexture, texture);
+	m_pTexture = RefCountPtr<TextureClass>::Create_AddRef(texture);
 
 	// Find the dimensions of the texture:
 	if (m_pTexture != NULL) {

Core/Tools/W3DView/ScreenCursor.h

@@ -35,6 +35,7 @@
 #include "resource.h"
 #include "rendobj.h"
 #include "Vector3i.h"
+#include "ref_ptr.h"
 
 // Forward declarations
 class VertexMaterialClass;
@@ -93,8 +94,8 @@ class ScreenCursorClass : public RenderObjClass
 		////////////////////////////////////////////////////////////////////////
 		HWND						m_hWnd;
 		Vector2					m_ScreenPos;
-		TextureClass *			m_pTexture;
-		VertexMaterialClass *m_pVertMaterial;
+		RefCountPtr<TextureClass>			m_pTexture;
+		RefCountPtr<VertexMaterialClass> m_pVertMaterial;
 
 		Vector3					m_Verticies[4];
 		Vector3					m_Normals[4];