ActorEditor: fixed includes and formatted code

OpenXRay · Dec 4, 2015 · 3c91dd5 · 3c91dd5
1 parent 5b9162d
commit 3c91dd5
Show file tree

Hide file tree

Showing 68 changed files with 6,843 additions and 5,312 deletions.
diff --git a/src/editors/ActorEditor/ActorEditor.cpp b/src/editors/ActorEditor/ActorEditor.cpp
@@ -5,7 +5,7 @@
 #include "splash.h"
 #include "UI_ActorMain.h"
 #include "UI_ActorTools.h"
-#include "../ECore/Editor/LogForm.h"
+#include "editors/ECore/Editor/LogForm.h"
 //---------------------------------------------------------------------------
 USEFORM("BonePart.cpp", frmBonePart);
 USEFORM("KeyBar.cpp", frmKeyBar);
@@ -15,74 +15,57 @@ USEFORM("main.cpp", frmMain);
 USEFORM("TopBar.cpp", fraTopBar); /* TFrame: File Type */
 USEFORM("BottomBar.cpp", fraBottomBar); /* TFrame: File Type */
 //---------------------------------------------------------------------------
-WINAPI WinMain(HINSTANCE  hInst, HINSTANCE, LPSTR, int)
+WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR, int)
 {
+    //    try{
+    if (!Application->Handle)
+    {
+        Application->CreateHandle();
+        Application->Icon->Handle = LoadIcon(MainInstance, "MAINICON");
+        Application->Title = "Loading...";
+    }
+    frmSplash = xr_new<TfrmSplash>((TComponent*)0);
+    frmSplash->Show();
+    frmSplash->Repaint();
+    frmSplash->SetStatus("Core initializing...");
 
+    Core._initialize("actor", ELogCallback);
 
+    Application->Initialize();
 
+    frmSplash->SetStatus("Loading...");
 
-//    try{
-        if (!Application->Handle){ 
-            Application->CreateHandle	(); 
-            Application->Icon->Handle 	= LoadIcon(MainInstance, "MAINICON"); 
-			Application->Title 			= "Loading...";
-        } 
-        frmSplash 				= xr_new<TfrmSplash>((TComponent*)0);
-        frmSplash->Show			();
-        frmSplash->Repaint		();
-        frmSplash->SetStatus	("Core initializing...");
+    // startup create
+    Tools = xr_new<CActorTools>();
+    UI = xr_new<CActorMain>();
+    UI->RegisterCommands();
 
-    	Core._initialize		("actor",ELogCallback);
+    Application->Title = UI->EditorDesc();
+    TfrmLog::CreateLog();
 
-        Application->Initialize	();
-                                       
-        frmSplash->SetStatus	("Loading...");
+    Application->CreateForm(__classid(TfrmMain), &frmMain);
+    Application->CreateForm(__classid(TfrmBonePart), &frmBonePart);
+    frmMain->SetHInst(hInst);
 
-// startup create
-        Tools					= xr_new<CActorTools>();
-        UI						= xr_new<CActorMain>();
-        UI->RegisterCommands	();
+    xr_delete(frmSplash);
 
-		Application->Title 		= UI->EditorDesc();
-        TfrmLog::CreateLog		();
+    Application->Run();
 
-		Application->CreateForm(__classid(TfrmMain), &frmMain);
-		Application->CreateForm(__classid(TfrmBonePart), &frmBonePart);
-		frmMain->SetHInst		(hInst);
+    TfrmLog::DestroyLog();
 
-		xr_delete				(frmSplash);
+    UI->ClearCommands();
+    xr_delete(Tools);
+    xr_delete(UI);
 
-		Application->Run		();
-
-        TfrmLog::DestroyLog		(); 
-
-		UI->ClearCommands		();
-        xr_delete				(Tools);
-        xr_delete				(UI);
-
-    	Core._destroy			();
-//    }
-//    catch (Exception &exception)
-//    {
-//           Application->ShowException(&exception);
-//    }
+    Core._destroy();
+    //    }
+    //    catch (Exception &exception)
+    //    {
+    //           Application->ShowException(&exception);
+    //    }
     return 0;
 }
-//---------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+//---------------------------------------------------------------------------