Feature: Porting MFC tools #649

ashalkhakov · 2025-01-31T16:25:59Z

This adds editors ported from MFC and builds on top of imgui-docking.

Currently ported tools:

PDA editor

incl. dhewm3-specific adjustments to imgui_impl_opengl2.cpp (two additional qgl #defines)

c2dcc80 Docking: fixed ImGuiWindowFlags_DockNodeHost / ImGuiWindowFlags_NavFlattened clash introduced by c38c18c just for 1.91.7 (#8357) 1.91.7-docking crashed when opening the dhewm3 settings window, now this issue is fixed upstream so upgrade to the latest code.

using commit 719e925b2eabeef "Started to simplify the light editor" (afterwards they started integrating ImGuizmo, let's do that later once things work...) compiles (without AfEditor), but not functional yet

seems to work! at least as long as the MFC tools are disabled

unless ImGui is disabled, then use the MFC one, unless that's also disabled, then just print a warning

shows a little grey overlay window with given text in the upper left corner of the window

- functionality is the same as the old dialog (video/audio editing does not work)

DanielGibson · 2025-01-31T16:38:20Z

Thank you very much! The screenshot looks pretty good :)

I'll look at the code later; are the questions from #647 (comment) regarding modal dialogs and layout still open or have you figured that out already?
Modals should be pretty easy (ImGui::BeginPopupModal()), for layout I'd have to figure that out myself, depending on what you want to do. Is it about having basically three columns and have that scale when resizing the window?

ashalkhakov · 2025-01-31T16:50:04Z

I'll look at the code later; are the questions from #647 (comment) regarding modal dialogs and layout still open or have you figured that out already? Modals should be pretty easy (ImGui::BeginPopupModal()), for layout I'd have to figure that out myself, depending on what you want to do. Is it about having basically three columns and have that scale when resizing the window?

I think I figured modals out. The code:

	CDialogPDAAdd dlg;
	if ( dlg.DoModal() == IDOK ) {
/* modal dialog accepted */
	}

translates to the opening of the dialog:

	addPDADlg.Reset();
	ImGui::OpenPopup( "PDAAdd" );

and it's drawing & output handling routine:

		if ( ImGui::BeginPopupModal( "PDAAdd", nullptr, ImGuiWindowFlags_AlwaysAutoResize ) ) {
			bool accepted = addPDADlg.Draw();

			if ( accepted ) {
/* modal dialog accepted */
			}

			ImGui::EndPopup();
		}

for layout I'd have to figure that out myself, depending on what you want to do. Is it about having basically three columns and have that scale when resizing the window?

Yes, I wanted to have a 3-column layout like in the original MFC dialog and have it scale or change according to the available space. For this dialog, I think the fixed layout will suffice, for other dialogs we may have to get creative.

There is also the issue that the window position is reset when PDA is selected.

DanielGibson · 2025-01-31T16:58:06Z

Ok, I'll have a look!

By the way, did you check out the ImGui Demo (open Dhewm3Settings menu with F10 -> Other Options -> [Show ImGui Demo])?
Maybe it could somehow be done with groups (Layout & Scrolling -> Groups) and/or Tables (Tables & Columns -> Resizable, stretch)?

ashalkhakov · 2025-01-31T17:18:32Z

Ok, I'll have a look!

By the way, did you check out the ImGui Demo (open Dhewm3Settings menu with F10 -> Other Options -> [Show ImGui Demo])? Maybe it could somehow be done with groups (Layout & Scrolling -> Groups) and/or Tables (Tables & Columns -> Resizable, stretch)?

Thank you, I'll check it out!

- the name of the window passed to ImGui must be stable

ashalkhakov · 2025-01-31T17:53:44Z

@DanielGibson Table layout works nicely! Also, fixed the reappearing window bug: the name of the window passed to ImGui must be stable.

DanielGibson · 2025-01-31T17:58:21Z

That's awesome!

Regarding the stable title: You can use "Whatever changing text###PDA Editor" as title (or generally as name in ImGui widgets) - then only "PDA Editor" (or its hash) is used as identifier and only "Whatever changing text" is displayed.

Simlarly, you could use for example "Add...##Email" and "Add...##video" (this time 2 # instead of 3) - then the ID is calculated from the whole string, but still only "Add..." is displayed. But of course pushing IDs around them is also a solution for that.

neo/framework/Common.cpp

neo/tools/imgui/pdaeditor/PDAEditor.cpp

DanielGibson · 2025-01-31T19:08:09Z

I know this was already the case in the original PDA editor, but I wonder why the buttons in the left pane use "Add" and "Del" while the others use "Add..." and "Delete..."

Also, I just tried that "Add" (PDA) button and it asked me for a name and I entered it and clicked ok, but the modal didn't close (neither when clicking cancel or pressing escape or anything else). The .pda file was written, though.

A problem with the ImGui-based ingame editors is that when clicking into the game window the cursor is grabbed by the game again (because then the ImGui window doesn't have focus anymore) and it's hard to get it back. I feel like the ingame editor integration could overall be better, maybe with a command to launch a menu that allows launching and editor; that command could also free the mousecursor?

except for the ones that already were in the ImGui namespace

DanielGibson · 2025-02-01T03:04:33Z

In https://github.com/DanielGibson/dhewm3/tree/imgui-tools I have (based on your branch) integrated the AfEditor and also modified Com_EditPDAs_f() in the way I suggested above

DanielGibson · 2025-02-01T03:22:42Z

neo/tools/imgui/pdaeditor/PDAEditor.cpp

+}
+
+void PDAEditor::OnBtnClickedPDADel()
+{


maybe this could be implemented like

idStr fileName = "newpdas/"; fileName += pdaName; // TODO fileName += ".pda"; fileSystem->RemoveFile( fileName );

ashalkhakov · 2025-02-01T17:14:07Z

I know this was already the case in the original PDA editor, but I wonder why the buttons in the left pane use "Add" and "Del" while the others use "Add..." and "Delete..."

I just tried to implement deletion, cannot get it to work. The Decl manager keeps a copy of PDA decl in memory, so even if the file is deleted, it will still get re-created.

Also, I just tried that "Add" (PDA) button and it asked me for a name and I entered it and clicked ok, but the modal didn't close (neither when clicking cancel or pressing escape or anything else). The .pda file was written, though.

Fixed that. I'll add the missing dialogs for audio & video and include this fix.

DanielGibson · 2025-02-01T17:52:15Z

The Decl manager keeps a copy of PDA decl in memory, so even if the file is deleted, it will still get re-created.

Interesting. Looks like the idDeclManager doesn't support removing decls at all - that's weird.
I guess the Delete button has to remain a dummy then, for now (or maybe even comment it out, what's the point in buttons that don't do anything...)

ashalkhakov · 2025-02-01T18:16:17Z

@DanielGibson Should I do a PR to your branch or to the main repo? (I've just updated imgui-tools on my fork.)

DanielGibson · 2025-02-01T18:31:57Z

You could update your tools-porting branch with my changes (either merge or rebase, I don't care) and continue to work on that. I don't think we need a new PR for them, let's just keep this here

DanielGibson and others added 9 commits January 29, 2025 18:34

Move to Dear ImGui Docking branch, 1.91.7-docking

8a3f38f

incl. dhewm3-specific adjustments to imgui_impl_opengl2.cpp (two additional qgl #defines)

Enable ImGui docking and (multi)viewport

8c28314

Start integrating Dear ImGui based tools from RBDoom3BFG

fbf992c

using commit 719e925b2eabeef "Started to simplify the light editor" (afterwards they started integrating ImGuizmo, let's do that later once things work...) compiles (without AfEditor), but not functional yet

Integrate ImGui LightEditor so it can be used

2454f6b

seems to work! at least as long as the MFC tools are disabled

Some improvements for the ImGui LightEditor

f27b957

Open ImGui LightEditor with "editLights" command

44f5914

unless ImGui is disabled, then use the MFC one, unless that's also disabled, then just print a warning

Implement D3::ImGuiHooks::ShowInfoOverlay()

16ff74a

shows a little grey overlay window with given text in the upper left corner of the window

Porting the old PDA editor.

69a1538

- functionality is the same as the old dialog (video/audio editing does not work)

ashalkhakov mentioned this pull request Jan 31, 2025

Feature: wxWidgets-based editors. #647

Closed

Artyom Shalkhakov added 2 commits January 31, 2025 10:46

Use table layout.

e88117c

Fix reappearing window.

211657c

- the name of the window passed to ImGui must be stable

Bring back dynamic window title.

680775d

DanielGibson reviewed Jan 31, 2025

View reviewed changes

neo/framework/Common.cpp Outdated Show resolved Hide resolved

DanielGibson reviewed Jan 31, 2025

View reviewed changes

neo/tools/imgui/pdaeditor/PDAEditor.cpp Outdated Show resolved Hide resolved

DanielGibson added 5 commits February 1, 2025 01:17

Remove unused code from ImGui AfEditor

ace8247

Put helpers from ImGui_IdWidgets.h into namespace ImGuiTools

1004714

except for the ones that already were in the ImGui namespace

Windows: Don't run MFC-based editors if we have ImGui-alternative

056e652

Move Com_EditPDAs_f out of #ifdef ID_ALLOW_TOOLS

3d5987a

DanielGibson reviewed Feb 1, 2025

View reviewed changes

Artyom Shalkhakov added 2 commits February 1, 2025 11:10

Add audio/video editing. Fix add PDA popup closing.

071ddc3

Minor changes.

31e9679

WIP: particle editor.

1b6513b

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: Porting MFC tools #649

Feature: Porting MFC tools #649

ashalkhakov commented Jan 31, 2025 •

edited

Loading

DanielGibson commented Jan 31, 2025 •

edited

Loading

ashalkhakov commented Jan 31, 2025

DanielGibson commented Jan 31, 2025

ashalkhakov commented Jan 31, 2025

ashalkhakov commented Jan 31, 2025

DanielGibson commented Jan 31, 2025 •

edited

Loading

DanielGibson commented Jan 31, 2025

DanielGibson commented Feb 1, 2025

DanielGibson Feb 1, 2025

ashalkhakov commented Feb 1, 2025

DanielGibson commented Feb 1, 2025

ashalkhakov commented Feb 1, 2025

DanielGibson commented Feb 1, 2025

Feature: Porting MFC tools #649

Are you sure you want to change the base?

Feature: Porting MFC tools #649

Conversation

ashalkhakov commented Jan 31, 2025 • edited Loading

DanielGibson commented Jan 31, 2025 • edited Loading

ashalkhakov commented Jan 31, 2025

DanielGibson commented Jan 31, 2025

ashalkhakov commented Jan 31, 2025

ashalkhakov commented Jan 31, 2025

DanielGibson commented Jan 31, 2025 • edited Loading

DanielGibson commented Jan 31, 2025

DanielGibson commented Feb 1, 2025

DanielGibson Feb 1, 2025

Choose a reason for hiding this comment

ashalkhakov commented Feb 1, 2025

DanielGibson commented Feb 1, 2025

ashalkhakov commented Feb 1, 2025

DanielGibson commented Feb 1, 2025

ashalkhakov commented Jan 31, 2025 •

edited

Loading

DanielGibson commented Jan 31, 2025 •

edited

Loading

DanielGibson commented Jan 31, 2025 •

edited

Loading