From 818aa7cfeebe9f9fe0df113b5511681158de2be0 Mon Sep 17 00:00:00 2001 From: OusmBlueNinja <89956790+OusmBlueNinja@users.noreply.github.com> Date: Wed, 30 Apr 2025 18:28:04 -0500 Subject: [PATCH] Fixed Some bugs and added better deprication stuff --- .vscode/settings.json | 3 +- imgui.ini | 88 ++-- remake.yaml | 2 + remake/.remake_cache.json | 1 + remake/build.log | 3 +- src/assets/scenes/Colors.cene | 459 +++++++++++--------- src/src/Components/AudioPlayerComponent.cpp | 10 +- src/src/Renderer.cpp | 2 + src/src/core/audio/AudioEngine.h | 3 +- src/src/core/utils/Logging.cpp | 88 ++++ src/src/core/utils/Logging.h | 37 +- 11 files changed, 429 insertions(+), 267 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index aabe41d..8005d4a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -80,6 +80,7 @@ "future": "cpp", "any": "cpp", "ranges": "cpp", - "unordered_set": "cpp" + "unordered_set": "cpp", + "source_location": "cpp" } } \ No newline at end of file diff --git a/imgui.ini b/imgui.ini index 7d73abf..d730865 100644 --- a/imgui.ini +++ b/imgui.ini @@ -10,40 +10,40 @@ Collapsed=1 [Window][WindowOverViewport_11111111] Pos=0,19 -Size=1280,701 +Size=1920,1158 Collapsed=0 [Window][Inspector] -Pos=991,19 -Size=289,701 +Pos=1553,19 +Size=367,860 Collapsed=0 -DockId=0x00000017,0 +DockId=0x00000018,0 [Window][Scene Tree] Pos=0,19 -Size=342,348 +Size=342,575 Collapsed=0 DockId=0x00000003,0 [Window][Viewport] Pos=344,19 -Size=645,390 +Size=1207,860 Collapsed=0 -DockId=0x00000007,0 +DockId=0x00000017,0 [Window][##MainMenuBar] Size=1280,19 Collapsed=0 [Window][Performance Info] -Pos=978,592 -Size=302,128 +Pos=1430,881 +Size=490,296 Collapsed=0 -DockId=0x00000011,0 +DockId=0x0000000F,0 [Window][Console] -Pos=344,411 -Size=541,139 +Pos=344,881 +Size=1448,125 Collapsed=0 DockId=0x00000013,0 @@ -51,11 +51,11 @@ DockId=0x00000013,0 Pos=265,19 Size=1263,674 Collapsed=0 -DockId=0x00000007,1 +DockId=0x00000017,1 [Window][Profiler] -Pos=344,552 -Size=541,168 +Pos=344,1008 +Size=1448,169 Collapsed=0 DockId=0x00000014,0 @@ -63,29 +63,29 @@ DockId=0x00000014,0 Pos=265,69 Size=623,651 Collapsed=0 -DockId=0x00000013,1 +DockId=0x00000015,1 [Window][Profiler (Unity Style)] Pos=265,430 Size=623,290 Collapsed=0 -DockId=0x00000013,1 +DockId=0x00000015,1 [Window][Profiler Timeline View] Pos=265,526 Size=1263,651 Collapsed=0 -DockId=0x00000013,1 +DockId=0x00000015,1 [Window][Color Correction] -Pos=1131,592 -Size=149,128 +Pos=1669,881 +Size=251,296 Collapsed=0 -DockId=0x00000012,0 +DockId=0x00000010,0 [Window][Asset Browser] -Pos=0,369 -Size=342,351 +Pos=0,596 +Size=342,581 Collapsed=0 DockId=0x00000004,0 @@ -110,44 +110,44 @@ DockId=0x0000000C,0 Pos=978,460 Size=302,260 Collapsed=0 -DockId=0x0000000F,0 +DockId=0x0000000E,0 [Window][Audio Output] -Pos=887,411 -Size=102,309 +Pos=1794,881 +Size=126,296 Collapsed=0 -DockId=0x00000016,0 +DockId=0x00000012,0 [Window][Master Bus] Pos=1003,570 Size=277,150 Collapsed=0 -DockId=0x00000018,0 +DockId=0x0000000D,0 [Docking][Data] -DockSpace ID=0x11111111 Window=0x1BBC0F80 Pos=0,19 Size=1280,701 Split=X +DockSpace ID=0x11111111 Window=0x1BBC0F80 Pos=0,19 Size=1920,1158 Split=X DockNode ID=0x00000005 Parent=0x11111111 SizeRef=989,1158 Split=X DockNode ID=0x00000001 Parent=0x00000005 SizeRef=342,701 Split=Y Selected=0x12EF0F59 DockNode ID=0x00000003 Parent=0x00000001 SizeRef=342,575 HiddenTabBar=1 Selected=0x12EF0F59 DockNode ID=0x00000004 Parent=0x00000001 SizeRef=342,581 HiddenTabBar=1 Selected=0x36AF052B - DockNode ID=0x00000002 Parent=0x00000005 SizeRef=645,701 Split=Y Selected=0xC450F867 - DockNode ID=0x00000007 Parent=0x00000002 SizeRef=606,847 CentralNode=1 HiddenTabBar=1 Selected=0xC450F867 - DockNode ID=0x00000008 Parent=0x00000002 SizeRef=606,309 Split=X Selected=0xEA83D666 - DockNode ID=0x00000015 Parent=0x00000008 SizeRef=541,172 Split=Y Selected=0xEA83D666 - DockNode ID=0x00000013 Parent=0x00000015 SizeRef=553,139 HiddenTabBar=1 Selected=0xEA83D666 - DockNode ID=0x00000014 Parent=0x00000015 SizeRef=553,168 HiddenTabBar=1 Selected=0x9B5D3198 - DockNode ID=0x00000016 Parent=0x00000008 SizeRef=102,172 HiddenTabBar=1 Selected=0x56009A08 + DockNode ID=0x00000002 Parent=0x00000005 SizeRef=1484,701 Split=Y Selected=0xC450F867 + DockNode ID=0x00000007 Parent=0x00000002 SizeRef=606,860 Split=X Selected=0xC450F867 + DockNode ID=0x00000017 Parent=0x00000007 SizeRef=1207,860 CentralNode=1 HiddenTabBar=1 Selected=0xC450F867 + DockNode ID=0x00000018 Parent=0x00000007 SizeRef=367,860 HiddenTabBar=1 Selected=0x36DC96AB + DockNode ID=0x00000008 Parent=0x00000002 SizeRef=606,296 Split=X Selected=0xEA83D666 + DockNode ID=0x00000015 Parent=0x00000008 SizeRef=1291,172 Split=X Selected=0xEA83D666 + DockNode ID=0x00000011 Parent=0x00000015 SizeRef=1448,168 Split=Y Selected=0x9B5D3198 + DockNode ID=0x00000013 Parent=0x00000011 SizeRef=1449,125 HiddenTabBar=1 Selected=0xEA83D666 + DockNode ID=0x00000014 Parent=0x00000011 SizeRef=1449,169 HiddenTabBar=1 Selected=0x9B5D3198 + DockNode ID=0x00000012 Parent=0x00000015 SizeRef=126,168 HiddenTabBar=1 Selected=0x56009A08 + DockNode ID=0x00000016 Parent=0x00000008 SizeRef=283,172 Split=X Selected=0x56009A08 + DockNode ID=0x0000000F Parent=0x00000016 SizeRef=140,296 HiddenTabBar=1 Selected=0x3FC1A724 + DockNode ID=0x00000010 Parent=0x00000016 SizeRef=148,296 HiddenTabBar=1 Selected=0xA873C17F DockNode ID=0x00000006 Parent=0x11111111 SizeRef=289,1158 Split=Y Selected=0x36DC96AB DockNode ID=0x00000009 Parent=0x00000006 SizeRef=449,488 Split=Y Selected=0x36DC96AB DockNode ID=0x0000000B Parent=0x00000009 SizeRef=449,556 Split=Y Selected=0x36DC96AB - DockNode ID=0x0000000D Parent=0x0000000B SizeRef=449,439 Split=Y Selected=0x36DC96AB - DockNode ID=0x00000017 Parent=0x0000000D SizeRef=277,549 HiddenTabBar=1 Selected=0x36DC96AB - DockNode ID=0x00000018 Parent=0x0000000D SizeRef=277,150 Selected=0x96A8354B - DockNode ID=0x0000000E Parent=0x0000000B SizeRef=449,260 Split=Y Selected=0x9D7E7171 - DockNode ID=0x0000000F Parent=0x0000000E SizeRef=302,215 HiddenTabBar=1 Selected=0x9D7E7171 - DockNode ID=0x00000010 Parent=0x0000000E SizeRef=302,213 Split=X Selected=0x3FC1A724 - DockNode ID=0x00000011 Parent=0x00000010 SizeRef=151,213 HiddenTabBar=1 Selected=0x3FC1A724 - DockNode ID=0x00000012 Parent=0x00000010 SizeRef=149,213 HiddenTabBar=1 Selected=0xA873C17F + DockNode ID=0x0000000D Parent=0x0000000B SizeRef=449,860 Selected=0x36DC96AB + DockNode ID=0x0000000E Parent=0x0000000B SizeRef=449,296 HiddenTabBar=1 Selected=0x9D7E7171 DockNode ID=0x0000000C Parent=0x00000009 SizeRef=449,143 HiddenTabBar=1 Selected=0xB6C74292 DockNode ID=0x0000000A Parent=0x00000006 SizeRef=449,211 HiddenTabBar=1 Selected=0xD83E5DD3 diff --git a/remake.yaml b/remake.yaml index e3ddb59..906b893 100644 --- a/remake.yaml +++ b/remake.yaml @@ -40,6 +40,7 @@ cc: gcc cflags: - -std=c99 - -Wall + - -g # C++ compiler and flags cxx: g++ @@ -59,6 +60,7 @@ auto_libs: - comdlg32 - ssl - crypto + - dbghelp auto_includes: - imgui diff --git a/remake/.remake_cache.json b/remake/.remake_cache.json index c59484a..a2fade9 100644 --- a/remake/.remake_cache.json +++ b/remake/.remake_cache.json @@ -7,5 +7,6 @@ "comdlg32": "C:\\msys64\\mingw64\\lib\\libcomdlg32.a", "ssl": "C:\\msys64\\mingw64\\lib\\libssl.a", "crypto": "C:\\msys64\\mingw64\\lib\\libcrypto.a", + "dbghelp": "C:\\msys64\\mingw64\\lib\\libdbghelp.a", "imgui": "src\\vendor\\imgui" } \ No newline at end of file diff --git a/remake/build.log b/remake/build.log index d8bc0bc..49892df 100644 --- a/remake/build.log +++ b/remake/build.log @@ -1,3 +1,2 @@ -[COMPILE] g++ -std=c++20 -Wall -g -Isrc/include -Isrc/include/lua -Isrc/vendor -Isrc/vendor/imgui -Isrc/vendor/box2d -Isrc/vendor/xxhash -Isrc/vendor/miniaudio -IC:/msys64/mingw64/include -Isrc\vendor\imgui -IC:\msys64\mingw64\lib\libyaml-cpp.a -MMD -MP -c src\src\editor\windows\AudioInfo.cpp -o src\build\editor\windows\AudioInfo.o -[LINK] g++ src\build\Engine.o src\build\main.o src\build\Renderer.o src\build\Components\AnimationComponent.o src\build\Components\AudioPlayerComponent.o src\build\Components\CameraComponent.o src\build\Components\LightComponent.o src\build\Components\ParticleComponent.o src\build\Components\PhysicsComponent.o src\build\Components\ScriptComponent.o src\build\Components\SpriteComponent.o src\build\Components\TextComonent.o src\build\Components\TilemapComponent.o src\build\core\audio\AudioEngine.o src\build\core\utils\AssetManager.o src\build\core\utils\EngineConfig.o src\build\core\utils\ExceptionHandler.o src\build\core\utils\FileDialog.o src\build\core\utils\input.o src\build\core\utils\LoadingWindow.o src\build\core\utils\Logging.o src\build\core\utils\Profiler.o src\build\core\utils\Texture.o src\build\core\utils\utils.o src\build\editor\windows\AssetBrowser.o src\build\editor\windows\AudioInfo.o src\build\editor\windows\Inspector.o src\build\Entitys\Object.o src\build\utils\GameObjectsList.o src\build\utils\Shader.o src\build\utils\UID.o src\build\lapi.o src\build\lauxlib.o src\build\lbaselib.o src\build\lcode.o src\build\lcorolib.o src\build\lctype.o src\build\ldblib.o src\build\ldebug.o src\build\ldo.o src\build\ldump.o src\build\lfunc.o src\build\lgc.o src\build\linit.o src\build\liolib.o src\build\llex.o src\build\lmathlib.o src\build\lmem.o src\build\loadlib.o src\build\lobject.o src\build\lopcodes.o src\build\loslib.o src\build\lparser.o src\build\lstate.o src\build\lstring.o src\build\lstrlib.o src\build\ltable.o src\build\ltablib.o src\build\ltm.o src\build\lua.o src\build\luac.o src\build\lundump.o src\build\lutf8lib.o src\build\lvm.o src\build\lzio.o src\build\imgui.o src\build\imgui_demo.o src\build\imgui_draw.o src\build\imgui_impl_glfw.o src\build\imgui_impl_opengl3.o src\build\imgui_tables.o src\build\imgui_widgets.o src\build\aabb.o src\build\arena_allocator.o src\build\array.o src\build\bitset.o src\build\body.o src\build\broad_phase.o src\build\constraint_graph.o src\build\contact.o src\build\contact_solver.o src\build\core.o src\build\distance.o src\build\distance_joint.o src\build\dynamic_tree.o src\build\geometry.o src\build\hull.o src\build\id_pool.o src\build\island.o src\build\joint.o src\build\manifold.o src\build\math_functions.o src\build\motor_joint.o src\build\mouse_joint.o src\build\mover.o src\build\prismatic_joint.o src\build\revolute_joint.o src\build\sensor.o src\build\shape.o src\build\solver.o src\build\solver_set.o src\build\table.o src\build\timer.o src\build\types.o src\build\weld_joint.o src\build\wheel_joint.o src\build\world.o src\build\xxhash.o src\build\miniaudio.o -o src\build\app.exe -LC:\msys64\mingw64\lib -lglfw3 -lglew32 -lopengl32 -lgdi32 -lyaml-cpp -lcomdlg32 -lssl -lcrypto +[LINK] g++ src\build\Engine.o src\build\main.o src\build\Renderer.o src\build\Components\AnimationComponent.o src\build\Components\AudioPlayerComponent.o src\build\Components\CameraComponent.o src\build\Components\LightComponent.o src\build\Components\ParticleComponent.o src\build\Components\PhysicsComponent.o src\build\Components\ScriptComponent.o src\build\Components\SpriteComponent.o src\build\Components\TextComonent.o src\build\Components\TilemapComponent.o src\build\core\audio\AudioEngine.o src\build\core\utils\AssetManager.o src\build\core\utils\EngineConfig.o src\build\core\utils\ExceptionHandler.o src\build\core\utils\FileDialog.o src\build\core\utils\input.o src\build\core\utils\LoadingWindow.o src\build\core\utils\Logging.o src\build\core\utils\Profiler.o src\build\core\utils\Texture.o src\build\core\utils\utils.o src\build\editor\windows\AssetBrowser.o src\build\editor\windows\AudioInfo.o src\build\editor\windows\Inspector.o src\build\Entitys\Object.o src\build\utils\GameObjectsList.o src\build\utils\Shader.o src\build\utils\UID.o src\build\lapi.o src\build\lauxlib.o src\build\lbaselib.o src\build\lcode.o src\build\lcorolib.o src\build\lctype.o src\build\ldblib.o src\build\ldebug.o src\build\ldo.o src\build\ldump.o src\build\lfunc.o src\build\lgc.o src\build\linit.o src\build\liolib.o src\build\llex.o src\build\lmathlib.o src\build\lmem.o src\build\loadlib.o src\build\lobject.o src\build\lopcodes.o src\build\loslib.o src\build\lparser.o src\build\lstate.o src\build\lstring.o src\build\lstrlib.o src\build\ltable.o src\build\ltablib.o src\build\ltm.o src\build\lua.o src\build\luac.o src\build\lundump.o src\build\lutf8lib.o src\build\lvm.o src\build\lzio.o src\build\imgui.o src\build\imgui_demo.o src\build\imgui_draw.o src\build\imgui_impl_glfw.o src\build\imgui_impl_opengl3.o src\build\imgui_tables.o src\build\imgui_widgets.o src\build\aabb.o src\build\arena_allocator.o src\build\array.o src\build\bitset.o src\build\body.o src\build\broad_phase.o src\build\constraint_graph.o src\build\contact.o src\build\contact_solver.o src\build\core.o src\build\distance.o src\build\distance_joint.o src\build\dynamic_tree.o src\build\geometry.o src\build\hull.o src\build\id_pool.o src\build\island.o src\build\joint.o src\build\manifold.o src\build\math_functions.o src\build\motor_joint.o src\build\mouse_joint.o src\build\mover.o src\build\prismatic_joint.o src\build\revolute_joint.o src\build\sensor.o src\build\shape.o src\build\solver.o src\build\solver_set.o src\build\table.o src\build\timer.o src\build\types.o src\build\weld_joint.o src\build\wheel_joint.o src\build\world.o src\build\xxhash.o src\build\miniaudio.o -o src\build\app.exe -LC:\msys64\mingw64\lib -lglfw3 -lglew32 -lopengl32 -lgdi32 -lyaml-cpp -lcomdlg32 -lssl -lcrypto -ldbghelp [RUN] Executed app.exe successfully. diff --git a/src/assets/scenes/Colors.cene b/src/assets/scenes/Colors.cene index 82e9a1e..adcac04 100644 --- a/src/assets/scenes/Colors.cene +++ b/src/assets/scenes/Colors.cene @@ -1,6 +1,6 @@ engine_version: 0.1.0 scene_name: Colors -scene_hash: 45f41906b825a0458fca86b63f14e3fb7880343086b79c4f545b3f40e744b258 +scene_hash: 18be1b7e4b196f0a9edd24775aa0c589aa92b14860c781eaff7bd459dd4b16c4 format_version: 1 objects: - name: Pebble_0 @@ -12,8 +12,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_1 @@ -25,8 +25,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_2 @@ -38,8 +38,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_3 @@ -51,8 +51,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_4 @@ -64,8 +64,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_5 @@ -77,8 +77,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_6 @@ -90,8 +90,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_7 @@ -103,8 +103,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_8 @@ -116,8 +116,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_9 @@ -129,8 +129,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_10 @@ -142,8 +142,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_11 @@ -155,8 +155,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_12 @@ -168,8 +168,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_13 @@ -181,8 +181,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_14 @@ -194,8 +194,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_15 @@ -207,8 +207,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_16 @@ -220,8 +220,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_17 @@ -233,8 +233,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_18 @@ -246,8 +246,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_19 @@ -259,8 +259,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_20 @@ -272,8 +272,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_21 @@ -285,8 +285,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_22 @@ -298,8 +298,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 3 + normalMap: 3 renderType: Lit children: [] - name: Pebble_23 @@ -311,8 +311,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_24 @@ -324,8 +324,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_25 @@ -337,8 +337,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_26 @@ -350,8 +350,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_27 @@ -363,8 +363,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_28 @@ -376,8 +376,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_29 @@ -389,8 +389,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_30 @@ -402,8 +402,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_31 @@ -415,8 +415,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_32 @@ -428,8 +428,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_33 @@ -441,8 +441,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_34 @@ -454,8 +454,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_35 @@ -467,8 +467,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_36 @@ -480,8 +480,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_37 @@ -493,8 +493,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_38 @@ -506,8 +506,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_39 @@ -519,8 +519,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_40 @@ -532,8 +532,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_41 @@ -545,8 +545,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_42 @@ -558,8 +558,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_43 @@ -571,8 +571,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_44 @@ -584,8 +584,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_45 @@ -597,8 +597,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_46 @@ -610,8 +610,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_47 @@ -623,8 +623,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_48 @@ -636,8 +636,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_49 @@ -649,8 +649,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_50 @@ -662,8 +662,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_51 @@ -675,8 +675,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_52 @@ -688,8 +688,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_53 @@ -701,8 +701,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_54 @@ -714,8 +714,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_55 @@ -727,8 +727,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_56 @@ -740,8 +740,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_57 @@ -753,8 +753,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_58 @@ -766,8 +766,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_59 @@ -779,8 +779,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_60 @@ -792,8 +792,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_61 @@ -805,8 +805,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_62 @@ -818,8 +818,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_63 @@ -831,8 +831,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_64 @@ -844,8 +844,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_65 @@ -857,8 +857,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_66 @@ -870,8 +870,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_67 @@ -883,8 +883,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_68 @@ -896,8 +896,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_69 @@ -909,8 +909,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_70 @@ -922,8 +922,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_71 @@ -935,8 +935,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_72 @@ -948,8 +948,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_73 @@ -961,8 +961,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_74 @@ -974,8 +974,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_75 @@ -987,8 +987,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_76 @@ -1000,8 +1000,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_77 @@ -1013,8 +1013,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_78 @@ -1026,8 +1026,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_79 @@ -1039,8 +1039,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_80 @@ -1052,8 +1052,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_81 @@ -1065,8 +1065,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_82 @@ -1078,8 +1078,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_83 @@ -1091,8 +1091,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_84 @@ -1104,8 +1104,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_85 @@ -1117,8 +1117,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_86 @@ -1130,8 +1130,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_87 @@ -1143,8 +1143,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_88 @@ -1156,8 +1156,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_89 @@ -1169,8 +1169,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_90 @@ -1182,8 +1182,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_91 @@ -1195,8 +1195,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_92 @@ -1208,8 +1208,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_93 @@ -1221,8 +1221,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_94 @@ -1234,8 +1234,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_95 @@ -1247,8 +1247,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_96 @@ -1260,8 +1260,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_97 @@ -1273,8 +1273,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_98 @@ -1286,8 +1286,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Pebble_99 @@ -1299,8 +1299,8 @@ objects: visable: true components: - type: SpriteComponent - texture: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png - normalMap: C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png + texture: 2 + normalMap: 3 renderType: Lit children: [] - name: Light_0 @@ -3128,10 +3128,65 @@ objects: zoom: 0.5 primary: true children: [] + - name: Mosic + uid: 25d89351b40e4f99af2b6557a3377bf8 + id: 203 + position: [0, 0] + rotation: 0 + layer: 0 + visable: true + components: + - type: AudioPlayerComponent + uaid: 5 + volume: 1 + loop: false + children: [] color_correction: brightness: 2 saturation: 1.5 gamma: 1.83000004 bloom: true intensity: 0.219999999 - threshold: 0.449999988 \ No newline at end of file + threshold: 0.449999988 +Assets: + - uaid: 5 + path: C:\Users\spenc\Music\good-night-lofi-cozy-chill-music-160166.mp3 + filename: good-night-lofi-cozy-chill-music-160166.mp3 + filetype: mp3 + type: 1 + hash: 246561eaa4e21fad + lastModified: 1735362096 + - uaid: 4 + path: C:\Users\spenc\Music\ethereal-vistas-191254.mp3 + filename: ethereal-vistas-191254.mp3 + filetype: mp3 + type: 1 + hash: 0da03a50fc5a40a8 + lastModified: 1735362077 + - uaid: 2 + path: C:\Users\spenc\OneDrive\Pictures\textures\ganges_river_pebbles_diff_1k.png + filename: ganges_river_pebbles_diff_1k.png + filetype: png + type: 0 + hash: 0349580fcbf62155 + lastModified: 1744565605 + size: [1024, 1024] + channels: 4 + format: GL_RGBA + - uaid: 3 + path: C:\Users\spenc\OneDrive\Pictures\textures\ganges_river_pebbles_nor_gl_1k.png + filename: ganges_river_pebbles_nor_gl_1k.png + filetype: png + type: 0 + hash: 6711b00700d4c94a + lastModified: 1744565594 + size: [1024, 1024] + channels: 4 + format: GL_RGBA + - uaid: 1 + path: C:\Users\spenc\Music\creative-technology-showreel-241274.mp3 + filename: creative-technology-showreel-241274.mp3 + filetype: mp3 + type: 1 + hash: d7f8e8b2954d438f + lastModified: 1730076791 \ No newline at end of file diff --git a/src/src/Components/AudioPlayerComponent.cpp b/src/src/Components/AudioPlayerComponent.cpp index 06e828a..82889ed 100644 --- a/src/src/Components/AudioPlayerComponent.cpp +++ b/src/src/Components/AudioPlayerComponent.cpp @@ -27,17 +27,17 @@ void AudioPlayerComponent::Stop() { AudioEngine::Stop(m_UAID); } -void AudioPlayerComponent::Update() { - // drive the engine’s per-frame update +void AudioPlayerComponent::Update() +{ + Logger::LogDepricatedWithStackTrace("AudioPlayerComponent::Update()"); + // This is never called. Its useless + AudioEngine::Update(); - // now you can, if you like, pull back the current time or VU data - // for your own logic/UI. E.g.: auto& map = AudioEngine::GetPlayingInfoMap(); auto it = map.find(m_UAID); if (it != map.end()) { const auto& info = it->second; - // info.currentTime, info.totalTime, info.vuLeft, info.vuRight ... } } diff --git a/src/src/Renderer.cpp b/src/src/Renderer.cpp index 2507299..184a229 100644 --- a/src/src/Renderer.cpp +++ b/src/src/Renderer.cpp @@ -190,6 +190,8 @@ void Renderer::InitQuadBatch() void Renderer::Init() { + + glGenFramebuffers(1, &fbo); glBindFramebuffer(GL_FRAMEBUFFER, fbo); diff --git a/src/src/core/audio/AudioEngine.h b/src/src/core/audio/AudioEngine.h index d829908..c97b2cc 100644 --- a/src/src/core/audio/AudioEngine.h +++ b/src/src/core/audio/AudioEngine.h @@ -35,7 +35,8 @@ public: static void SetVolume(uint64_t uaid, float volume); static void SetLooping(uint64_t uaid, bool loop); - // Now returns a per-channel master peak vector + static ma_engine* GetEngine() { return &s_Engine; } + static const std::vector &GetMasterVU(); static const std::unordered_map &GetPlayingInfoMap(); diff --git a/src/src/core/utils/Logging.cpp b/src/src/core/utils/Logging.cpp index 7ee4d5e..37dbd94 100644 --- a/src/src/core/utils/Logging.cpp +++ b/src/src/core/utils/Logging.cpp @@ -8,6 +8,8 @@ #include #include #include +#include +#include class ScopedLogFileWriter { @@ -153,6 +155,92 @@ void Logger::LogVerbose(const char *fmt, ...) va_end(args); } + +void Logger::LogDepricated(const char* fmt, ...) +{ + va_list args; + va_start(args, fmt); + + char buffer[1024]; + vsnprintf(buffer, sizeof(buffer), fmt, args); + + std::string full = std::string("[DEPRECATED] ") + buffer; + LogVA(Warning, full.c_str(), args); + + va_end(args); +} + + +void Logger::LogDepricatedWithCaller(const char* msg, const std::source_location location) +{ + std::string formatted = std::string("[DEPRECATED] ") + msg + + " (called from " + location.file_name() + + ":" + std::to_string(location.line()) + + " in " + location.function_name() + ")"; + Log(Warning, "%s", formatted.c_str()); +} + + + + + +void Logger::LogDepricatedWithStackTrace(const char* msg) +{ + static std::once_flag symInitFlag; + std::call_once(symInitFlag, []() { + SymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES | SYMOPT_UNDNAME); + SymInitialize(GetCurrentProcess(), nullptr, TRUE); + }); + + HANDLE process = GetCurrentProcess(); + void* stack[32]; + USHORT frames = CaptureStackBackTrace(0, 32, stack, nullptr); + + std::string formatted = std::string("[DEPRECATED] ") + msg + "\n Call stack:"; + + for (USHORT i = 1; i < frames; ++i) // skip self + { + DWORD64 addr = (DWORD64)(stack[i]); + + // Resolve function name + char symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; + PSYMBOL_INFO symbol = (PSYMBOL_INFO)symbolBuffer; + symbol->SizeOfStruct = sizeof(SYMBOL_INFO); + symbol->MaxNameLen = MAX_SYM_NAME; + + std::string line; + + if (SymFromAddr(process, addr, nullptr, symbol)) + { + line = std::string(" -> ") + symbol->Name; + } + else + { + // fallback: raw address + char addrStr[64]; + snprintf(addrStr, sizeof(addrStr), "0x%llx", (unsigned long long)addr); + line = std::string(" -> [unresolved symbol] ") + addrStr; + } + + // Resolve file + line number + IMAGEHLP_LINE64 lineInfo = {}; + lineInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + DWORD lineDisp = 0; + + if (SymGetLineFromAddr64(process, addr, &lineDisp, &lineInfo)) + { + line += " (" + std::string(lineInfo.FileName) + ":" + std::to_string(lineInfo.LineNumber) + ")"; + } + + formatted += "\n" + line; + } + + Log(Warning, "%s", formatted.c_str()); +} + + + + void Logger::Clear() { s_Messages.clear(); diff --git a/src/src/core/utils/Logging.h b/src/src/core/utils/Logging.h index bf3a6d5..5cbdd8b 100644 --- a/src/src/core/utils/Logging.h +++ b/src/src/core/utils/Logging.h @@ -2,6 +2,14 @@ #include #include #include +#include + +#define LOG_DEPRECATED_USE(msg) \ + Logger::LogDepricated("%s (called from %s:%d in %s)", msg, __FILE__, __LINE__, __func__) + +#define DEPRICATED(func, ...) \ + Logger::LogDepricatedWithCaller(#func " is deprecated", std::source_location::current()); \ + func(__VA_ARGS__) class Logger { @@ -14,18 +22,24 @@ public: Debug, Verbose }; - static void Log(Level level, const char* fmt, ...); - static void LogVA(Level level, const char* fmt, va_list args); - - static void LogInfo(const char* fmt, ...); - static void LogWarning(const char* fmt, ...); - static void LogError(const char* fmt, ...); - static void LogDebug(const char* fmt, ...); - static void LogVerbose(const char* fmt, ...); + static void Log(Level level, const char *fmt, ...); + static void LogVA(Level level, const char *fmt, va_list args); + static void LogInfo(const char *fmt, ...); + static void LogWarning(const char *fmt, ...); + static void LogError(const char *fmt, ...); + static void LogDebug(const char *fmt, ...); + static void LogVerbose(const char *fmt, ...); + static void LogDepricated(const char *fmt, ...); + + static void LogDepricatedWithCaller( + const char *msg, + const std::source_location location = std::source_location::current()); + + static void LogDepricatedWithStackTrace(const char *msg); static void Clear(); - static void Draw(const char* title = "Console"); + static void Draw(const char *title = "Console"); private: struct LogMessage @@ -42,7 +56,6 @@ private: static bool s_ShowDebug; static bool s_ShowVerbose; - - static const char* ToString(Level level); - static const char* GetAnsiColor(Level level); + static const char *ToString(Level level); + static const char *GetAnsiColor(Level level); };