RFC: D3D9 client merge into main

[DarkWanderer]

Suggest to review & discuss proposed merge of D3D9Client into Orbiter main. Full history of d3d9client has been merged, and CMake intergrated with main build. Potential points of contention:

• API backward compatibility
• Increased size of build
• Documentation/includes placement

All credit of course goes to @jarmonik & other D3D9 contributors (I only helped to integrate it into Orbiter repo) - however, I think kicking off discussion on this early would be beneficial

[dbeachy1]

Is it still the intention to merge D3D9 into Orbiter's main branch? Does this still need more testing after the merge conflicts are resolved?

[jarmonik]

Yes, it is intended to be merged to main. However there are some commits made by riojax that I haven't had time to test. So, making some test runs before merge would be a good idea. But otherwise as far as I can remember it should be ready for merge. There is plenty of new code in my current work-branch jarmonik/atmo-remake which will rewrite the atmospheric rendering and it's 95% complete but I don't know when I find time to finish the remaining 5%. Which is gas-giant rendering and haze on vessels/base-structures, There is no need to wait for that with the merge.

[derkweijers]

Lets get this moving shall we?
As proposed here I'd like to propose that we merge this into a fork that will include enhancements over the Orbiter core.

[spacex15]

Martin, I see that you improved a lot the D3D9client CMakefiles.txt,
Thanks a lot for that

I still do not understand this line
set(ORBITER_SOURCE_SDK_INCLUDE_DIR "${CMAKE_BINARY_DIR}/Orbitersdk/include" "${CMAKE_SOURCE_DIR}/Orbitersdk/include")

I do not see why d3d9client needs to search for "${CMAKE_BINARY_DIR}/Orbitersdk/include" ?
binary dir instead of source dir ?

I suggest to change to set(ORBITER_SOURCE_SDK_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/Orbitersdk/include")

for me it causes build to fail when it is not a clean rebuild all

[mschweiger]

@spacex15 you are right, it is a bit strange that both the source and binary directories are included. I don't think the line was written by me, so I am not sure what the idea here was. The build directory version of Orbitersdk/include may have been added to include dynamically generated header files.

Even stranger, there is also an "IncludeDir" which points to the source Orbitersdk/include, but is used as an output target for dynamically generated header files, which seems very unclean.

I'll try to figure out the intent here and see if I can come up with an alternative solution.

[mschweiger]

@spacex15 : does this latest commit work better for you?

[spacex15]

Yes it works for me
minor problem still persistent

It builds everytime the following D3d9client DLLs

DrawOrbits,TerrainToolbox,DX9ExtMFD,GenericCamera

even if nothing was touched