refactor(w3dview): migrate W3DViewDoc and GraphicView to RefCountPtr<T>

bobtista · bobtista · commit d2d68a200b07 · 2025-10-30T20:43:06.000-04:00
Replace MEMBER_ADD/MEMBER_RELEASE macros with RefCountPtr&lt;T&gt; and REF_PTR_RELEASE.

- W3DViewDoc: m_pCRenderObj, m_pCAnimation, m_pCursorScene, m_pCursor now RefCountPtr
- GraphicView: m_pCamera and m_pLightMesh now RefCountPtr
- Local variables in Utils, DataTreeView, BoneMgrDialog, etc. use REF_PTR_RELEASE
diff --git a/Core/Tools/W3DView/AdvancedAnimSheet.cpp b/Core/Tools/W3DView/AdvancedAnimSheet.cpp
@@ -77,7 +77,7 @@ CAdvancedAnimSheet::~CAdvancedAnimSheet()
 	{
 		for (int i = 0; i < AnimCount; i++)
 		{
-			MEMBER_RELEASE(Anims[i]);
+			REF_PTR_RELEASE(Anims[i]);
 		}
 		AnimsValid = false;
 		AnimCount = 0;
@@ -162,7 +162,7 @@ void CAdvancedAnimSheet::LoadAnims (void)
 					// Add this Anims pointer to the array.
 					if (AnimCount < MAX_REPORT_ANIMS)
 					{
-						MEMBER_ADD(Anims[AnimCount], pHierarchyAnim);
+						REF_PTR_SET(Anims[AnimCount], pHierarchyAnim);
 						AnimCount++;
 					}
 					else
@@ -176,7 +176,7 @@ void CAdvancedAnimSheet::LoadAnims (void)
 				}
 
 				// Release our hold on this animation.
-				MEMBER_RELEASE(pHierarchyAnim);
+				REF_PTR_RELEASE(pHierarchyAnim);
 			}
 		}
 
diff --git a/Core/Tools/W3DView/BoneMgrDialog.cpp b/Core/Tools/W3DView/BoneMgrDialog.cpp
@@ -222,15 +222,15 @@ BoneMgrDialogClass::Fill_Bone_Item
 
 	// Free our hold on the render objs in the original node list
 	for (index = 0; index < orig_node_list.Count (); index ++) {
-		MEMBER_RELEASE (orig_node_list[index]);
+		REF_PTR_RELEASE (orig_node_list[index]);
 	}
 
 	// Free our hold on the render objs in the node list
 	for (index = 0; index < node_list.Count (); index ++) {
-		MEMBER_RELEASE (node_list[index]);
+		REF_PTR_RELEASE (node_list[index]);
 	}
 
-	MEMBER_RELEASE (porig_model);
+	REF_PTR_RELEASE (porig_model);
 	return ;
 }
 
@@ -405,7 +405,7 @@ void
 BoneMgrDialogClass::OnOK (void)
 {
 	// Simply forget about the backup we made
-	MEMBER_RELEASE (m_pBackupModel);
+	REF_PTR_RELEASE (m_pBackupModel);
 
 	// Update the hierarchy's cached information to reflect the new settings
 	CW3DViewDoc *pdoc = (CW3DViewDoc *)((CMainFrame *)::AfxGetMainWnd())->GetActiveDocument ();
@@ -459,7 +459,7 @@ BoneMgrDialogClass::OnAttachButton (void)
 		if (prender_obj != NULL) {
 			m_pBaseModel->Add_Sub_Object_To_Bone (prender_obj, m_BoneName);
 			m_BoneTree.InsertItem (name, 1, 1, hbone_item);
-			MEMBER_RELEASE (prender_obj);
+			REF_PTR_RELEASE (prender_obj);
 		}
 
 	} else {
@@ -481,7 +481,7 @@ BoneMgrDialogClass::OnAttachButton (void)
 			}
 
 			// Release our hold on this pointer
-			MEMBER_RELEASE (psub_obj);
+			REF_PTR_RELEASE (psub_obj);
 		}
 
 		// Remove the object from our UI
diff --git a/Core/Tools/W3DView/DataTreeView.cpp b/Core/Tools/W3DView/DataTreeView.cpp
@@ -521,7 +521,7 @@ CDataTreeView::LoadAnimationsIntoTree (void)
                 }
 
                 // Release our hold on this animation...
-					 MEMBER_RELEASE (pHierarchyAnim);
+					 REF_PTR_RELEASE (pHierarchyAnim);
             }
         }
 
@@ -583,7 +583,7 @@ CDataTreeView::LoadAnimationsIntoTree (HTREEITEM hItem)
                 }
 
                 // Release our hold on the animation object
-                MEMBER_RELEASE (pHierarchyAnim);
+                REF_PTR_RELEASE (pHierarchyAnim);
             }
         }
 
@@ -1009,7 +1009,7 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)
 						RenderObjClass *prender_obj = Create_Render_Obj_To_Display (hParentItem);
 						pdoc->PlayAnimation (prender_obj,
 						asset_info->Get_Name ());
-						MEMBER_RELEASE (prender_obj);
+						REF_PTR_RELEASE (prender_obj);
 					}
 				}
 				break;
@@ -1019,7 +1019,7 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)
 					// Ask the document to display this object
 					ParticleEmitterClass *emitter = (ParticleEmitterClass *)Create_Render_Obj_To_Display (htree_item);
 					pdoc->Display_Emitter (emitter);
-					MEMBER_RELEASE (emitter);
+					REF_PTR_RELEASE (emitter);
 				}
 				break;
 
@@ -1035,7 +1035,7 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)
 					// Ask the document to display this object
 					RenderObjClass *prender_obj = Create_Render_Obj_To_Display (htree_item);
 					pdoc->DisplayObject (prender_obj);
-					MEMBER_RELEASE (prender_obj);
+					REF_PTR_RELEASE (prender_obj);
 				}
 				break;
 			}
@@ -1478,7 +1478,7 @@ Set_Highest_LOD (RenderObjClass *render_obj)
 			if (sub_obj != NULL) {
 				Set_Highest_LOD (sub_obj);
 			}
-			MEMBER_RELEASE (sub_obj);
+			REF_PTR_RELEASE (sub_obj);
 		}
 
 		//
diff --git a/Core/Tools/W3DView/EditLODDialog.cpp b/Core/Tools/W3DView/EditLODDialog.cpp
@@ -119,7 +119,7 @@ CEditLODDialog::OnInitDialog (void)
             RenderObjClass *pfirst_subobj = pLOD->Get_Sub_Object (0);
 				if (pfirst_subobj != NULL) {
 					m_spinIncrement = pfirst_subobj->Get_Bounding_Sphere ().Radius / 5.0F;
-					MEMBER_RELEASE (pfirst_subobj);
+					REF_PTR_RELEASE (pfirst_subobj);
 				}
 
             // Loop through all the subobjects
@@ -142,7 +142,7 @@ CEditLODDialog::OnInitDialog (void)
                     m_hierarchyListCtrl.SetItemText (iIndex, COL_SWITCH_DN, stringTemp);
 
                     // Free this object
-						  MEMBER_RELEASE (pCSubObject);
+						  REF_PTR_RELEASE (pCSubObject);
                 }
             }
 
diff --git a/Core/Tools/W3DView/GraphicView.cpp b/Core/Tools/W3DView/GraphicView.cpp
@@ -329,8 +329,6 @@ CGraphicView::OnDestroy (void)
 	//
 	// Free the camera object
 	//
-	MEMBER_RELEASE (m_pCamera);
-	MEMBER_RELEASE (m_pLightMesh);
 
 	// Is there an update thread running?
 	if (m_TimerID == 0) {
@@ -388,7 +386,7 @@ Set_Lowest_LOD (RenderObjClass *render_obj)
 			if (psub_obj != NULL) {
 				Set_Lowest_LOD (psub_obj);
 			}
-			MEMBER_RELEASE (psub_obj);
+			REF_PTR_RELEASE (psub_obj);
 		}
 
 		//
diff --git a/Core/Tools/W3DView/GraphicView.h b/Core/Tools/W3DView/GraphicView.h
@@ -41,6 +41,7 @@ class ParticleEmitterClass;
 // CGraphicView view
 
 #include "camera.h"
+#include "ref_ptr.h"
 
 class CGraphicView : public CView
 {
@@ -170,7 +171,7 @@ class CGraphicView : public CView
         void					SetAllowedCameraRotation (CAMERA_ROTATION cameraRotation);
         CAMERA_ROTATION		GetAllowedCameraRotation () const			{ return m_allowedCameraRotation; }
         void					SetCameraPos (CAMERA_POS cameraPos);
-        class CameraClass *GetCamera (void) const							{ return m_pCamera; }
+        class CameraClass *GetCamera (void) const							{ return m_pCamera.Peek(); }
 
 		  float					Get_Camera_Distance (void) const				{ return m_CameraDistance; }
 		  void					Set_Camera_Distance (float dist);
@@ -227,8 +228,8 @@ class CGraphicView : public CView
         BOOL					m_bInitialized;
         BOOL					m_bActive;
         UINT					m_TimerID;
-        CameraClass	*		m_pCamera;
-		  RenderObjClass *	m_pLightMesh;
+        RefCountPtr<CameraClass>	m_pCamera;
+		  RefCountPtr<RenderObjClass>	m_pLightMesh;
 		  bool					m_bLightMeshInScene;
 		  Vector3				m_ObjectCenter;
 		  SphereClass			m_ViewedSphere;
diff --git a/Core/Tools/W3DView/Utils.cpp b/Core/Tools/W3DView/Utils.cpp
@@ -559,7 +559,7 @@ Build_Emitter_List
 
 			// Recursivly add emitters to the list
 			Build_Emitter_List (*psub_obj, list);
-			MEMBER_RELEASE (psub_obj);
+			REF_PTR_RELEASE (psub_obj);
 		}
 	}
 
@@ -586,7 +586,7 @@ Is_Aggregate (const char *asset_name)
 	}
 
 	// Free our hold on the temporary render object
-	MEMBER_RELEASE (prender_obj);
+	REF_PTR_RELEASE (prender_obj);
 
 	// Return the true/false result code
 	return retval;
@@ -649,7 +649,7 @@ Is_Real_LOD (const char *asset_name)
 	}
 
 	// Free our hold on the temporary render object
-	MEMBER_RELEASE (prender_obj);
+	REF_PTR_RELEASE (prender_obj);
 
 	// Return the true/false result code
 	return retval;
diff --git a/Core/Tools/W3DView/W3DViewDoc.cpp b/Core/Tools/W3DView/W3DViewDoc.cpp
diff --git a/Core/Tools/W3DView/W3DViewDoc.h b/Core/Tools/W3DView/W3DViewDoc.h

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ CAdvancedAnimSheet::~CAdvancedAnimSheet()`
`77`	`77`	`{`
`78`	`78`	`for (int i = 0; i < AnimCount; i++)`
`79`	`79`	`{`
`80`		`- MEMBER_RELEASE(Anims[i]);`
	`80`	`+ REF_PTR_RELEASE(Anims[i]);`
`81`	`81`	`}`
`82`	`82`	`AnimsValid = false;`
`83`	`83`	`AnimCount = 0;`
`@@ -162,7 +162,7 @@ void CAdvancedAnimSheet::LoadAnims (void)`
`162`	`162`	`// Add this Anims pointer to the array.`
`163`	`163`	`if (AnimCount < MAX_REPORT_ANIMS)`
`164`	`164`	`{`
`165`		`- MEMBER_ADD(Anims[AnimCount], pHierarchyAnim);`
	`165`	`+ REF_PTR_SET(Anims[AnimCount], pHierarchyAnim);`
`166`	`166`	`AnimCount++;`
`167`	`167`	`}`
`168`	`168`	`else`
`@@ -176,7 +176,7 @@ void CAdvancedAnimSheet::LoadAnims (void)`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`// Release our hold on this animation.`
`179`		`- MEMBER_RELEASE(pHierarchyAnim);`
	`179`	`+ REF_PTR_RELEASE(pHierarchyAnim);`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -222,15 +222,15 @@ BoneMgrDialogClass::Fill_Bone_Item`
`222`	`222`
`223`	`223`	`// Free our hold on the render objs in the original node list`
`224`	`224`	`for (index = 0; index < orig_node_list.Count (); index ++) {`
`225`		`- MEMBER_RELEASE (orig_node_list[index]);`
	`225`	`+ REF_PTR_RELEASE (orig_node_list[index]);`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`// Free our hold on the render objs in the node list`
`229`	`229`	`for (index = 0; index < node_list.Count (); index ++) {`
`230`		`- MEMBER_RELEASE (node_list[index]);`
	`230`	`+ REF_PTR_RELEASE (node_list[index]);`
`231`	`231`	`}`
`232`	`232`
`233`		`- MEMBER_RELEASE (porig_model);`
	`233`	`+ REF_PTR_RELEASE (porig_model);`
`234`	`234`	`return ;`
`235`	`235`	`}`
`236`	`236`
`@@ -405,7 +405,7 @@ void`
`405`	`405`	`BoneMgrDialogClass::OnOK (void)`
`406`	`406`	`{`
`407`	`407`	`// Simply forget about the backup we made`
`408`		`- MEMBER_RELEASE (m_pBackupModel);`
	`408`	`+ REF_PTR_RELEASE (m_pBackupModel);`
`409`	`409`
`410`	`410`	`// Update the hierarchy's cached information to reflect the new settings`
`411`	`411`	`CW3DViewDoc pdoc = (CW3DViewDoc )((CMainFrame *)::AfxGetMainWnd())->GetActiveDocument ();`
`@@ -459,7 +459,7 @@ BoneMgrDialogClass::OnAttachButton (void)`
`459`	`459`	`if (prender_obj != NULL) {`
`460`	`460`	`m_pBaseModel->Add_Sub_Object_To_Bone (prender_obj, m_BoneName);`
`461`	`461`	`m_BoneTree.InsertItem (name, 1, 1, hbone_item);`
`462`		`- MEMBER_RELEASE (prender_obj);`
	`462`	`+ REF_PTR_RELEASE (prender_obj);`
`463`	`463`	`}`
`464`	`464`
`465`	`465`	`} else {`
`@@ -481,7 +481,7 @@ BoneMgrDialogClass::OnAttachButton (void)`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`// Release our hold on this pointer`
`484`		`- MEMBER_RELEASE (psub_obj);`
	`484`	`+ REF_PTR_RELEASE (psub_obj);`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`// Remove the object from our UI`
Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ CDataTreeView::LoadAnimationsIntoTree (void)`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`// Release our hold on this animation...`
`524`		`- MEMBER_RELEASE (pHierarchyAnim);`
	`524`	`+ REF_PTR_RELEASE (pHierarchyAnim);`
`525`	`525`	`}`
`526`	`526`	`}`
`527`	`527`
`@@ -583,7 +583,7 @@ CDataTreeView::LoadAnimationsIntoTree (HTREEITEM hItem)`
`583`	`583`	`}`
`584`	`584`
`585`	`585`	`// Release our hold on the animation object`
`586`		`- MEMBER_RELEASE (pHierarchyAnim);`
	`586`	`+ REF_PTR_RELEASE (pHierarchyAnim);`
`587`	`587`	`}`
`588`	`588`	`}`
`589`	`589`
`@@ -1009,7 +1009,7 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)`
`1009`	`1009`	`RenderObjClass *prender_obj = Create_Render_Obj_To_Display (hParentItem);`
`1010`	`1010`	`pdoc->PlayAnimation (prender_obj,`
`1011`	`1011`	`asset_info->Get_Name ());`
`1012`		`- MEMBER_RELEASE (prender_obj);`
	`1012`	`+ REF_PTR_RELEASE (prender_obj);`
`1013`	`1013`	`}`
`1014`	`1014`	`}`
`1015`	`1015`	`break;`
`@@ -1019,7 +1019,7 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)`
`1019`	`1019`	`// Ask the document to display this object`
`1020`	`1020`	`ParticleEmitterClass emitter = (ParticleEmitterClass )Create_Render_Obj_To_Display (htree_item);`
`1021`	`1021`	`pdoc->Display_Emitter (emitter);`
`1022`		`- MEMBER_RELEASE (emitter);`
	`1022`	`+ REF_PTR_RELEASE (emitter);`
`1023`	`1023`	`}`
`1024`	`1024`	`break;`
`1025`	`1025`
`@@ -1035,7 +1035,7 @@ CDataTreeView::Display_Asset (HTREEITEM htree_item)`
`1035`	`1035`	`// Ask the document to display this object`
`1036`	`1036`	`RenderObjClass *prender_obj = Create_Render_Obj_To_Display (htree_item);`
`1037`	`1037`	`pdoc->DisplayObject (prender_obj);`
`1038`		`- MEMBER_RELEASE (prender_obj);`
	`1038`	`+ REF_PTR_RELEASE (prender_obj);`
`1039`	`1039`	`}`
`1040`	`1040`	`break;`
`1041`	`1041`	`}`
`@@ -1478,7 +1478,7 @@ Set_Highest_LOD (RenderObjClass *render_obj)`
`1478`	`1478`	`if (sub_obj != NULL) {`
`1479`	`1479`	`Set_Highest_LOD (sub_obj);`
`1480`	`1480`	`}`
`1481`		`- MEMBER_RELEASE (sub_obj);`
	`1481`	`+ REF_PTR_RELEASE (sub_obj);`
`1482`	`1482`	`}`
`1483`	`1483`
`1484`	`1484`	`//`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ CEditLODDialog::OnInitDialog (void)`
`119`	`119`	`RenderObjClass *pfirst_subobj = pLOD->Get_Sub_Object (0);`
`120`	`120`	`if (pfirst_subobj != NULL) {`
`121`	`121`	`m_spinIncrement = pfirst_subobj->Get_Bounding_Sphere ().Radius / 5.0F;`
`122`		`- MEMBER_RELEASE (pfirst_subobj);`
	`122`	`+ REF_PTR_RELEASE (pfirst_subobj);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`// Loop through all the subobjects`
`@@ -142,7 +142,7 @@ CEditLODDialog::OnInitDialog (void)`
`142`	`142`	`m_hierarchyListCtrl.SetItemText (iIndex, COL_SWITCH_DN, stringTemp);`
`143`	`143`
`144`	`144`	`// Free this object`
`145`		`- MEMBER_RELEASE (pCSubObject);`
	`145`	`+ REF_PTR_RELEASE (pCSubObject);`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ Build_Emitter_List`
`559`	`559`
`560`	`560`	`// Recursivly add emitters to the list`
`561`	`561`	`Build_Emitter_List (*psub_obj, list);`
`562`		`- MEMBER_RELEASE (psub_obj);`
	`562`	`+ REF_PTR_RELEASE (psub_obj);`
`563`	`563`	`}`
`564`	`564`	`}`
`565`	`565`
`@@ -586,7 +586,7 @@ Is_Aggregate (const char *asset_name)`
`586`	`586`	`}`
`587`	`587`
`588`	`588`	`// Free our hold on the temporary render object`
`589`		`- MEMBER_RELEASE (prender_obj);`
	`589`	`+ REF_PTR_RELEASE (prender_obj);`
`590`	`590`
`591`	`591`	`// Return the true/false result code`
`592`	`592`	`return retval;`
`@@ -649,7 +649,7 @@ Is_Real_LOD (const char *asset_name)`
`649`	`649`	`}`
`650`	`650`
`651`	`651`	`// Free our hold on the temporary render object`
`652`		`- MEMBER_RELEASE (prender_obj);`
	`652`	`+ REF_PTR_RELEASE (prender_obj);`
`653`	`653`
`654`	`654`	`// Return the true/false result code`
`655`	`655`	`return retval;`