Skip to content

Commit bad267f

Browse files
committed
nit: indentation fixes
1 parent 588a06c commit bad267f

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

Core/Tools/W3DView/AssetInfo.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ class AssetInfoClass
6060
: m_AssetType (TypeUnknown),
6161
m_dwUserData (0L) { Initialize (); }
6262

63-
AssetInfoClass (LPCTSTR passet_name, ASSET_TYPE type, RenderObjClass *prender_obj = NULL, DWORD user_data = 0L)
64-
: m_Name (passet_name),
65-
m_AssetType (type),
66-
m_dwUserData (user_data),
67-
m_pRenderObj (RefCountPtr<RenderObjClass>::Create_AddRef(prender_obj)) { Initialize (); }
63+
AssetInfoClass (LPCTSTR passet_name, ASSET_TYPE type, RenderObjClass *prender_obj = NULL, DWORD user_data = 0L)
64+
: m_Name (passet_name),
65+
m_AssetType (type),
66+
m_dwUserData (user_data),
67+
m_pRenderObj (RefCountPtr<RenderObjClass>::Create_AddRef(prender_obj)) { Initialize (); }
6868

69-
virtual ~AssetInfoClass (void) {}
69+
virtual ~AssetInfoClass (void) {}
7070

7171
//////////////////////////////////////////////////////////////
7272
//
@@ -80,16 +80,16 @@ class AssetInfoClass
8080
const CString & Get_Hierarchy_Name (void) const { return m_HierarchyName; }
8181
const CString & Get_Original_Name (void) const { return m_OriginalName; }
8282
ASSET_TYPE Get_Type (void) const { return m_AssetType; }
83-
DWORD Get_User_Number (void) const { return m_dwUserData; }
84-
const CString & Get_User_String (void) const { return m_UserString; }
85-
RenderObjClass * Get_Render_Obj (void) const { RenderObjClass *ptr = m_pRenderObj.Peek(); if (ptr) ptr->Add_Ref(); return ptr; }
86-
RenderObjClass * Peek_Render_Obj (void) const { return m_pRenderObj.Peek(); }
83+
DWORD Get_User_Number (void) const { return m_dwUserData; }
84+
const CString & Get_User_String (void) const { return m_UserString; }
85+
RenderObjClass * Get_Render_Obj (void) const { RenderObjClass *ptr = m_pRenderObj.Peek(); if (ptr) ptr->Add_Ref(); return ptr; }
86+
RenderObjClass * Peek_Render_Obj (void) const { return m_pRenderObj.Peek(); }
8787
void Set_Name (LPCTSTR pname) { m_Name = pname; }
8888
void Set_Hierarchy_Name (LPCTSTR pname) { m_HierarchyName = pname; }
8989
void Set_Type (ASSET_TYPE type) { m_AssetType = type; }
90-
void Set_User_Number (DWORD user_data) { m_dwUserData = user_data; }
91-
void Set_User_String (LPCTSTR string) { m_UserString = string; }
92-
void Set_Render_Obj (RenderObjClass *pobj) { m_pRenderObj = RefCountPtr<RenderObjClass>::Create_AddRef(pobj); }
90+
void Set_User_Number (DWORD user_data) { m_dwUserData = user_data; }
91+
void Set_User_String (LPCTSTR string) { m_UserString = string; }
92+
void Set_Render_Obj (RenderObjClass *pobj) { m_pRenderObj = RefCountPtr<RenderObjClass>::Create_AddRef(pobj); }
9393

9494
//
9595
// Information methods

Core/Tools/W3DView/RingPropertySheet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ RingPropertySheetClass::Add_Object_To_Viewer (void)
203203
m_LastSavedName = m_RenderObj->Get_Name ();
204204
m_RenderObj = RefCountPtr<RingRenderObjClass>::Create_AddRef((RingRenderObjClass *)doc->GetDisplayedObject ());
205205

206-
//
206+
//
207207
// Pass the object along to the pages
208208
//
209209
m_GeneralPage.Set_Ring (m_RenderObj.Peek());

Core/Tools/W3DView/SpherePropertySheet.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ SpherePropertySheetClass::Add_Object_To_Viewer (void)
198198

199199
//
200200
// Display the object
201-
//
202-
doc->Reload_Displayed_Object ();
203-
m_LastSavedName = m_RenderObj->Get_Name ();
204-
m_RenderObj = RefCountPtr<SphereRenderObjClass>::Create_AddRef((SphereRenderObjClass *)doc->GetDisplayedObject ());
201+
//
202+
doc->Reload_Displayed_Object ();
203+
m_LastSavedName = m_RenderObj->Get_Name ();
204+
m_RenderObj = RefCountPtr<SphereRenderObjClass>::Create_AddRef((SphereRenderObjClass *)doc->GetDisplayedObject ());
205205

206-
//
206+
//
207207
// Pass the object along to the pages
208208
//
209209
m_GeneralPage.Set_Sphere (m_RenderObj.Peek());

Core/Tools/W3DView/W3DViewDoc.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -592,24 +592,24 @@ CW3DViewDoc::Display_Emitter
592592
// Data OK?
593593
if (m_pCScene != NULL) {
594594

595-
// Lose the animation
596-
SAFE_DELETE (m_pCAnimCombo);
597-
m_pCAnimation.Clear();
598-
599-
if (m_pCRenderObj != NULL) {
600-
// Remove this object from the scene
601-
Remove_Object_From_Scene (m_pCRenderObj.Peek());
602-
m_pCRenderObj.Clear();
603-
}
604-
m_pCScene->Clear_Lineup();
595+
// Lose the animation
596+
SAFE_DELETE (m_pCAnimCombo);
597+
m_pCAnimation.Clear();
598+
599+
if (m_pCRenderObj != NULL) {
600+
// Remove this object from the scene
601+
Remove_Object_From_Scene (m_pCRenderObj.Peek());
602+
m_pCRenderObj.Clear();
603+
}
604+
m_pCScene->Clear_Lineup();
605605

606-
// Do we have a new emitter to display?
607-
if (pemitter != NULL) {
606+
// Do we have a new emitter to display?
607+
if (pemitter != NULL) {
608608

609-
// Add the emitter to the scene
610-
pemitter->Set_Transform (Matrix3D (1));
611-
m_pCRenderObj = RefCountPtr<RenderObjClass>::Create_AddRef(pemitter);
612-
m_pCScene->Add_Render_Object (m_pCRenderObj.Peek());
609+
// Add the emitter to the scene
610+
pemitter->Set_Transform (Matrix3D (1));
611+
m_pCRenderObj = RefCountPtr<RenderObjClass>::Create_AddRef(pemitter);
612+
m_pCScene->Add_Render_Object (m_pCRenderObj.Peek());
613613
pemitter->Start ();
614614

615615
CGraphicView *pCGraphicView = GetGraphicView ();
@@ -1032,8 +1032,8 @@ CW3DViewDoc::Update_Camera (void)
10321032
// Should we update the camera's position as well?
10331033
if (m_bAnimateCamera && m_pCRenderObj != NULL) {
10341034

1035-
Matrix3D transform (1);
1036-
if (Get_Camera_Transform (m_pCRenderObj.Peek(), transform)) {
1035+
Matrix3D transform (1);
1036+
if (Get_Camera_Transform (m_pCRenderObj.Peek(), transform)) {
10371037

10381038
// Convert the bone's transform into a camera transform
10391039
//Matrix3D transform = m_pCRenderObj->Get_Bone_Transform (index);

0 commit comments

Comments
 (0)