refactor(w3dview): migrate property sheets to RefCountPtr<T>

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

- SpherePropertySheet: m_RenderObj now RefCountPtr<SphereRenderObjClass>
- RingPropertySheet: m_RenderObj now RefCountPtr<RingRenderObjClass>
- EmitterPropertySheet: local emitter variables use REF_PTR_RELEASE
- EmitterInstanceList: use REF_PTR_RELEASE for vector cleanup

Author: bobtista

Core/Tools/W3DView/EmitterInstanceList.cpp

@@ -33,7 +33,7 @@
 
 #include "StdAfx.h"
 #include "EmitterInstanceList.h"
-#include "Utils.h"
+#include "refcount.h"
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -59,7 +59,7 @@ EmitterInstanceListClass::Free_List (void)
 	//	Release our hold on each of the emitter pointers
 	//
 	for (int index = 0; index < m_List.Count (); index ++) {
-		MEMBER_RELEASE (m_List[index]);
+		REF_PTR_RELEASE (m_List[index]);
 	}
 
 	m_List.Delete_All ();
@@ -93,7 +93,7 @@ EmitterInstanceListClass::Add_Emitter (ParticleEmitterClass *emitter)
 		//
 		//	Add this emitter to the list and put a hold on its reference
 		//
-		SAFE_ADD_REF (emitter);
+		if (emitter) emitter->Add_Ref();
 		m_List.Add (emitter);
 	}
 

Core/Tools/W3DView/EmitterPropertySheet.cpp

@@ -501,7 +501,7 @@ EmitterPropertySheetClass::Create_New_Emitter (void)
 	//	Display the new emitter
 	//
 	::GetCurrentDocument ()->Display_Emitter (emitter);
-	MEMBER_RELEASE (emitter);
+	REF_PTR_RELEASE (emitter);
 
 	/*SAFE_DELETE_ARRAY (color.Values);
 	SAFE_DELETE_ARRAY (color.KeyTimes);

Core/Tools/W3DView/RingPropertySheet.cpp

@@ -48,10 +48,9 @@ RingPropertySheetClass::RingPropertySheetClass
 	CWnd *					pParentWnd,
 	UINT						iSelectPage
 )
-	:	m_RenderObj (NULL),
-		CPropertySheet(nIDCaption, pParentWnd, iSelectPage)
+	:	CPropertySheet(nIDCaption, pParentWnd, iSelectPage),
+		m_RenderObj (RefCountPtr<RingRenderObjClass>::Create_AddRef(ring))
 {
-	MEMBER_ADD (m_RenderObj, ring);
 	Initialize ();
 	return ;
 }
@@ -69,10 +68,9 @@ RingPropertySheetClass::RingPropertySheetClass
 	CWnd *						pParentWnd,
 	UINT							iSelectPage
 )
-	:	m_RenderObj (NULL),
-		CPropertySheet(pszCaption, pParentWnd, iSelectPage)
+	:	CPropertySheet(pszCaption, pParentWnd, iSelectPage),
+		m_RenderObj (RefCountPtr<RingRenderObjClass>::Create_AddRef(ring))
 {
-	MEMBER_ADD (m_RenderObj, ring);
 	Initialize ();
 	return ;
 }
@@ -85,7 +83,6 @@ RingPropertySheetClass::RingPropertySheetClass
 /////////////////////////////////////////////////////////////////////////////
 RingPropertySheetClass::~RingPropertySheetClass (void)
 {
-	MEMBER_RELEASE (m_RenderObj);
 	return ;
 }
 
@@ -183,7 +180,7 @@ RingPropertySheetClass::Add_Object_To_Viewer (void)
 		//
 		// Create a new prototype for this object
 		//
-		RingPrototypeClass *prototype	= new RingPrototypeClass (m_RenderObj);
+		RingPrototypeClass *prototype	= new RingPrototypeClass (m_RenderObj.Peek());
 
 		//
 		// Update the asset manager with the new prototype
@@ -204,14 +201,14 @@ RingPropertySheetClass::Add_Object_To_Viewer (void)
 		//
 		doc->Reload_Displayed_Object ();
 		m_LastSavedName = m_RenderObj->Get_Name ();
-		MEMBER_ADD (m_RenderObj, (RingRenderObjClass *)doc->GetDisplayedObject ());
+		m_RenderObj = RefCountPtr<RingRenderObjClass>::Create_AddRef((RingRenderObjClass *)doc->GetDisplayedObject ());
 
 		//
 		// 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());
 	}
 
 	return ;

Core/Tools/W3DView/RingPropertySheet.h

@@ -39,6 +39,7 @@
 #include "RingColorPropPage.h"
 #include "RingGeneralPropPage.h"
 #include "RingSizePropPage.h"
+#include "ref_ptr.h"
 
 
 // Forward declarations
@@ -109,7 +110,7 @@ class RingPropertySheetClass : public CPropertySheet
 	RingGeneralPropPageClass	m_GeneralPage;
 	RingColorPropPageClass		m_ColorPage;
 	RingSizePropPageClass		m_ScalePage;
-	RingRenderObjClass *			m_RenderObj;
+	RefCountPtr<RingRenderObjClass>			m_RenderObj;
 	CString							m_LastSavedName;
 };
 

Core/Tools/W3DView/SpherePropertySheet.cpp

@@ -48,10 +48,9 @@ SpherePropertySheetClass::SpherePropertySheetClass
 	CWnd *						pParentWnd,
 	UINT							iSelectPage
 )
-	:	m_RenderObj (NULL),
-		CPropertySheet(nIDCaption, pParentWnd, iSelectPage)
+	:	CPropertySheet(nIDCaption, pParentWnd, iSelectPage),
+		m_RenderObj (RefCountPtr<SphereRenderObjClass>::Create_AddRef(sphere))
 {
-	MEMBER_ADD (m_RenderObj, sphere);
 	Initialize ();
 	return ;
 }
@@ -69,10 +68,9 @@ SpherePropertySheetClass::SpherePropertySheetClass
 	CWnd *							pParentWnd,
 	UINT								iSelectPage
 )
-	:	m_RenderObj (NULL),
-		CPropertySheet(pszCaption, pParentWnd, iSelectPage)
+	:	CPropertySheet(pszCaption, pParentWnd, iSelectPage),
+		m_RenderObj (RefCountPtr<SphereRenderObjClass>::Create_AddRef(sphere))
 {
-	MEMBER_ADD (m_RenderObj, sphere);
 	Initialize ();
 	return ;
 }
@@ -85,7 +83,6 @@ SpherePropertySheetClass::SpherePropertySheetClass
 /////////////////////////////////////////////////////////////////////////////
 SpherePropertySheetClass::~SpherePropertySheetClass (void)
 {
-	MEMBER_RELEASE (m_RenderObj);
 	return ;
 }
 
@@ -183,7 +180,7 @@ SpherePropertySheetClass::Add_Object_To_Viewer (void)
 		//
 		// Create a new prototype for this object
 		//
-		SpherePrototypeClass *prototype	= new SpherePrototypeClass (m_RenderObj);
+		SpherePrototypeClass *prototype	= new SpherePrototypeClass (m_RenderObj.Peek());
 
 		//
 		// Update the asset manager with the new prototype
@@ -204,14 +201,14 @@ SpherePropertySheetClass::Add_Object_To_Viewer (void)
 		//
 		doc->Reload_Displayed_Object ();
 		m_LastSavedName = m_RenderObj->Get_Name ();
-		MEMBER_ADD (m_RenderObj, (SphereRenderObjClass *)doc->GetDisplayedObject ());
+		m_RenderObj = RefCountPtr<SphereRenderObjClass>::Create_AddRef((SphereRenderObjClass *)doc->GetDisplayedObject ());
 
 		//
 		// 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());
 	}
 
 	return ;

Core/Tools/W3DView/SpherePropertySheet.h

@@ -39,6 +39,7 @@
 #include "SphereColorPropPage.h"
 #include "SphereGeneralPropPage.h"
 #include "SphereSizePropPage.h"
+#include "ref_ptr.h"
 
 
 // Forward declarations
@@ -109,7 +110,7 @@ class SpherePropertySheetClass : public CPropertySheet
 	SphereGeneralPropPageClass		m_GeneralPage;
 	SphereColorPropPageClass		m_ColorPage;
 	SphereSizePropPageClass			m_ScalePage;
-	SphereRenderObjClass *			m_RenderObj;
+	RefCountPtr<SphereRenderObjClass>			m_RenderObj;
 	CString								m_LastSavedName;
 };