Feature: Porting MFC tools

neo/CMakeLists.txt

@@ -836,6 +836,8 @@ set(src_imgui ${src_imgui}
 	tools/imgui/util/ImGui_IdWidgets.cpp
 	tools/imgui/lighteditor/LightEditor.h
 	tools/imgui/lighteditor/LightEditor.cpp
+	tools/imgui/pdaeditor/PDAEditor.h
+	tools/imgui/pdaeditor/PDAEditor.cpp
 )
 else()
 set(src_imgui sys/sys_imgui.h)

neo/framework/Common.cpp

@@ -993,6 +993,8 @@ void idCommonLocal::InitTool( const toolFlag_t tool, const idDict *dict ) {
 		//ParticleEditorInit( dict );
 	} else if ( tool & EDITOR_AF ) {
 		ImGuiTools::AfEditorInit(); // TODO: dict ?
+	} else if ( tool & EDITOR_PDA ) {
+		ImGuiTools::PDAEditorInit( dict );
 	}
 #endif
 
@@ -1311,7 +1313,7 @@ Com_EditPDAs_f
 ==================
 */
 static void Com_EditPDAs_f( const idCmdArgs &args ) {
-	PDAEditorInit( NULL );
+	ImGuiTools::PDAEditorInit( NULL );
 }
 #endif // ID_ALLOW_TOOLS
 

neo/sys/sys_imgui.cpp

@@ -45,6 +45,8 @@
 extern void Com_DrawDhewm3SettingsMenu(); // in framework/dhewm3SettingsMenu.cpp
 extern void Com_OpenCloseDhewm3SettingsMenu( bool open ); // ditto
 
+extern void PDAEditorRun(); // in tools/pda/DialogPDAEditor.cpp
+
 static idCVar imgui_scale( "imgui_scale", "-1.0", CVAR_SYSTEM|CVAR_FLOAT|CVAR_ARCHIVE, "factor to scale ImGUI menus by (-1: auto)" ); // TODO: limit values?
 
 idCVar imgui_style( "imgui_style", "0", CVAR_SYSTEM|CVAR_INTEGER|CVAR_ARCHIVE, "Which ImGui style to use. 0: Dhewm3 theme, 1: Default ImGui theme, 2: User theme", 0.0f, 2.0f );
@@ -655,6 +657,9 @@ void OpenWindow( D3ImGuiWindow win )
 	switch ( win ) {
 		case D3_ImGuiWin_Settings:
 			Com_OpenCloseDhewm3SettingsMenu( true );
+			break;
+		case D3_ImGuiWin_PDAEditor:
+
 			break;
 		// TODO: other windows that need explicit opening
 	}
@@ -670,6 +675,9 @@ void CloseWindow( D3ImGuiWindow win )
 	switch ( win ) {
 		case D3_ImGuiWin_Settings:
 			Com_OpenCloseDhewm3SettingsMenu( false );
+			break;
+		case D3_ImGuiWin_PDAEditor:
+
 			break;
 		// TODO: other windows that need explicit closing
 	}

neo/sys/sys_imgui.h

@@ -14,9 +14,10 @@ enum D3ImGuiWindow {
 	D3_ImGuiWin_Demo        = 2, // ImGui demo window
 	D3_ImGuiWin_LightEditor = 4, // new ingame Light Editor
 	D3_ImGuiWin_AfEditor    = 8, // new AF Editor
-	// next should be 16, then 32, etc so a bitmask can be used
+	D3_ImGuiWin_PDAEditor	= 16, // new PDA Editor
+	// next should be 32, then 64, etc so a bitmask can be used
 
-	D3_ImGuiWin_AnyEditor = D3_ImGuiWin_LightEditor | D3_ImGuiWin_AfEditor // to decide whether to call DrawToolWindows()
+	D3_ImGuiWin_AnyEditor = D3_ImGuiWin_LightEditor | D3_ImGuiWin_AfEditor | D3_ImGuiWin_PDAEditor // to decide whether to call DrawToolWindows()
 };
 
 #ifndef IMGUI_DISABLE

neo/sys/win32/win_main.cpp

@@ -1310,10 +1310,12 @@ int SDL_main(int argc, char *argv[]) {
 					// in-game Script Editor
 					ScriptEditorRun();
 				}
+				/*
 				if ( com_editors & EDITOR_PDA ) {
 					// in-game PDA Editor
 					PDAEditorRun();
 				}
+				*/
 			}
 		}
 #endif

neo/tools/edit_public.h

@@ -71,6 +71,9 @@ void	LightEditorInit( const idDict* dict );
 
 void	AfEditorInit();
 
+// in-game PDA Editor
+void	PDAEditorInit( const idDict* spawnArgs );
+
 }
 
 

neo/tools/imgui/ImGuiTools.cpp

@@ -39,7 +39,7 @@ If you have questions concerning this license or the applicable additional terms
 
 // TODO #include "afeditor/AfEditor.h"
 #include "lighteditor/LightEditor.h"
-
+#include "pdaeditor/PDAEditor.h"
 
 static bool releaseMouse = false;
 
@@ -135,6 +135,10 @@ void DrawToolWindows()
 	{
 		AfEditor::Instance().Draw();
 	}*/
+	else if ( PDAEditor::Instance().IsShown() )
+	{
+		PDAEditor::Instance().Draw();
+	}
 }
 
 void LightEditorInit( const idDict* dict )
@@ -170,4 +174,13 @@ void AfEditorInit() // TODO: why no passed spawnargs?
 	*/
 }
 
+void PDAEditorInit(const idDict* dict)
+{
+	PDAEditor::Instance().Reset();
+	PDAEditor::Instance().ShowIt( true );
+	impl::SetReleaseToolMouse( true );
+
+	D3::ImGuiHooks::OpenWindow(D3::ImGuiHooks::D3_ImGuiWin_PDAEditor);
+}
+
 } //namespace ImGuiTools