Skip to content

Commit dd42096

Browse files
bobtistabobtista
committed
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
1 parent 8399636 commit dd42096

File tree

9 files changed

+50
-68
lines changed

9 files changed

+50
-68
lines changed

‎Core/Tools/W3DView/EmitterInstanceList.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "StdAfx.h"
3535
#include "EmitterInstanceList.h"
3636
#include "refcount.h"
37+
#include "Utils.h"
3738

3839
/////////////////////////////////////////////////////////////////////
3940
//

‎Core/Tools/W3DView/GraphicView.cpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ IMPLEMENT_DYNCREATE(CGraphicView, CView)
7171
////////////////////////////////////////////////////////////////////////////
7272
CGraphicView::CGraphicView (void)
7373
: m_bInitialized (FALSE),
74-
m_pCamera (NULL),
7574
m_TimerID (0),
7675
m_bMouseDown (FALSE),
7776
m_bRMouseDown (FALSE),
@@ -83,7 +82,6 @@ CGraphicView::CGraphicView (void)
8382
m_objectRotation (NoRotation),
8483
m_LightRotation (NoRotation),
8584
m_bLightMeshInScene (false),
86-
m_pLightMesh (NULL),
8785
m_ParticleCountUpdate (0),
8886
m_CameraBonePosX (false),
8987
m_UpdateCounter (0),
@@ -216,7 +214,7 @@ CGraphicView::InitializeGraphicView (void)
216214
if (bReturn && (m_pCamera == NULL))
217215
{
218216
// Instantiate a new camera class
219-
m_pCamera = new CameraClass ();
217+
m_pCamera = RefCountPtr<CameraClass>::Create_NoAddRef(new CameraClass ());
220218
bReturn = (m_pCamera != NULL);
221219

222220
// Were we successful in creating a camera?
@@ -234,7 +232,7 @@ CGraphicView::InitializeGraphicView (void)
234232
//
235233
// Attach the 'listener' to the camera
236234
//
237-
WWAudioClass::Get_Instance ()->Get_Sound_Scene ()->Attach_Listener_To_Obj (m_pCamera);
235+
WWAudioClass::Get_Instance ()->Get_Sound_Scene ()->Attach_Listener_To_Obj (m_pCamera.Peek());
238236
}
239237

240238
Reset_FOV ();
@@ -244,7 +242,7 @@ CGraphicView::InitializeGraphicView (void)
244242
ResourceFileClass light_mesh_file (NULL, "Light.w3d");
245243
WW3DAssetManager::Get_Instance()->Load_3D_Assets (light_mesh_file);
246244

247-
m_pLightMesh = WW3DAssetManager::Get_Instance()->Create_Render_Obj ("LIGHT");
245+
m_pLightMesh = RefCountPtr<RenderObjClass>::Create_NoAddRef(WW3DAssetManager::Get_Instance()->Create_Render_Obj ("LIGHT"));
248246
ASSERT (m_pLightMesh != NULL);
249247
m_bLightMeshInScene = false;
250248
}
@@ -531,7 +529,7 @@ CGraphicView::RepaintView
531529
// Wait for all previous rendering to complete before starting benchmark.
532530
DWORD profile_time = ::Get_CPU_Clock (pt_high);
533531

534-
WW3D::Render (doc->GetScene (), m_pCamera, FALSE, FALSE);
532+
WW3D::Render (doc->GetScene (), m_pCamera.Peek(), FALSE, FALSE);
535533

536534
// Wait for all rendering to complete before stopping benchmark.
537535
DWORD milliseconds = (::Get_CPU_Clock (pt_high) - profile_time) / 1000;
@@ -542,7 +540,7 @@ CGraphicView::RepaintView
542540
WW3D::Render (doc->GetCursorScene (), doc->Get2DCamera (), FALSE, FALSE);
543541

544542
// Render the dazzles
545-
doc->Render_Dazzles(m_pCamera);
543+
doc->Render_Dazzles(m_pCamera.Peek());
546544

547545
// Finish out the rendering process
548546
WW3D::End_Render ();
@@ -601,7 +599,7 @@ CGraphicView::UpdateDisplay (void)
601599
602600
// Render the current view inside the frame
603601
WW3D::Begin_Render (TRUE, TRUE, Vector3 (0.2,0.4,0.6));
604-
WW3D::Render (doc->GetScene (), m_pCamera, FALSE, FALSE);
602+
WW3D::Render (doc->GetScene (), m_pCamera.Peek(), FALSE, FALSE);
605603
WW3D::End_Render ();
606604
} */
607605

‎Core/Tools/W3DView/GraphicView.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class CGraphicView : public CView
201201
//
202202
// Misc
203203
//
204-
RenderObjClass * Get_Light_Mesh (void) const { return m_pLightMesh; }
204+
RenderObjClass * Get_Light_Mesh (void) const { return m_pLightMesh.Peek(); }
205205
Vector3 & Get_Object_Center (void) { return m_ObjectCenter; }
206206

207207
//

‎Core/Tools/W3DView/RingPropertySheet.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,9 @@ RingPropertySheetClass::Initialize (void)
245245
//
246246
// Pass the object along to the pages
247247
//
248-
m_GeneralPage.Set_Ring (m_RenderObj);
249-
m_ColorPage.Set_Ring (m_RenderObj);
250-
m_ScalePage.Set_Ring (m_RenderObj);
248+
m_GeneralPage.Set_Ring (m_RenderObj.Peek());
249+
m_ColorPage.Set_Ring (m_RenderObj.Peek());
250+
m_ScalePage.Set_Ring (m_RenderObj.Peek());
251251

252252
//
253253
// Add the pages to the sheet
@@ -274,13 +274,13 @@ RingPropertySheetClass::Initialize (void)
274274
void
275275
RingPropertySheetClass::Create_New_Object (void)
276276
{
277-
m_RenderObj = new RingRenderObjClass;
277+
m_RenderObj = RefCountPtr<RingRenderObjClass>::Create_NoAddRef(new RingRenderObjClass);
278278
m_RenderObj->Set_Name ("Ring");
279279

280280
//
281281
// Display the new object
282282
//
283-
::GetCurrentDocument ()->DisplayObject (m_RenderObj);
283+
::GetCurrentDocument ()->DisplayObject (m_RenderObj.Peek());
284284
return ;
285285
}
286286

‎Core/Tools/W3DView/ScreenCursor.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ ScreenCursorClass::~ScreenCursorClass (void)
9898
void
9999
ScreenCursorClass::Initialize (void)
100100
{
101-
m_pVertMaterial = NULL;
102-
103101
// Create default vertex material
104102
m_pVertMaterial = RefCountPtr<VertexMaterialClass>::Create_NoAddRef(NEW_REF( VertexMaterialClass, ()));
105103
m_pVertMaterial->Set_Diffuse (1.0F, 1.0F, 1.0F);
@@ -297,9 +295,9 @@ ScreenCursorClass::Render (RenderInfoClass &rinfo)
297295
/*
298296
** Apply the shader and material
299297
*/
300-
DX8Wrapper::Set_Material(m_pVertMaterial);
298+
DX8Wrapper::Set_Material(m_pVertMaterial.Peek());
301299
DX8Wrapper::Set_Shader(ShaderClass::_PresetATestBlend2DShader);
302-
DX8Wrapper::Set_Texture(0,m_pTexture);
300+
DX8Wrapper::Set_Texture(0,m_pTexture.Peek());
303301

304302
DX8Wrapper::Set_Vertex_Buffer(vbaccess);
305303
DX8Wrapper::Set_Index_Buffer(ibaccess,0);

‎Core/Tools/W3DView/SpherePropertySheet.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,9 @@ SpherePropertySheetClass::Initialize (void)
245245
//
246246
// Pass the object along to the pages
247247
//
248-
m_GeneralPage.Set_Sphere (m_RenderObj);
249-
m_ColorPage.Set_Sphere (m_RenderObj);
250-
m_ScalePage.Set_Sphere (m_RenderObj);
248+
m_GeneralPage.Set_Sphere (m_RenderObj.Peek());
249+
m_ColorPage.Set_Sphere (m_RenderObj.Peek());
250+
m_ScalePage.Set_Sphere (m_RenderObj.Peek());
251251

252252
//
253253
// Add the pages to the sheet
@@ -274,13 +274,13 @@ SpherePropertySheetClass::Initialize (void)
274274
void
275275
SpherePropertySheetClass::Create_New_Object (void)
276276
{
277-
m_RenderObj = new SphereRenderObjClass;
277+
m_RenderObj = RefCountPtr<SphereRenderObjClass>::Create_NoAddRef(new SphereRenderObjClass);
278278
m_RenderObj->Set_Name ("Sphere");
279279

280280
//
281281
// Display the new object
282282
//
283-
::GetCurrentDocument ()->DisplayObject (m_RenderObj);
283+
::GetCurrentDocument ()->DisplayObject (m_RenderObj.Peek());
284284
return ;
285285
}
286286

‎Core/Tools/W3DView/Utils.h‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,6 @@ class RenderObjClass;
3838
#define SAFE_DELETE(pobject) { delete pobject; pobject = NULL; }
3939
#define SAFE_DELETE_ARRAY(pobject) { delete [] pobject; pobject = NULL; }
4040

41-
#define SAFE_ADD_REF(pobject) \
42-
if (pobject) { \
43-
pobject->Add_Ref (); \
44-
} \
45-
46-
#define SAFE_RELEASE_REF(pobject) \
47-
if (pobject) { \
48-
pobject->Release_Ref (); \
49-
} \
50-
51-
#define MEMBER_RELEASE(pmember) \
52-
SAFE_RELEASE_REF(pmember); \
53-
pmember = NULL; \
54-
55-
56-
#define MEMBER_ADD(pmember, pnew) \
57-
MEMBER_RELEASE (pmember); \
58-
pmember = pnew; \
59-
SAFE_ADD_REF (pmember); \
60-
61-
6241
#define COM_RELEASE(pobject) \
6342
if (pobject) { \
6443
pobject->Release (); \

‎Core/Tools/W3DView/W3DViewDoc.cpp‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ CW3DViewDoc::CleanupResources (void)
171171
if (m_pCursor != NULL) {
172172
m_pCursor->Remove ();
173173
}
174+
m_pCursorScene = NULL;
174175

175176
if (m_pCScene)
176177
{
@@ -241,6 +242,8 @@ CW3DViewDoc::CleanupResources (void)
241242
{
242243
// Free the currently displayed object
243244
SAFE_DELETE (m_pCAnimCombo);
245+
m_pCAnimation = NULL;
246+
m_pCRenderObj = NULL;
244247
}
245248

246249
return ;
@@ -280,6 +283,8 @@ CW3DViewDoc::OnNewDocument (void)
280283
{
281284
// Free the currently displayed object
282285
SAFE_DELETE (m_pCAnimCombo);
286+
m_pCAnimation = NULL;
287+
m_pCRenderObj = NULL;
283288
}
284289

285290
CDataTreeView *pCDataTreeView = GetDataTreeView ();
@@ -390,11 +395,11 @@ CW3DViewDoc::InitScene (void)
390395
ASSERT (m_pC2DScene);
391396

392397
// Instantiate a new 2D cursor scene
393-
m_pCursorScene = new SimpleSceneClass;
398+
m_pCursorScene = RefCountPtr<SceneClass>::Create_NoAddRef(new SimpleSceneClass);
394399
ASSERT (m_pCursorScene);
395400

396401
Create_Cursor ();
397-
m_pCursorScene->Add_Render_Object (m_pCursor);
402+
m_pCursorScene->Add_Render_Object (m_pCursor.Peek());
398403

399404

400405
m_pCBackObjectScene = new SimpleSceneClass;
@@ -604,6 +609,7 @@ CW3DViewDoc::Display_Emitter
604609

605610
// Lose the animation
606611
SAFE_DELETE (m_pCAnimCombo);
612+
m_pCAnimation = NULL;
607613

608614
if (m_pCRenderObj != NULL) {
609615

@@ -719,17 +725,17 @@ CW3DViewDoc::DisplayObject
719725
m_pCRenderObj->Set_Transform (Matrix3D (1));
720726

721727
// Add this object to the scene
722-
if (m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_BITMAP2D) {
723-
m_pC2DScene->Add_Render_Object (m_pCRenderObj);
724-
} else {
725-
m_pCScene->Clear_Lineup();
726-
m_pCScene->Add_Render_Object (m_pCRenderObj);
727-
}
728+
if (m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_BITMAP2D) {
729+
m_pC2DScene->Add_Render_Object (m_pCRenderObj);
730+
} else {
731+
m_pCScene->Clear_Lineup();
732+
m_pCScene->Add_Render_Object (m_pCRenderObj);
733+
}
728734

729735
// Reset the current lod to be the lowest possible LOD...
730736
if ((m_pCScene->Are_LODs_Switching ()) &&
731737
(m_pCRenderObj->Class_ID () == RenderObjClass::CLASSID_HLOD)) {
732-
((HLodClass *)m_pCRenderObj.Peek())->Set_LOD_Level (0);
738+
((HLodClass *)m_pCRenderObj)->Set_LOD_Level (0);
733739
}
734740

735741
CGraphicView *pCGraphicView = GetGraphicView ();
@@ -825,7 +831,7 @@ CW3DViewDoc::StepAnimation (int iFrameInc)
825831

826832
m_pCRenderObj->Set_Animation (m_pCAnimCombo);
827833
} else {
828-
m_pCRenderObj->Set_Animation (m_pCAnimation, m_CurrentFrame);
834+
m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), m_CurrentFrame);
829835
}
830836

831837
Update_Camera ();
@@ -873,7 +879,7 @@ CW3DViewDoc::PlayAnimation
873879
if (m_pCRenderObj)
874880
{
875881
// Update the animation frame
876-
m_pCRenderObj->Set_Animation (m_pCAnimation, 0);
882+
m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), 0);
877883

878884
CGraphicView *pCGraphicView = GetGraphicView ();
879885
if (pCGraphicView)
@@ -1040,8 +1046,8 @@ CW3DViewDoc::Update_Camera (void)
10401046
// Should we update the camera's position as well?
10411047
if (m_bAnimateCamera && m_pCRenderObj != NULL) {
10421048

1043-
Matrix3D transform (1);
1044-
if (Get_Camera_Transform (m_pCRenderObj, transform)) {
1049+
Matrix3D transform (1);
1050+
if (Get_Camera_Transform (m_pCRenderObj.Peek(), transform)) {
10451051

10461052
// Convert the bone's transform into a camera transform
10471053
//Matrix3D transform = m_pCRenderObj->Get_Bone_Transform (index);
@@ -1105,9 +1111,9 @@ CW3DViewDoc::UpdateFrame (float relativeTimeSlice)
11051111

11061112
m_pCRenderObj->Set_Animation (m_pCAnimCombo);
11071113
} else if (m_bAnimBlend) {
1108-
m_pCRenderObj->Set_Animation (m_pCAnimation, m_CurrentFrame);
1114+
m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), m_CurrentFrame);
11091115
} else {
1110-
m_pCRenderObj->Set_Animation (m_pCAnimation, (int)m_CurrentFrame);
1116+
m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), (int)m_CurrentFrame);
11111117
}
11121118

11131119
Update_Camera ();
@@ -1866,7 +1872,7 @@ CW3DViewDoc::Remove_Object_From_Scene (RenderObjClass *prender_obj)
18661872
{
18671873
// If the render object is NULL, then remove the current render object
18681874
if (prender_obj == NULL) {
1869-
prender_obj = m_pCRenderObj;
1875+
prender_obj = m_pCRenderObj.Peek();
18701876
}
18711877

18721878
// Recursively remove objects from the scene (to make sure we get all particle buffers)
@@ -2430,7 +2436,7 @@ CW3DViewDoc::Make_Movie (void)
24302436
m_pCRenderObj->Set_Animation (m_pCAnimCombo);
24312437
}
24322438
else
2433-
m_pCRenderObj->Set_Animation (m_pCAnimation, (int)0);
2439+
m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), (int)0);
24342440
graphic_view->RepaintView (FALSE);
24352441

24362442
// Begin our movie
@@ -2452,7 +2458,7 @@ CW3DViewDoc::Make_Movie (void)
24522458
m_pCRenderObj->Set_Animation (m_pCAnimCombo);
24532459
}
24542460
else
2455-
m_pCRenderObj->Set_Animation (m_pCAnimation, frame);
2461+
m_pCRenderObj->Set_Animation (m_pCAnimation.Peek(), frame);
24562462

24572463
// Should we be updating the camera?
24582464
if (m_bAnimateCamera) {
@@ -2512,7 +2518,7 @@ CW3DViewDoc::Build_Emitter_List
25122518
// If the render object is NULL, then start from the current render object
25132519
//
25142520
if (render_obj == NULL) {
2515-
render_obj = m_pCRenderObj;
2521+
render_obj = m_pCRenderObj.Peek();
25162522
}
25172523

25182524
//
@@ -2591,7 +2597,7 @@ void
25912597
CW3DViewDoc::Create_Cursor (void)
25922598
{
25932599
if (m_pCursor == NULL) {
2594-
m_pCursor = new ScreenCursorClass;
2600+
m_pCursor = RefCountPtr<ScreenCursorClass>::Create_NoAddRef(new ScreenCursorClass);
25952601
m_pCursor->Set_Window (GetGraphicView ()->m_hWnd);
25962602
m_pCursor->Set_Texture (::Load_RC_Texture ("cursor.tga"));
25972603
}
@@ -2614,7 +2620,7 @@ CW3DViewDoc::Count_Particles (RenderObjClass *render_obj)
26142620
// If the render object is NULL, then start from the current render object
26152621
//
26162622
if (render_obj == NULL) {
2617-
render_obj = m_pCRenderObj;
2623+
render_obj = m_pCRenderObj.Peek();
26182624
}
26192625

26202626
//
@@ -2674,7 +2680,7 @@ CW3DViewDoc::Switch_LOD (int increment, RenderObjClass *render_obj)
26742680
// If the render object is NULL, then start from the current render object
26752681
//
26762682
if (render_obj == NULL) {
2677-
render_obj = m_pCRenderObj;
2683+
render_obj = m_pCRenderObj.Peek();
26782684
}
26792685

26802686
//
@@ -2714,7 +2720,7 @@ CW3DViewDoc::Toggle_Alternate_Materials(RenderObjClass * render_obj)
27142720
// If the render object is NULL, start from the current render object
27152721
//
27162722
if (render_obj == NULL) {
2717-
render_obj = m_pCRenderObj;
2723+
render_obj = m_pCRenderObj.Peek();
27182724
}
27192725

27202726
if (render_obj != NULL) {

‎Core/Tools/W3DView/W3DViewDoc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class CW3DViewDoc : public CDocument
113113
CameraClass * Get2DCamera (void) const { return m_pC2DCamera; }
114114
CameraClass * GetBackObjectCamera (void) const { return m_pCBackObjectCamera; }
115115
SceneClass * Get2DScene (void) const { return m_pC2DScene; }
116-
SceneClass * GetCursorScene (void) const { return m_pCursorScene; }
116+
SceneClass * GetCursorScene (void) const { return m_pCursorScene.Peek(); }
117117
ViewerSceneClass * GetScene (void) const { return m_pCScene; }
118118
SceneClass * GetBackObjectScene (void) const { return m_pCBackObjectScene; }
119119
LightClass * GetSceneLight (void) const { return m_pCSceneLight; }

0 commit comments

Comments
 (0)