Added Sound Editor IMGUI

Author: FriskTheFallenHuman

neo/CMakeLists.txt

@@ -870,6 +870,8 @@ if(IMGUI)
 		tools/imgui/util/SyntaxRichEditCtrl.cpp
 		tools/imgui/util/TreeCtrl.h
 		tools/imgui/util/TreeCtrl.cpp
+		tools/imgui/util/PathTreeCtrl.h
+		tools/imgui/util/PathTreeCtrl.cpp
 		tools/imgui/util/RegistryOptions.h
 		tools/imgui/util/RegistryOptions.cpp
 
@@ -884,15 +886,15 @@ if(IMGUI)
 
 		tools/imgui/lighteditor/LightEditor.h
 		tools/imgui/lighteditor/LightEditor.cpp
+		tools/imgui/soundeditor/SoundEditor.h
+		tools/imgui/soundeditor/SoundEditor.cpp
 		#tools/imgui/pdaeditor/PDAEditor.h
 		#tools/imgui/pdaeditor/PDAEditor.cpp
 		tools/imgui/particleeditor/ParticleEditor.h
 		tools/imgui/particleeditor/ParticleEditor.cpp
 		tools/imgui/scripteditor/ScriptEditor.h
 		tools/imgui/scripteditor/ScriptEditor.cpp
 
-		tools/imgui/decleditor/PathTreeCtrl.h
-		tools/imgui/decleditor/PathTreeCtrl.cpp
 		tools/imgui/decleditor/DeclBrowser.h
 		tools/imgui/decleditor/DeclBrowser.cpp
 		tools/imgui/decleditor/DeclEditor.h
@@ -1183,27 +1185,15 @@ if (TOOLS AND MFC_TOOLS AND MSVC)
 	file(GLOB src_compiler_roqvq	  "tools/compilers/roqvq/*.cpp") # FIXME: some of those were added before
 	add_globbed_headers(src_compiler_roqvq "tools/compilers/roqvq")
 	#tools
-	# Articulated Frame editor.
-	file(GLOB src_afeditor "tools/af/*.cpp")
-	add_globbed_headers(src_afeditor "tools/af")
-	# Declaration editor
-	file(GLOB src_decleditor "tools/decl/*.cpp")
-	add_globbed_headers(src_decleditor "tools/decl")
 	# GUI Editor.
 	file(GLOB src_gui_editor "tools/guied/*.cpp")
 	add_globbed_headers(src_gui_editor "tools/guied")
 	# Material editor
 	file(GLOB src_materialeditor "tools/materialeditor/*.cpp")
 	add_globbed_headers(src_materialeditor "tools/materialeditor")
-	# Particle Editor
-	file(GLOB src_particleeditor "tools/particle/*.cpp")
-	add_globbed_headers(src_particleeditor "tools/particle")
 	# Radiant (Map editor)
 	file(GLOB src_map_editor "tools/radiant/*.cpp")
 	add_globbed_headers(src_map_editor "tools/radiant")
-	# Script editor
-	file(GLOB src_script_editor "tools/script/*.cpp")
-	add_globbed_headers(src_script_editor "tools/script")
 	# Script Debugger
 	set(src_debuggerClient
 		tools/debugger/DebuggerClient.h
@@ -1221,24 +1211,16 @@ if (TOOLS AND MFC_TOOLS AND MSVC)
 		${src_debuggerServer}
 		${src_debuggerClient}
 	)
-	# sound editor?
-	file(GLOB src_sound_editor "tools/sound/*.cpp")
-	add_globbed_headers(src_sound_editor "tools/sound")
-	
+
 
 	# The numerous tools in a nice list.
 	list(APPEND src_editor_tools
 		${src_comafx}
 		${src_tools_common}
 		${src_compiler_renderbump}
-		${src_afeditor}
-		${src_decleditor}
 		${src_gui_editor}
 		${src_materialeditor}
-		${src_particleeditor}
 		${src_map_editor}
-		${src_script_editor}
-		${src_sound_editor}
 		${src_script_debugger}
 		"tools/edit_public.h"
 		)

neo/framework/Common.cpp

@@ -1038,7 +1038,7 @@ idCommonLocal::InitTool
 void idCommonLocal::InitTool( const toolFlag_t tool, const idDict *dict ) {
 #ifndef IMGUI_DISABLE
 	if ( tool & EDITOR_SOUND ) {
-		//SoundEditorInit( dict );
+		ImGuiTools::SoundEditorInit( dict );
 	} else if ( tool & EDITOR_LIGHT ) {
 		ImGuiTools::LightEditorInit( dict );
 	} else if ( tool & EDITOR_PARTICLE ) {
@@ -1053,18 +1053,6 @@ void idCommonLocal::InitTool( const toolFlag_t tool, const idDict *dict ) {
 		ImGuiTools::DeclBrowserInit( dict );
 	}
 #endif
-
-#ifdef ID_ALLOW_TOOLS
-	if ( tool & EDITOR_SOUND ) {
-		SoundEditorInit( dict );
-	} else if ( tool & EDITOR_LIGHT ) {
-		LightEditorInit( dict );
-	} else if ( tool & EDITOR_PARTICLE ) {
-		ParticleEditorInit( dict );
-	} else if ( tool & EDITOR_AF ) {
-		AFEditorInit( dict );
-	}
-#endif
 }
 
 /*
@@ -1298,11 +1286,8 @@ static void Com_EditLights_f( const idCmdArgs &args ) {
 #ifndef IMGUI_DISABLE
 	D3::ImGuiHooks::ShowInfoOverlay( "Shoot a light to open it in the Light Editor" );
 	cvarSystem->SetCVarInteger( "g_editEntityMode", 1 );
-#elif defined(ID_ALLOW_TOOLS)
-	LightEditorInit( NULL );
-	cvarSystem->SetCVarInteger( "g_editEntityMode", 1 );
 #else
-	common->Warning( "Editors not available because dhewm3 was built without ImGui or MFC Tools" );
+	common->Warning( "Editors not available because the engine was built without ImGui Tools" );
 #endif
 }
 
@@ -1315,10 +1300,8 @@ Com_EditPDAs_f
 static void Com_EditPDAs_f( const idCmdArgs &args ) {
 #ifndef IMGUI_DISABLE
 	ImGuiTools::PDAEditorInit( NULL );
-#elif defined(ID_ALLOW_TOOLS)
-	PDAEditorInit( NULL );
 #else
-	common->Warning( "Editors not available because dhewm3 was built without ImGui or MFC Tools" );
+	common->Warning( "Editors not available because the engine was built without ImGui Tools" );
 #endif
 }
 */
@@ -1329,13 +1312,11 @@ Com_EditAFs_f
 ==================
 */
 static void Com_EditAFs_f( const idCmdArgs &args ) {
-	// TODO: cvarSystem->SetCVarInteger( "g_editEntityMode", 3 ); ?
 #ifndef IMGUI_DISABLE
 	ImGuiTools::AfEditorInit();
-#elif defined(ID_ALLOW_TOOLS)
-	AFEditorInit( NULL );
+	cvarSystem->SetCVarInteger( "g_editEntityMode", 3 );
 #else
-	common->Warning( "Editors not available because dhewm3 was built without ImGui or MFC Tools" );
+	common->Warning( "Editors not available because the engine was built without ImGui Tools" );
 #endif
 }
 
@@ -1347,10 +1328,8 @@ Com_EditParticles_f
 static void Com_EditParticles_f(const idCmdArgs& args) {
 #ifndef IMGUI_DISABLE
 	ImGuiTools::ParticleEditorInit( NULL );
-#elif defined(ID_ALLOW_TOOLS)
-	ParticleEditorInit(NULL);
 #else
-	common->Warning( "Editors not available because dhewm3 was built without ImGui or MFC Tools" );
+	common->Warning( "Editors not available because the engine was built without ImGui Tools" );
 #endif
 }
 
@@ -1362,10 +1341,8 @@ Com_EditDecls_f
 static void Com_EditDecls_f( const idCmdArgs &args ) {
 #ifndef IMGUI_DISABLE
 	ImGuiTools::DeclBrowserInit( NULL );
-#elif defined(ID_ALLOW_TOOLS)
-	DeclBrowserInit( NULL );
 #else
-	common->Warning("Editors not available because dhewm3 was built without ImGui or MFC Tools");
+	common->Warning("Editors not available because the engine was built without ImGui Tools");
 #endif
 }
 
@@ -1377,10 +1354,8 @@ Com_EditScripts_f
 static void Com_EditScripts_f( const idCmdArgs &args ) {
 #ifndef IMGUI_DISABLE
 	ImGuiTools::ScriptEditorInit( NULL );
-#elif defined(ID_ALLOW_TOOLS)
-	ScriptEditorInit( NULL );
 #else
-	common->Warning("Editors not available because dhewm3 was built without ImGui or MFC Tools");
+	common->Warning("Editors not available because the engine was built without ImGui Tools");
 #endif
 }
 
@@ -1401,20 +1376,20 @@ static void Com_MaterialEditor_f( const idCmdArgs &args ) {
 #endif
 }
 
-
-#ifdef ID_ALLOW_TOOLS
 /*
 ==================
 Com_EditSounds_f
 ==================
 */
 static void Com_EditSounds_f( const idCmdArgs &args ) {
-	SoundEditorInit( NULL );
+#ifndef IMGUI_DISABLE
+	ImGuiTools::SoundEditorInit( NULL );
 	cvarSystem->SetCVarInteger( "g_editEntityMode", 2 );
+#else
+	common->Warning( "Editors not available because the engine was built without ImGui Tools" );
+#endif
 }
 
-#endif // ID_ALLOW_TOOLS
-
 /*
 ==================
 Com_Error_f
@@ -2452,20 +2427,22 @@ void idCommonLocal::InitCommands( void ) {
 	cmdSystem->AddCommand( "MatbuildDir", MatBuildDir_f, CMD_FL_TOOL, "builds interaction materials for a given directory.", idCmdSystem::ArgCompletion_MapName );
 #endif
 
+#ifdef ID_ALLOW_TOOLS
 	// editors
 	cmdSystem->AddCommand( "editLights", Com_EditLights_f, CMD_FL_TOOL, "launches the in-game Light Editor" );
+	cmdSystem->AddCommand( "editSounds", Com_EditSounds_f, CMD_FL_TOOL, "launches the in-game Sound Editor" );
 	//cmdSystem->AddCommand( "editPDAs", Com_EditPDAs_f, CMD_FL_TOOL, "launches the in-game PDA Editor" );
 	cmdSystem->AddCommand( "editAFs", Com_EditAFs_f, CMD_FL_TOOL, "launches the in-game Articulated Figure Editor" );
 	cmdSystem->AddCommand( "editDecls", Com_EditDecls_f, CMD_FL_TOOL, "launches the in-game Declaration Editor" );
 	cmdSystem->AddCommand( "editParticles", Com_EditParticles_f, CMD_FL_TOOL, "launches the in-game Particle Editor" );
 	cmdSystem->AddCommand( "editScripts", Com_EditScripts_f, CMD_FL_TOOL, "launches the in-game Script Editor" );
 	//BSM Nerve: Add support for the material editor
 	cmdSystem->AddCommand( "materialEditor", Com_MaterialEditor_f, CMD_FL_TOOL, "launches the Material Editor" );
-#ifdef ID_ALLOW_TOOLS
+#ifdef _WIN32
 	cmdSystem->AddCommand( "editor", Com_Editor_f, CMD_FL_TOOL, "launches the level editor Radiant" );
-	cmdSystem->AddCommand( "editSounds", Com_EditSounds_f, CMD_FL_TOOL, "launches the in-game Sound Editor" );
 	cmdSystem->AddCommand( "editGUIs", Com_EditGUIs_f, CMD_FL_TOOL, "launches the GUI Editor" );
 	cmdSystem->AddCommand( "debugger", Com_ScriptDebugger_f, CMD_FL_TOOL, "launches the Script Debugger" );
+#endif
 #endif
 
 	cmdSystem->AddCommand( "printMemInfo", PrintMemInfo_f, CMD_FL_SYSTEM, "prints memory debugging data" );

neo/sys/sys_imgui.h

@@ -1,7 +1,7 @@
 
 
-#ifndef NEO_SYS_SYS_IMGUI_H_
-#define NEO_SYS_SYS_IMGUI_H_
+#ifndef _SYS_IMGUI_H_
+#define _SYS_IMGUI_H_
 
 #ifndef IMGUI_DISABLE
 #include "../libs/imgui/imgui.h"
@@ -15,14 +15,16 @@ enum D3ImGuiWindow {
 	D3_ImGuiWin_Settings    = 1, // advanced dhewm3 settings menu
 	D3_ImGuiWin_Demo        = 2, // ImGui demo window
 	D3_ImGuiWin_LightEditor = 4, // new ingame Light Editor
-	D3_ImGuiWin_AfEditor    = 8, // new AF Editor
-	D3_ImGuiWin_PDAEditor	= 16, // new PDA Editor
-	D3_ImGuiWin_ParticleEditor = 32, // new Particle Editor
-	D3_ImGuiWin_ScriptEditor = 64, // new Script Editor
-	D3_ImGuiWin_DeclBrowser = 128, // new Decl Browser
-	D3_ImGuiWin_MaterialEditor = 256, // next should be 512, then 1024, etc so a bitmask can be used
+	D3_ImGuiWin_SoundEditor = 8, // new ingame Sound Editor
+	D3_ImGuiWin_AfEditor    = 16, // new AF Editor
+	D3_ImGuiWin_PDAEditor	= 32, // new PDA Editor
+	D3_ImGuiWin_ParticleEditor = 64, // new Particle Editor
+	D3_ImGuiWin_ScriptEditor = 128, // new Script Editor
+	D3_ImGuiWin_DeclBrowser = 256, // new Decl Browser
+	D3_ImGuiWin_MaterialEditor = 512, // next should be 1024, then 2048, etc so a bitmask can be used
 
 	D3_ImGuiWin_AnyEditor = D3_ImGuiWin_LightEditor
+		| D3_ImGuiWin_SoundEditor
 		| D3_ImGuiWin_AfEditor
 		| D3_ImGuiWin_PDAEditor
 		| D3_ImGuiWin_ParticleEditor
@@ -146,4 +148,4 @@ inline bool WriteUserStyle() { return false; }
 }} //namespace D3::ImGuiHooks
 
 
-#endif /* NEO_SYS_SYS_IMGUI_H_ */
+#endif /* _SYS_IMGUI_H_ */