The Big CMake + MinGW + Sound PR #127

TheBrokenRail · 2024-06-18T22:51:04Z

This PR:

Refactors the CMake build-system:
- There is now a top-level CMakeLists.txt so you no longer need to cd platforms/sdl before building the project.
- SDL is now loaded in platforms/sdl/CMakeLists.txt like you would expect instead of in source/CMakeLists.txt.
- Sound systems have been decoupled from SDL/Win32. You can now build SDL with DirectSound or Win32 with OpenAL.
- The Win32 platform can now be built with CMake using MinGW-w64.
- The SDL platform can also now be built with CMake using MinGW-w64.
- Both of those configurations have been added to the CI.'
Sound is now loaded at runtime instead of being loaded from the binary! (Fixes Load Sounds From Filesystem #119)
- tools/grabsounds.py now extracts sounds to game/assets/sound using LIEF (which is downloaded automatically).
- Sound data is loaded using AppPlatform::readAssetFile, which has been implemented (and tested) for both SDL, Win32, and native Android.
- AppPlatform::getPatchData has been changed to use AppPlatform::readAssetFile.
Extra Notes:
- The macOS build currently only works because I added a ln -s to the CI, someone should probably fix that.
- I also adjusted the line width calculation for block outlines.
- And I updated the GLES Compatibility Layer.
- Finally, I fixed some bugs with Logger.

source/client/sound/SoundRepository.cpp

platforms/sdl/main.cpp

iProgramMC · 2024-06-19T05:39:12Z

platforms/sound/directsound/CustomSoundSystem.hpp

+};
+
+#define SOUND_SYSTEM SoundSystemDS


I disagree with renaming all sound systems to CustomSoundSystem. I especially disagree with your choice of using a #define where a typedef would have fit incredibly well.

I would say revert this and then in each AppPlatform, use preprocessor conditions to determine the sound system in that AppPlatform. And use typedef for that.

You can't really use DirectSound on non-Windows; nor can you use OpenSL ES on desktop Linux and Windows.

You can't really use DirectSound on non-Windows; nor can you use OpenSL ES on desktop Linux and Windows.

The issue is OpenAL. It can be used on both SDL and Win32, so you end up with:

#ifdef USE_OPENAL #include "SoundSystemAL.h" #define SOUND_SYSTEM SoundSystemAL #else #include "SoundSystemDS.h" #define SOUND_SYSTEM SoundSystemDS #endif

In both platforms/sdl/main.cpp and platforms/windows/main.cpp.

I'll switch to typedefs though, that is nicer.

Yep, that's fine. I don't mind that at all.

platforms/windows/main.cpp

iProgramMC · 2024-06-19T05:42:59Z

source/client/app/AppPlatform.cpp

-	return "";
+	AssetFile file = readAssetFile("patches/patch_data.txt");
+	std::string out = std::string(file.data, file.data + file.size);
+	delete file.data;


You should delete data within the destructor and add move and copy constructors to AssetFile. Because we're using C++.

Wouldn't that require SoundDesc maintaining a copy of AssetFile so the sound data isn't deleted?

Yes. But you return AssetFile from AppPlatform::readAssetFile so you can just keep the AssetFile in memory (ideally you'd also use std::move to avoid copying)

So, funny story. Turns out SoundRepository copies SoundDesc a lot.

So the options are:

Modify SoundRepository to store pointers or references (which in turn would require modifying the SoundSystems).

Add a copy constructor to AssetFile and copy the sound data whenever it is used, which sounds... really inefficient.

Keep the data externally-managed.

iProgramMC · 2024-06-19T05:45:17Z

source/client/renderer/entity/MobRenderer.cpp

@@ -176,7 +176,7 @@ void MobRenderer::renderNameTag(Mob* mob, const std::string& str, float x, float

 	glPushMatrix();
 	glTranslatef(x + 0.0f, y + 2.3f, z);
-	glNormal3f(0.0f, 1.0f, 0.0f);


source/client/sound/SoundData.cpp

source/client/sound/SoundRepository.cpp

source/client/sound/SoundData.cpp

source/common/Logger.cpp

iProgramMC · 2024-06-19T05:54:40Z

Also worth noting that I don't really like giant PRs. Which is why I ask that you create separate PRs for different changes from now on.

TheBrokenRail · 2024-06-19T06:47:38Z

Yeah, sorry about that. I got a bit carried away (clearly).

TheBrokenRail · 2024-06-19T08:12:34Z

Also, I added tools/extract_apk.py. It just calls grabsounds,py and extracts the other assets to game/assets. I mainly created it because I got annoyed with having to figure out how to merge-copy the game assets into game/assets. It also shows a file chooser if you run it by itself, which should make it easier to use for beginners.

TheBrokenRail · 2025-01-04T05:50:03Z

When I get more time, I'm going to split this up into multiple PRs. Until then, I'll mark it as WIP.

* Fixed building on Windows * Added support for mob sounds * Added support for fire sounds

BrentDaMage · 2025-03-06T06:44:35Z

We should really be loading all of our SoundDesc structs dynamically based on the file hierarchy inside /assets/sounds. MCPE 0.12.1 has an "example" of this, even though it's getting most of its info from a JSON file.

* Re-enabled lighting & normals that were disabled due to merge * Re-added smooth outline rendering as fallback * Fixed OpenGL reference in CMake files

BrentDaMage · 2025-03-06T07:32:06Z

@TheBrokenRail Could you please fix the CMake files? Not sure why the SDL2 and GLES compatibility layer stuff is throwing back errors. I'm gonna make sure the Xcode project works for macOS and iOS tomorrow.

TheBrokenRail added 17 commits June 18, 2024 01:36

Attempt To Get CMake To Like MinGW

7e1940a

Some Fixes

8ee49a8

More CMake Fiexes!

73846e9

Decouple Audio Platforms

ad386d3

Try To Fix The Build Again

34baf62

Fix Cursed Symlink

7c268be

Please Work

37a8170

Maybe this will work?

0aae3d5

New Sound Script

3b5f465

Fancy Sound Loading

4d5d85e

Update GLES Layer

2e3a554

Fix macOS Build (Again)

fade654

Update GLES Compat Layer

f854bfc

I Dream Of Burning Macs

7a5c479

Some Final Fixes

cdd0b29

OpenAL On Windows

78b9dd2

Fix WASM Build

8414def

iProgramMC requested changes Jun 19, 2024

View reviewed changes

Fancy APK Extractor!

ba38e1f

Some Fixes

7cc2c5c

TheBrokenRail marked this pull request as draft January 4, 2025 05:50

Fix Merge Conflicts + Bugfixes

7786ce6

* Fixed building on Windows * Added support for mob sounds * Added support for fire sounds

Rendering Bugfixes

f4e028a

* Re-enabled lighting & normals that were disabled due to merge * Re-added smooth outline rendering as fallback * Fixed OpenGL reference in CMake files

BrentDaMage assigned BrentDaMage and TheBrokenRail Mar 6, 2025

BrentDaMage assigned iProgramMC Mar 6, 2025

BrentDaMage added enhancement New feature or request help wanted Extra attention is needed labels Mar 6, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

The Big CMake + MinGW + Sound PR #127

The Big CMake + MinGW + Sound PR #127

TheBrokenRail commented Jun 18, 2024 •

edited

Loading

iProgramMC Jun 19, 2024

TheBrokenRail Jun 19, 2024

iProgramMC Jun 19, 2024

iProgramMC Jun 19, 2024

TheBrokenRail Jun 19, 2024

iProgramMC Jun 19, 2024

TheBrokenRail Jun 19, 2024

iProgramMC Jun 19, 2024

iProgramMC commented Jun 19, 2024

TheBrokenRail commented Jun 19, 2024

TheBrokenRail commented Jun 19, 2024

TheBrokenRail commented Jan 4, 2025

BrentDaMage commented Mar 6, 2025

BrentDaMage commented Mar 6, 2025

The Big CMake + MinGW + Sound PR #127

Are you sure you want to change the base?

The Big CMake + MinGW + Sound PR #127

Conversation

TheBrokenRail commented Jun 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iProgramMC commented Jun 19, 2024

TheBrokenRail commented Jun 19, 2024

TheBrokenRail commented Jun 19, 2024

TheBrokenRail commented Jan 4, 2025

BrentDaMage commented Mar 6, 2025

BrentDaMage commented Mar 6, 2025

TheBrokenRail commented Jun 18, 2024 •

edited

Loading