Fixing stuff

2026-04-30 11:08:06 +03:00 · 2026-04-30 11:08:06 +03:00 · b98631a8c0
commit b98631a8c0
parent 2ee288cbe0
54 changed files with 9 additions and 9105309 deletions
--- a/audio/background.wav
+++ b/audio/background.wav
--- a/audio/lullaby-music-vol20-186394--online-audio-convert.com.ogg
+++ b/audio/lullaby-music-vol20-186394--online-audio-convert.com.ogg
--- a/proj-android/app/jni/src/CMakeLists.txt
+++ b/proj-android/app/jni/src/CMakeLists.txt
@ -52,6 +52,7 @@ add_library(main SHARED
        ../../../../src/planet/PlanetObject.cpp
        ../../../../src/planet/StoneObject.cpp
        ../../../../src/render/FrameBuffer.cpp
+        ../../../../src/render/ShadowMap.cpp
        ../../../../src/render/Renderer.cpp
        ../../../../src/render/ShaderManager.cpp
        ../../../../src/render/TextureManager.cpp
--- a/proj-web/CMakeLists.txt
+++ b/proj-web/CMakeLists.txt
@ -172,6 +172,7 @@ set(EMSCRIPTEN_LINK_FLAGS
    "--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/../resources/loading.png@resources/loading.png"
    "--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/../resources/shaders@resources/shaders"
    "--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/../resources/start.lua@resources/start.lua"
+    "--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/../resources/start2.lua@resources/start2.lua"
 	"--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/../audio@audio"
 )

--- a/proj-windows/CMakeLists.txt
+++ b/proj-windows/CMakeLists.txt
@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)

 # Build option (Windows-only): when ON, the game launches in fullscreen.
 # When OFF (default), it launches in a 1280x720 window like before.
-option(FULLSCREEN "Launch the game in fullscreen mode" OFF)
+option(FULLSCREEN "Launch the game in fullscreen mode" ON)

 include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ThirdParty.cmake)

--- a/resources/w/Zombie_BaseColor.png
+++ b/resources/w/Zombie_BaseColor.png
--- a/resources/w/bench001opt.txt
+++ b/resources/w/bench001opt.txt
--- a/resources/w/default_float001.txt
+++ b/resources/w/default_float001.txt
--- a/resources/w/default_float001_cut.txt
+++ b/resources/w/default_float001_cut.txt
--- a/resources/w/default_idle002.txt
+++ b/resources/w/default_idle002.txt
--- a/resources/w/default_walk001.txt
+++ b/resources/w/default_walk001.txt
--- a/resources/w/exterior/Segmented_Plane
+++ b/resources/w/exterior/Segmented_Plane
--- a/resources/w/exterior/Segmented_Plane.png
+++ b/resources/w/exterior/Segmented_Plane.png
--- a/resources/w/exterior/Segmented_Plane.txt
+++ b/resources/w/exterior/Segmented_Plane.txt
@ -1,37 +0,0 @@
-===Vertices (Split by UV/Normal): 16
-V 0: Pos(-33.333332, -100.0, 0.0) Norm(0.0, 0.0, 1.0) UV(0.333333, 0.0)
-V 1: Pos(-100.0, -33.333332, 0.0) Norm(0.0, 0.0, 1.0) UV(0.0, 0.333333)
-V 2: Pos(-100.0, -100.0, 0.0) Norm(0.0, 0.0, 1.0) UV(0.0, 0.0)
-V 3: Pos(33.333336, -100.0, 0.0) Norm(0.0, 0.0, 1.0) UV(0.666667, 0.0)
-V 4: Pos(-33.333332, -33.333332, 0.0) Norm(0.0, 0.0, 1.0) UV(0.333333, 0.333333)
-V 5: Pos(100.0, -100.0, 0.0) Norm(0.0, 0.0, 1.0) UV(1.0, 0.0)
-V 6: Pos(33.333336, -33.333332, 0.0) Norm(0.0, 0.0, 1.0) UV(0.666667, 0.333333)
-V 7: Pos(-100.0, 33.333336, 0.0) Norm(0.0, 0.0, 1.0) UV(0.0, 0.666667)
-V 8: Pos(-33.333332, 33.333336, 0.0) Norm(0.0, 0.0, 1.0) UV(0.333333, 0.666667)
-V 9: Pos(100.0, -33.333332, 0.0) Norm(0.0, 0.0, 1.0) UV(1.0, 0.333333)
-V 10: Pos(33.333336, 33.333336, 0.0) Norm(0.0, 0.0, 1.0) UV(0.666667, 0.666667)
-V 11: Pos(-100.0, 100.0, 0.0) Norm(0.0, 0.0, 1.0) UV(0.0, 1.0)
-V 12: Pos(-33.333332, 100.0, 0.0) Norm(0.0, 0.0, 1.0) UV(0.333333, 1.0)
-V 13: Pos(100.0, 33.333336, 0.0) Norm(0.0, 0.0, 1.0) UV(1.0, 0.666667)
-V 14: Pos(33.333336, 100.0, 0.0) Norm(0.0, 0.0, 1.0) UV(0.666667, 1.0)
-V 15: Pos(100.0, 100.0, 0.0) Norm(0.0, 0.0, 1.0) UV(1.0, 1.0)
-
-===Triangles (Indices): 18
-Tri: 0 1 2
-Tri: 3 4 0
-Tri: 5 6 3
-Tri: 4 7 1
-Tri: 6 8 4
-Tri: 9 10 6
-Tri: 8 11 7
-Tri: 10 12 8
-Tri: 13 14 10
-Tri: 0 4 1
-Tri: 3 6 4
-Tri: 5 9 6
-Tri: 4 8 7
-Tri: 6 10 8
-Tri: 9 13 10
-Tri: 8 12 11
-Tri: 10 14 12
-Tri: 13 15 14
--- a/resources/w/exterior/tree001.txt
+++ b/resources/w/exterior/tree001.txt
--- a/resources/w/float_attack003.txt
+++ b/resources/w/float_attack003.txt
--- a/resources/w/float_attack003_cut.txt
+++ b/resources/w/float_attack003_cut.txt
--- a/resources/w/gg/gg_action_attack001.txt
+++ b/resources/w/gg/gg_action_attack001.txt
--- a/resources/w/gg/gg_action_chop001.txt
+++ b/resources/w/gg/gg_action_chop001.txt
--- a/resources/w/gg/gg_action_idle001.txt
+++ b/resources/w/gg/gg_action_idle001.txt
--- a/resources/w/gg/gg_action_idle002.txt
+++ b/resources/w/gg/gg_action_idle002.txt
--- a/resources/w/gg/gg_action_stab001.txt
+++ b/resources/w/gg/gg_action_stab001.txt
--- a/resources/w/gg/gg_action_to_stand001.txt
+++ b/resources/w/gg/gg_action_to_stand001.txt
--- a/resources/w/gg/gg_stand_idle001.txt
+++ b/resources/w/gg/gg_stand_idle001.txt
--- a/resources/w/gg/gg_stand_to_action002.txt
+++ b/resources/w/gg/gg_stand_to_action002.txt
--- a/resources/w/gg/gg_walking001.txt
+++ b/resources/w/gg/gg_walking001.txt
--- a/resources/w/gg/knife001.txt
+++ b/resources/w/gg/knife001.txt
@ -1,64 +0,0 @@
-===Vertices (Split by UV/Normal): 41
-V 0: Pos(0.02, 0.15, 0.0) Norm(0.577338, 0.577356, -0.577357) UV(0.77503, 0.750033)
-V 1: Pos(-0.02, -0.15, 0.0) Norm(-0.577338, -0.577356, -0.577357) UV(0.808365, 0.500022)
-V 2: Pos(-0.02, 0.15, 0.0) Norm(-0.577347, 0.577357, -0.577347) UV(0.808365, 0.750033)
-V 3: Pos(0.02, -0.15, 0.6) Norm(0.577338, -0.577356, 0.577357) UV(0.866701, 0.496276)
-V 4: Pos(-0.02, 0.15, 0.6) Norm(-0.577338, 0.577356, 0.577357) UV(0.833366, 0.746287)
-V 5: Pos(-0.02, -0.15, 0.6) Norm(-0.577347, -0.577357, 0.577347) UV(0.833366, 0.496276)
-V 6: Pos(0.02, -0.15, 0.0) Norm(0.577347, -0.577357, -0.577347) UV(0.833366, 0.496276)
-V 7: Pos(-0.02, -0.15, 0.6) Norm(-0.577347, -0.577357, 0.577347) UV(0.866701, 0.0)
-V 8: Pos(-0.02, -0.15, 0.0) Norm(-0.577338, -0.577356, -0.577357) UV(0.866701, 0.496276)
-V 9: Pos(0.02, 0.15, 0.0) Norm(0.577338, 0.577356, -0.577357) UV(0.500022, 0.5)
-V 10: Pos(0.02, -0.15, 0.6) Norm(0.577338, -0.577356, 0.577357) UV(0.750033, 0.0)
-V 11: Pos(0.02, -0.15, 0.0) Norm(0.577347, -0.577357, -0.577347) UV(0.750033, 0.5)
-V 12: Pos(-0.02, 0.15, 0.0) Norm(-0.577347, 0.577357, -0.577347) UV(0.77503, 0.500022)
-V 13: Pos(0.02, 0.15, 0.6) Norm(0.577347, 0.577357, 0.577347) UV(0.808365, 0.0)
-V 14: Pos(0.02, 0.15, 0.0) Norm(0.577338, 0.577356, -0.577357) UV(0.808365, 0.500022)
-V 15: Pos(-0.02, -0.15, 0.0) Norm(-0.577338, -0.577356, -0.577357) UV(0.500022, 1.0)
-V 16: Pos(-0.02, 0.15, 0.6) Norm(-0.577338, 0.577356, 0.577357) UV(0.750033, 0.5)
-V 17: Pos(-0.02, 0.15, 0.0) Norm(-0.577347, 0.577357, -0.577347) UV(0.750033, 1.0)
-V 18: Pos(0.015, 0.15, 0.6) Norm(0.583227, 0.576373, -0.572398) UV(0.8667, 0.250011)
-V 19: Pos(-0.015, -0.15, 0.6) Norm(-0.570792, -0.648582, -0.503526) UV(0.891702, 0.0)
-V 20: Pos(-0.015, 0.15, 0.6) Norm(-0.583229, 0.576375, -0.572394) UV(0.891702, 0.250011)
-V 21: Pos(0.0, 0.05, 1.4) Norm(0.0, -0.417006, 0.908904) UV(0.166674, 0.0)
-V 22: Pos(-0.015, 0.15, 0.6) Norm(-0.583229, 0.576375, -0.572394) UV(0.250011, 0.666784)
-V 23: Pos(-0.015, -0.15, 0.6) Norm(-0.570792, -0.648582, -0.503526) UV(0.0, 0.666784)
-V 24: Pos(0.015, 0.15, 0.6) Norm(0.583227, 0.576373, -0.572398) UV(0.250011, 0.666784)
-V 25: Pos(0.0, 0.05, 1.4) Norm(0.0, -0.417006, 0.908904) UV(0.333348, 0.0)
-V 26: Pos(0.015, -0.15, 0.6) Norm(0.570794, -0.648585, -0.50352) UV(0.500022, 0.666784)
-V 27: Pos(-0.015, -0.15, 0.6) Norm(-0.570792, -0.648582, -0.503526) UV(0.77503, 0.68218)
-V 28: Pos(0.015, -0.15, 0.6) Norm(0.570794, -0.648585, -0.50352) UV(0.750033, 0.681722)
-V 29: Pos(0.0, 0.05, 1.4) Norm(0.0, -0.417006, 0.908904) UV(0.77503, 0.0)
-V 30: Pos(-0.015, 0.15, 0.6) Norm(-0.583229, 0.576375, -0.572394) UV(0.808365, 0.666696)
-V 31: Pos(0.0, 0.15, 1.4) Norm(0.0, 0.536928, 0.843628) UV(0.820865, 0.0)
-V 32: Pos(0.015, 0.15, 0.6) Norm(0.583227, 0.576373, -0.572398) UV(0.833366, 0.666696)
-V 33: Pos(0.02, -0.15, 0.0) Norm(0.577347, -0.577357, -0.577347) UV(0.77503, 0.500022)
-V 34: Pos(0.02, 0.15, 0.6) Norm(0.577347, 0.577357, 0.577347) UV(0.866701, 0.746287)
-V 35: Pos(0.02, -0.15, 0.6) Norm(0.577338, -0.577356, 0.577357) UV(0.833366, 0.0)
-V 36: Pos(0.02, 0.15, 0.6) Norm(0.577347, 0.577357, 0.577347) UV(0.500022, 0.0)
-V 37: Pos(-0.02, 0.15, 0.6) Norm(-0.577338, 0.577356, 0.577357) UV(0.77503, 0.0)
-V 38: Pos(-0.02, -0.15, 0.6) Norm(-0.577347, -0.577357, 0.577347) UV(0.500022, 0.5)
-V 39: Pos(0.015, -0.15, 0.6) Norm(0.570794, -0.648585, -0.50352) UV(0.8667, 0.0)
-V 40: Pos(0.0, 0.15, 1.4) Norm(0.0, 0.536928, 0.843628) UV(0.250011, 0.0)
-
-===Triangles (Indices): 20
-Tri: 0 1 2
-Tri: 3 4 5
-Tri: 6 7 8
-Tri: 9 10 11
-Tri: 12 13 14
-Tri: 15 16 17
-Tri: 18 19 20
-Tri: 21 22 23
-Tri: 24 25 26
-Tri: 27 28 29
-Tri: 30 31 32
-Tri: 0 33 1
-Tri: 3 34 4
-Tri: 6 35 7
-Tri: 9 36 10
-Tri: 12 37 13
-Tri: 15 38 16
-Tri: 18 39 19
-Tri: 21 40 22
-Tri: 24 40 25
--- a/resources/w/gg/new/gg_action_to_stand001.txt
+++ b/resources/w/gg/new/gg_action_to_stand001.txt
--- a/resources/w/gg/new/gg_die001.txt
+++ b/resources/w/gg/new/gg_die001.txt
--- a/resources/w/gg/new/gg_die_idle001.txt
+++ b/resources/w/gg/new/gg_die_idle001.txt
--- a/resources/w/gg/new/gg_stand_idle001.txt
+++ b/resources/w/gg/new/gg_stand_idle001.txt
--- a/resources/w/gg/new/gg_stand_to_action001.txt
+++ b/resources/w/gg/new/gg_stand_to_action001.txt
--- a/resources/w/gg/new/gg_walk001.txt
+++ b/resources/w/gg/new/gg_walk001.txt
--- a/resources/w/jam/man_stand_idle001.txt
+++ b/resources/w/jam/man_stand_idle001.txt
--- a/resources/w/jam/man_stand_idle002.txt
+++ b/resources/w/jam/man_stand_idle002.txt
--- a/resources/w/jam/man_walk001.txt
+++ b/resources/w/jam/man_walk001.txt
--- a/resources/w/jam/man_walk002.txt
+++ b/resources/w/jam/man_walk002.txt
--- a/resources/w/jam/salesperson_stand_idle003.txt
+++ b/resources/w/jam/salesperson_stand_idle003.txt
--- a/resources/w/jam/salesperson_stand_idle004.txt
+++ b/resources/w/jam/salesperson_stand_idle004.txt
--- a/resources/w/jam/salesperson_walk001.txt
+++ b/resources/w/jam/salesperson_walk001.txt
--- a/resources/w/jam/woman_idle001.txt
+++ b/resources/w/jam/woman_idle001.txt
--- a/resources/w/jam/woman_idle002.txt
+++ b/resources/w/jam/woman_idle002.txt
--- a/resources/w/jam/woman_walk001.txt
+++ b/resources/w/jam/woman_walk001.txt
--- a/resources/w/jam/woman_walk002.txt
+++ b/resources/w/jam/woman_walk002.txt
--- a/resources/w/new_anims/gg_run003.txt
+++ b/resources/w/new_anims/gg_run003.txt
--- a/resources/w/new_anims/gg_stand_idle003.txt
+++ b/resources/w/new_anims/gg_stand_idle003.txt
--- a/resources/w/room001.txt
+++ b/resources/w/room001.txt
--- a/resources/w/room002.txt
+++ b/resources/w/room002.txt
--- a/resources/w/zombie002.anim
+++ b/resources/w/zombie002.anim
--- a/resources/w/zombie002.txt
+++ b/resources/w/zombie002.txt
--- a/resources/w/zombie_idle001.anim
+++ b/resources/w/zombie_idle001.anim
--- a/resources/w/zombie_idle001.txt
+++ b/resources/w/zombie_idle001.txt
--- a/src/Game.cpp
+++ b/src/Game.cpp
@ -512,16 +512,16 @@ namespace ZL
 			if (event.type == SDL_KEYDOWN && event.key.repeat == 0) {
 				switch (event.key.keysym.sym) {
 				case SDLK_1:
-					if (audioPlayer) audioPlayer->playSoundAsync("audio/background.wav");
+					//if (audioPlayer) audioPlayer->playSoundAsync("audio/background.wav");
 					break;
 				case SDLK_2:
-					if (audioPlayer) audioPlayer->playMusicAsync("audio/lullaby-music-vol20-186394--online-audio-convert.com.ogg");
+					//if (audioPlayer) audioPlayer->playMusicAsync("audio/lullaby-music-vol20-186394--online-audio-convert.com.ogg");
 					break;
 				case SDLK_3:
-					if (audioPlayer) audioPlayer->stopMusicAsync();
+					//if (audioPlayer) audioPlayer->stopMusicAsync();
 					break;
 				case SDLK_f:
-					currentLocation->dialogueSystem.startDialogue("test_choice_dialogue");
+					//currentLocation->dialogueSystem.startDialogue("test_choice_dialogue");
 					break;

 				case SDLK_e:
--- a/src/dialogue/DialogueOverlay.cpp
+++ b/src/dialogue/DialogueOverlay.cpp
@ -151,7 +151,8 @@ void DialogueOverlay::drawDialogue(Renderer& renderer, const PresentationModel&
        nameRenderer->drawText(model.speaker, nameX, nameY, 1.0f, false, { 1.0f, 0.88f, 0.45f, 1.0f });
    }

-    const std::string wrappedBody = wrapText(model.visibleText, 90);
+    //const std::string wrappedBody = wrapText(model.visibleText, 90);
+    const std::string wrappedBody = wrapText(model.visibleText, 56);
    bodyRenderer->drawText(wrappedBody, bodyX, bodyY, 1.0f, false, { 1.0f, 1.0f, 1.0f, 1.0f });

    lastChoiceRects.clear();