Upstream 4k/dpi awareness Tool fixes #339

HarrievG · 2021-01-15T22:46:30Z

Contains all fixes in tool-land to draw and size all window elements in editor windows when DPI settings are used.

Also contains modified cmaketexts. Only SDL part is important now. Keep added settings off until until integration is comple, or take only the changes in tool.

-H.

DanielGibson · 2021-01-16T00:49:34Z

Could you rebase this on current master (to get rid of the merge conflicts) and clean it up a bit?
There's lots of unrelated changes in CMakeLists.txt and half of the commits are merge commits (maybe rebasing would already get rid of those?)

HarrievG · 2021-01-16T01:17:25Z

Hi Daniel,
Yes will try to rebase, then also the 2 defines in the tool code (.dae) related can go for this base. And it's cleaner in the cmake too. Sorry I am not as git savvy as I want to be ;)

_afxdll: ah yes, MFC ! That is referencing it somewhere, that is why I had a problem with it only when compiling tools

HarrievG · 2021-01-16T22:48:50Z

At some time after the next release I wanna try to get rid of libogg/vorbis(file) and libjpeg and zlib and replace them with header-only libs (stb_vorbis, stb_image and miniz).
So the only remaining dependencies will be SDL2, OpenAL and (optionally) libcurl, and of course the C and C++ standardlibs.
That should make building less painful (though of course especially the combination of SDL2 and CMake might still cause us pain)

I hope I get that release done soon(ish), but there's still some things to do.

To be honest, I also think that I won't merge this change before the release. Don't get me wrong, the 4K fixes for the tools look great and I really want them, but both them and the cmake changes look quite invasive and I don't want to risk breaking anything that worked so far shortly before a release.

Once this branch is in a state that works for me on both Linux and Windows, I'll create a branch based on it (and the then-current master) so you have a sane base for further work (even if I don't get the fscking 1.5.1 release done).

I will take out the casing . No problem. I will also try to setup Travis to build it so I can catch any other build related things. That hopefully will mitigate some risks.

If there is anything I can do to help with 1.5.1 just assign me some bugs and I'll do all that I can.

DanielGibson · 2021-01-17T05:45:43Z

If there is anything I can do to help with 1.5.1 just assign me some bugs and I'll do all that I can.

Thanks for the offer!
There's two bugs I'd like to fix before release if it's small/harmless (-looking) fixes: #330 #331 (UPDATE: linked the wrong bug first)
There's also two other bugs that I couldn't reproduce, but that otherwise sound like they should be fixed: #328 #280

Apart from that I'll have to do some work on the mods (https://github.com/dhewm/dhewm3-sdk), like

update them with relevant changes done in the dhewm3 repo
try to fix Dentonmod crashes (IIRC Rivensin is based on Dentonmod and I already fixed lots of bugs there, I'll have to see what of those fixes apply to Dentonmod and port them)

(but it probably makes most sense if I do the mod-specific stuff myself)

DanielGibson · 2021-01-17T06:02:44Z

Oh, another thing that would be nice to have for the next release is #318
I already implemented it for POSIX (Linux etc), but Windows is still missing: https://github.com/DanielGibson/dhewm3/tree/dll-load-errors.

HarrievG · 2021-01-17T09:45:16Z

Yes, let me take those windows specific ones, its my main platform anyway, so i gladly go look at #318 .

HarrievG · 2021-04-21T14:00:50Z

Hi Daniel,
was there something else here you wanted to be done before merging?

I want to create pull requests for the debugger too, but it layers on top of this.

Besides that; i see that @turol is refactoring some code which will have impact on the debugger implementation, and i dont want to much divergence :P

cheers!
-H

DanielGibson · 2021-04-21T18:41:08Z

Right now this branch can't be merged, the first step would be to rebase it onto the current master branch

turol · 2021-04-22T09:39:45Z

Not really refactoring, #369 is pretty much all of it. It's only a draft because I'm not sure it's a good idea and I know you were also doing something to it. My changes are mostly mechanical and I'm fine with you either incorporating them or doing something totally different.

HarrievG · 2021-04-22T18:53:21Z

@DanielGibson first step complete!?

DanielGibson · 2021-04-22T19:08:08Z

Can you please rebase it so we don't have all those "merge master into upstream" commits in the history?

HarrievG · 2021-04-22T19:11:21Z

uhm yes! crap! wrong button :S

HarrievG · 2021-04-22T20:25:32Z

not sure what i did wrong now. ( rebase looks correct? )
But it looks like i have some work left:

Put back @turol changes ( no idea why they are reverted, auto merge during rebase maybe?)
Remove all the QGL, IMGUI and DAE stuff.

turol · 2021-04-22T20:32:15Z

Well that's quite a mess... You're probably better off creating a new branch off the current master and cherry-picking the appropriate commits into it.

Also, https://xkcd.com/1597/

HarrievG · 2021-04-22T20:40:06Z

Lol. yeah well. i "remembered" the revert command ;P

I just keep trying to use git as Perforce (Muscle Memory) . But it isnt perforce, and it will never behave like it either, i just have to remember the wise words : "BRANCH FIRST"

Yeah, i will cherry pick.. not giving up!

DanielGibson · 2021-05-06T01:37:15Z

oh shit, I totally didn't think about this when I just merged #376 - I fear there will be merge conflicts (maybe not though, I didn't check)

HarrievG · 2021-05-06T05:43:11Z

I cannot reconcile with this. I really have done a lot of work.

So let's try to solve it.

If you help me merging this and getting it in, ( rang me up, walk me through it, really. ), so that my git skills are enough to not have to spend so much time getting it upstream again then everybody wins.

And then I can finally integrate the debugger too. So frigging proud of that one. Not going to let that go to waste, even that Id guy I asked if it was actually allowed to gpl it (because of raven Software) was impressed.

turol · 2021-05-06T08:47:24Z

I think you almost got it, there's just two extraneous commits remaining. The following should give you a branch without them:

git checkout -b newBranch 9e316ac0d6d9ddb565ca5929d1d9cb35dd92ba94

- Nullptr guard/Crashfix in material editor : meMainFrame can be null when starting immedeatly from commandline.

- Upped windows version ( needs to go back, and a runtime dpi check comes in place ) - Changed warning settings for msvc to confirm latest compilers - Fixed up _afxdll

DanielGibson

just as a reminder about that get DPI wrapper

neo/tools/radiant/InspectorDialog.cpp

- Use GetDeviceCaps for dpi on anything else than win10.

DanielGibson · 2021-05-10T02:29:34Z

I added dynamic loading of the dpi getting function to support older windows versions again, see https://github.com/dhewm/dhewm3/commits/tool-dpi-scaling - if that works I'll merge it.

Win64 binaries with all this: dhewm3-1.5.2pre-win64-tools-dpiscale.zip

DanielGibson · 2021-05-10T02:44:15Z

Works on Win7:
100% scaling:
150%:

HarrievG · 2021-05-10T05:48:39Z

Whoo !

Very happy with the end result, thx for adding the win 8 method!

This is now solid as a rock.

😀

DanielGibson · 2021-05-10T06:38:25Z

these changes are now in master - thanks a lot! :)

DanielGibson mentioned this pull request Apr 22, 2021

Refactor idGameEdit #369

Draft

This comment has been minimized.

Sign in to view

HarrievG added 2 commits May 6, 2021 23:11

- 4K / DPI aware Tool fixes

9b40298

- Nullptr guard/Crashfix in material editor : meMainFrame can be null when starting immedeatly from commandline.

update cmake

71f8d6e

- Upped windows version ( needs to go back, and a runtime dpi check comes in place ) - Changed warning settings for msvc to confirm latest compilers - Fixed up _afxdll

HarrievG force-pushed the upstream branch from dfafbbe to 71f8d6e Compare May 6, 2021 21:14

DanielGibson mentioned this pull request May 7, 2021

Please port DoomScript debugger from SE2 into Dhewm3 #347

Closed

DanielGibson requested changes May 7, 2021

View reviewed changes

neo/tools/radiant/InspectorDialog.cpp Outdated Show resolved Hide resolved

- Wrapped GetDpiForWindow in GetWindowScalingFactor

e9474e8

- Use GetDeviceCaps for dpi on anything else than win10.

DanielGibson approved these changes May 10, 2021

View reviewed changes

DanielGibson closed this May 10, 2021

DanielGibson mentioned this pull request May 10, 2021

MFC Tool issues #378

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream 4k/dpi awareness Tool fixes #339

Upstream 4k/dpi awareness Tool fixes #339

HarrievG commented Jan 15, 2021

DanielGibson commented Jan 16, 2021

HarrievG commented Jan 16, 2021 •

edited

HarrievG commented Jan 16, 2021

DanielGibson commented Jan 17, 2021 •

edited

DanielGibson commented Jan 17, 2021

HarrievG commented Jan 17, 2021

HarrievG commented Apr 21, 2021 •

edited

DanielGibson commented Apr 21, 2021

turol commented Apr 22, 2021

HarrievG commented Apr 22, 2021

DanielGibson commented Apr 22, 2021

HarrievG commented Apr 22, 2021

HarrievG commented Apr 22, 2021 •

edited

turol commented Apr 22, 2021

HarrievG commented Apr 22, 2021 •

edited

DanielGibson commented May 6, 2021 •

edited

This comment has been minimized.

HarrievG commented May 6, 2021

turol commented May 6, 2021

This comment has been minimized.

DanielGibson left a comment

DanielGibson commented May 10, 2021

DanielGibson commented May 10, 2021

HarrievG commented May 10, 2021

DanielGibson commented May 10, 2021

Upstream 4k/dpi awareness Tool fixes #339

Upstream 4k/dpi awareness Tool fixes #339

Conversation

HarrievG commented Jan 15, 2021

DanielGibson commented Jan 16, 2021

HarrievG commented Jan 16, 2021 • edited

HarrievG commented Jan 16, 2021

DanielGibson commented Jan 17, 2021 • edited

DanielGibson commented Jan 17, 2021

HarrievG commented Jan 17, 2021

HarrievG commented Apr 21, 2021 • edited

DanielGibson commented Apr 21, 2021

turol commented Apr 22, 2021

HarrievG commented Apr 22, 2021

DanielGibson commented Apr 22, 2021

HarrievG commented Apr 22, 2021

HarrievG commented Apr 22, 2021 • edited

turol commented Apr 22, 2021

HarrievG commented Apr 22, 2021 • edited

DanielGibson commented May 6, 2021 • edited

This comment has been minimized.

HarrievG commented May 6, 2021

turol commented May 6, 2021

This comment has been minimized.

DanielGibson left a comment

Choose a reason for hiding this comment

DanielGibson commented May 10, 2021

DanielGibson commented May 10, 2021

HarrievG commented May 10, 2021

DanielGibson commented May 10, 2021

HarrievG commented Jan 16, 2021 •

edited

DanielGibson commented Jan 17, 2021 •

edited

HarrievG commented Apr 21, 2021 •

edited

HarrievG commented Apr 22, 2021 •

edited

HarrievG commented Apr 22, 2021 •

edited

DanielGibson commented May 6, 2021 •

edited