diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 984709907..d2c7df934 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,7 +123,7 @@ jobs: cc: "cl" cxx: "cl" configure-options: -DCMAKE_TOOLCHAIN_FILE='${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake' - -DATLAS_TESTS=ON -DATLAS_BINDLESS=OFF -DATLAS_HEADLESS=ON -G Ninja + -DATLAS_TESTS=ON -DATLAS_BINDLESS=OFF -DATLAS_EDITOR=OFF -DATLAS_HEADLESS=ON -G Ninja parallel: 16 build-type: ${{ matrix.build-type }} @@ -256,7 +256,7 @@ jobs: cc: "gcc" cxx: "g++" configure-options: -DCMAKE_TOOLCHAIN_FILE='${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake' - -DATLAS_TESTS=ON -DATLAS_BINDLESS=OFF -DATLAS_HEADLESS=ON -G Ninja + -DATLAS_TESTS=ON -DATLAS_BINDLESS=OFF -DATLAS_EDITOR=OFF -DATLAS_HEADLESS=ON -G Ninja parallel: 16 build-type: ${{ matrix.build-type }} @@ -385,7 +385,7 @@ jobs: cc: "clang" cxx: "clang++" configure-options: -DCMAKE_TOOLCHAIN_FILE='${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake' - -DATLAS_TESTS=ON -DATLAS_BINDLESS=OFF -DATLAS_HEADLESS=ON -G Ninja + -DATLAS_TESTS=ON -DATLAS_BINDLESS=OFF -DATLAS_EDITOR=OFF -DATLAS_HEADLESS=ON -G Ninja parallel: 16 build-type: ${{ matrix.build-type }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b3b6fff5a..c1c2dfeaf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,6 +33,15 @@ jobs: with: committish: 5786fcb0cb5eb08d1931a230dad9701e7a6c37f0 + - name: Delete MSVC tool version + shell: pwsh + # Add additional scripting steps here + run: | + cd 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build' + Get-ChildItem -Recurse * + Remove-Item * -Include 'Microsoft.VCToolsVersion.v143.default.props','Microsoft.VCToolsVersion.v143.default.txt' -Force | Out-Null + Get-ChildItem -Recurse * + - name: Setup Microsoft Visual C++ CLI uses: ilammy/msvc-dev-cmd@v1 diff --git a/.gitignore b/.gitignore index b03b87f67..58377fdad 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ data/emissive mesh data/flying world data/living room data/mis +data/ancient +data/farm +data/town diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c963aeea..555202012 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) if (CYGWIN OR MINGW) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -O3 -std=gnu++11" ) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -O3 -std=gnu++20" ) endif() if (ANDROID) @@ -91,6 +91,8 @@ find_package(glslang CONFIG REQUIRED) find_package(SPIRV-Tools-opt CONFIG REQUIRED) find_package(nlohmann_json CONFIG REQUIRED) find_package(unofficial-joltphysics CONFIG REQUIRED) +find_package(Lua REQUIRED) +find_package(sol2 CONFIG REQUIRED) if (ATLAS_TESTS) find_package(GTest CONFIG REQUIRED) diff --git a/README.md b/README.md index 031cec409..80ba5b16e 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ ![GI scene](wiki/images/intel_sponza.gif)
*Realtime Sponza scene with raytraced GI, AO and reflections (model from [Intel Graphics Research Sample Library](https://www.intel.com/content/www/us/en/developer/topic-technology/graphics-research/samples.html))*
## Introduction This is a cross platform toy engine developed in my spare time that is available on Linux, Windows and MacOS. +>**Note:** +>The current version (0.2.0) contains many API changes and is still an active WIP ## Requirements - Vulkan SDK - C++20 compatible compiler @@ -22,8 +24,6 @@ or while doing the build configuration with CMake. To use vcpkg together with CM ### Compiling the demo application Run CMake with the option ATLAS_DEMO=ON to include the demo application in the project. For easier use, the vsbuild.bat does exactly that and launches Visual Studio afterwards. After launching the IDE, set AtlasEngineDemo as your target. ->**Note:** ->In order to start the application properly you might need to change the asset directory in the [demo source file](https://github.com/tippesi/Atlas-Engine/blob/master/src/demo/App.cpp). ### Including the library into your own project It is possible to compile the engine either as a shared or static library. Set the ATLAS_BUILD_SHARED option accordingly. To make the library work with its dependencies, the root CMakeLists.txt of this repository has to be added as a subdirectory. As an entry @@ -66,10 +66,14 @@ in the LICENSE.md file in the dependency directory. >The files in the data folder (except the shaders) use a different license. ## Code Example For a code example have a look at the [demo application](https://github.com/tippesi/Atlas-Engine/tree/master/src/demo). +## Latest executables +The latest non-release executables can be found in the latest run of the [build pipeline](https://github.com/tippesi/Atlas-Engine/actions/workflows/build.yml?query=branch%3Amaster). They contain both the demo application and the editor. ## Screenshots -![Example scene](wiki/images/sponza_rasterized.png)
-*Rasterized image using real time global illumination*
+![Editor](wiki/images/editor.png) +*Sponza demo scene opened in the editor* +![Example scene](wiki/images/sponza_rasterized.png) +*Rasterized image using real time global illumination* ![Example scene](wiki/images/sponza_pathtraced.png) *Path traced scene* -![Island scene](wiki/images/island.gif)
-*Island demo scene using the terrain and ocean systems*
+![Island scene](wiki/images/island.gif) +*Island demo scene using the terrain and ocean systems* diff --git a/THIRDPARTY.md b/THIRDPARTY.md index f7ede9e92..0964aa752 100644 --- a/THIRDPARTY.md +++ b/THIRDPARTY.md @@ -279,6 +279,38 @@ nlohmann-json OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Lua +--------------------------------------------------------------------------------- + Copyright © 1994–2016 Lua.org, PUC-Rio. + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +sol2 +--------------------------------------------------------------------------------- + The MIT License (MIT) + + Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + JoltPhysics --------------------------------------------------------------------------------- Copyright 2021 Jorrit Rouwe diff --git a/data/scenes/sponza.aescene b/data/scenes/sponza.aescene index 36a8421a6..52ad6f8e1 100644 --- a/data/scenes/sponza.aescene +++ b/data/scenes/sponza.aescene @@ -1 +1 @@ -{"aabb":{"max":{"x":128.0,"y":128.0,"z":128.0},"min":{"x":-128.0,"y":-128.0,"z":-128.0}},"ao":{"enable":false,"opacityCheck":false,"radius":3.0,"rt":true,"sampleCount":16,"strength":1.0},"depth":5.0,"entities":[{"entities":[{"id":1,"light":{"color":{"x":1.0,"y":0.9254902005195618,"z":0.8196078538894653},"intensity":10.0,"isMain":true,"mobility":0,"properties":{"direction":{"x":0.0,"y":-1.0,"z":0.2800000011920929}},"shadow":{"allowDynamicEntities":false,"allowTerrain":true,"bias":0.800000011920929,"cascadeBlendDistance":2.5,"center":{"x":0.0,"y":0.0,"z":0.0},"distance":75.0,"followMainCamera":false,"isCascaded":false,"longRange":false,"longRangeDistance":1024.0,"resolution":2048,"splitCorrection":0.0,"useCubemap":false,"viewCount":1,"views":[{"farDistance":75.0,"frustumMatrix":{"j0":{"w":0.0,"x":0.019999999552965164,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":-0.02380952425301075,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":-0.0002500000118743628},"j3":{"w":1.0,"x":0.0,"y":0.02380952425301075,"z":0.5}},"nearDistance":0.0,"orthoSize":{"w":43.0,"x":-50.0,"y":50.0,"z":-41.0},"projectionMatrix":{"j0":{"w":0.0,"x":0.019999999552965164,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":-0.02380952425301075,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":-0.0002500000118743628},"j3":{"w":1.0,"x":0.0,"y":0.02380952425301075,"z":0.5}},"terrainFrustumMatrix":{"j0":{"w":0.0,"x":0.019999999552965164,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":-0.02380952425301075,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":-0.0002500000118743628},"j3":{"w":1.0,"x":0.0,"y":0.02380952425301075,"z":0.5}},"viewMatrix":{"j0":{"w":0.0,"x":-1.0,"y":0.0,"z":-0.0},"j1":{"w":0.0,"x":0.0,"y":0.26962992548942566,"z":0.9629640579223633},"j2":{"w":0.0,"x":0.0,"y":0.9629640579223633,"z":-0.26962992548942566},"j3":{"w":1.0,"x":-0.0,"y":-0.0,"z":0.0}}}]},"type":0,"volumetric":true},"name":{"name":"Directional light"}},{"id":2,"mesh":{"dontCull":false,"resourcePath":"sponza/sponza.obj","visible":true},"name":{"name":"Sponza"},"rigidBody":{"bodyIndex":0,"creationSettings":{"angularDampening":0.0,"linearDampening":0.0,"shape":{"meshSettings":{"resourcePath":"sponza/sponza.obj","scale":{"x":0.012193998321890831,"y":0.012000000104308128,"z":0.012193998321890831}}}},"layer":0},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.012193998321890831,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":0.012000000104308128,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":0.012193998321890831},"j3":{"w":1.0,"x":0.0,"y":0.0,"z":0.0}}}},{"id":3,"mesh":{"dontCull":false,"resourcePath":"chromesphere.gltf","visible":true},"name":{"name":"Sphere"},"rigidBody":{"bodyIndex":1,"creationSettings":{"objectLayer":1,"restitution":0.8999999761581421,"shape":{"sphereSettings":{"density":1.0,"radius":1.0000001192092896,"scale":{"x":1.0000003576278687,"y":1.0000003576278687,"z":1.0000005960464478}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.4756942391395569,"y":0.0001188219030154869,"z":-0.879611074924469},"j1":{"w":0.0,"x":0.5917150974273682,"y":-0.7398717403411865,"z":-0.3200998306274414},"j2":{"w":0.0,"x":-0.6508373618125916,"y":-0.6727486848831177,"z":0.35188230872154236},"j3":{"w":1.0,"x":-15.995047569274902,"y":0.9694054126739502,"z":0.2113814800977707}}}},{"id":4,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Wall"},"rigidBody":{"bodyIndex":2,"creationSettings":{"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":1.0,"scale":{"x":0.1481112539768219,"y":0.17914418876171112,"z":2.874448299407959}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.12404608726501465,"y":-7.875383403188607e-07,"z":0.08092907071113586},"j1":{"w":0.0,"x":-6.167340416141087e-07,"y":0.17914418876171112,"z":2.688605945877498e-06},"j2":{"w":0.0,"x":-1.5706194639205933,"y":-4.1537619836162776e-05,"z":2.407406806945801},"j3":{"w":1.0,"x":7.4162163734436035,"y":-0.04500687122344971,"z":-0.9572893381118774}}}},{"id":5,"mesh":{"dontCull":false,"resourcePath":"chromesphere.gltf","visible":true},"name":{"name":"Sphere"},"rigidBody":{"bodyIndex":3,"creationSettings":{"objectLayer":1,"restitution":0.8999999761581421,"shape":{"sphereSettings":{"density":1.0,"radius":1.0000001192092896,"scale":{"x":0.9999986290931702,"y":1.0,"z":0.9999988079071045}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.30071619153022766,"y":0.9535101652145386,"z":0.01963132992386818},"j1":{"w":0.0,"x":-0.02151578664779663,"y":-0.013796210289001465,"z":0.9996733665466309},"j2":{"w":0.0,"x":0.9534696936607361,"y":-0.3010404407978058,"z":0.016366761177778244},"j3":{"w":1.0,"x":4.233027935028076,"y":0.966492235660553,"z":1.2846850156784058}}}},{"id":6,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":4,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226368576288223,"y":0.1039920523762703,"z":0.9999991655349731}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.0475580133497715,"y":-8.188627589333919e-07,"z":0.06712339073419571},"j1":{"w":0.0,"x":-3.60343005922914e-06,"y":-0.1039920523762703,"z":1.2844517414123402e-06},"j2":{"w":0.0,"x":0.8159534335136414,"y":-3.541418118402362e-05,"z":-0.5781162977218628},"j3":{"w":1.0,"x":-9.601022720336914,"y":1.530970811843872,"z":-0.44825008511543274}}}},{"camera":{"aspectRatio":2.0,"exposure":1.0,"farPlane":400.0,"fieldOfView":55.20000076293945,"isMain":true,"location":{"x":0.0,"y":1.2000000476837158,"z":0.0},"nearPlane":1.0,"rotation":{"x":51.800071716308594,"y":-0.2541283667087555},"thirdPerson":true,"thirdPersonDistance":3.0,"useEntityRotation":true,"useEntityTranslation":true},"id":7,"mesh":{"dontCull":false,"resourcePath":"capsule.gltf","visible":true},"name":{"name":"Player"},"player":{"allowInput":true,"creationSettings":{"shape":{"capsuleShapeSettings":{"density":1.0,"height":1.2000000476837158,"radius":0.30000001192092896,"scale":{"x":1.0,"y":1.0,"z":1.0}}}},"fastVelocity":4.0,"jumpVelocity":4.0,"slowVelocity":1.600000023841858},"text":{"halfSize":{"x":0.5,"y":1.0},"outlineColor":{"w":1.0,"x":0.0,"y":0.0,"z":0.0},"outlineFactor":0.0,"position":{"x":0.0,"y":1.600000023841858,"z":0.0},"resourcePath":"font/roboto.ttf","rotation":{"w":1.0,"x":0.0,"y":0.0,"z":0.0},"text":"This is the player","textColor":{"w":1.0,"x":1.0,"y":1.0,"z":1.0},"textScale":0.07999999821186066},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":1.0,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":1.0,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":1.0},"j3":{"w":1.0,"x":-3.5021371841430664,"y":-0.030071139335632324,"z":-0.5684388279914856}}}},{"audio":{"cutoff":0.0010000000474974513,"falloffFactor":0.10000000149011612,"falloffPower":2.0,"stream":{"loop":false,"pitch":0.9998736278143617,"resourcePath":"/music.wav","time":16.005325020665758,"volume":0.0025881417095661163},"volume":1.0},"id":8,"name":{"name":"WelcomeText"},"text":{"halfSize":{"x":1.899999976158142,"y":1.0},"outlineColor":{"w":1.0,"x":1.0,"y":0.0,"z":0.0},"outlineFactor":0.15000000596046448,"position":{"x":0.0,"y":0.0,"z":1.2999999523162842},"resourcePath":"font/roboto.ttf","rotation":{"w":1.0,"x":0.0,"y":0.0,"z":0.0},"text":"Welcome to this demo scene!","textColor":{"w":1.0,"x":1.0,"y":1.0,"z":1.0},"textScale":0.1899999976158142},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.01578390598297119,"y":0.00355260306969285,"z":0.9998670816421509},"j1":{"w":0.0,"x":0.40691956877708435,"y":0.9134560227394104,"z":0.003178075887262821},"j2":{"w":0.0,"x":-0.913324773311615,"y":0.4069172441959381,"z":-0.015863558277487755},"j3":{"w":1.0,"x":2.9802322387695313e-08,"y":4.168000221252441,"z":-0.02871951460838318}}}},{"entities":[{"id":10,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":5,"creationSettings":{"angularVelocity":{"x":0.3400594890117645,"y":0.002075438853353262,"z":-0.2711464762687683},"linearVelocity":{"x":0.027797559276223183,"y":-0.06926704198122025,"z":0.03678030148148537},"motionQuality":1,"objectLayer":1,"restitution":-0.0,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226305991411209,"y":0.10399112105369568,"z":0.24259740114212036}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.06749320030212402,"y":-0.0013515298487618566,"z":0.04701119661331177},"j1":{"w":0.0,"x":-0.05943548306822777,"y":-5.547449109144509e-05,"z":-0.08533213287591934},"j2":{"w":0.0,"x":0.003344531636685133,"y":-0.2425646185874939,"z":-0.0021718384232372046},"j3":{"w":1.0,"x":-6.993166923522949,"y":0.07752945274114609,"z":-0.49586528539657593}}}},{"id":11,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":6,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226487040519714,"y":0.10399449616670609,"z":1.000009298324585}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.001214503077790141,"y":4.0089940739562735e-05,"z":0.08225589245557785},"j1":{"w":0.0,"x":-0.10398011654615402,"y":-0.000795417174231261,"z":0.0015356455696746707},"j2":{"w":0.0,"x":0.0076551553793251514,"y":-0.9999799728393555,"z":0.00037435046397149563},"j3":{"w":1.0,"x":-0.18109244108200073,"y":1.1424561738967896,"z":-2.4032680988311768}}}},{"id":12,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":7,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370066404343,"y":0.10399212688207626,"z":0.9999992847442627}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.004975396674126387,"y":-3.6774740692635532e-06,"z":0.0821131020784378},"j1":{"w":0.0,"x":-0.10380175709724426,"y":-6.8306521825434174e-06,"z":-0.006289551965892315},"j2":{"w":0.0,"x":6.824726733611897e-05,"y":-0.9999992847442627,"z":-4.065033863298595e-05},"j3":{"w":1.0,"x":0.49817052483558655,"y":0.3519432246685028,"z":-2.3503992557525635}}}},{"id":13,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":8,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226367831230164,"y":0.10399219393730164,"z":0.9999990463256836}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.006919844541698694,"y":0.0009341590339317918,"z":0.08196679502725601},"j1":{"w":0.0,"x":-0.10362283140420914,"y":-0.00030928864725865424,"z":0.008751623332500458},"j2":{"w":0.0,"x":0.003919091075658798,"y":-0.9999301433563232,"z":0.011065145023167133},"j3":{"w":1.0,"x":2.0737833976745605,"y":0.36356258392333984,"z":-1.7112126350402832}}}},{"id":14,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":9,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226367831230164,"y":0.1039920523762703,"z":0.9999991655349731}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.00037128012627363205,"y":-0.00020931441395077854,"z":0.08226257562637329},"j1":{"w":0.0,"x":-0.10399100184440613,"y":-7.190154747149791e-07,"z":0.0004693435621447861},"j2":{"w":0.0,"x":-4.589554009726271e-06,"y":-0.9999959468841553,"z":-0.002544400980696082},"j3":{"w":1.0,"x":3.7019379138946533,"y":0.3534649610519409,"z":-2.4043333530426025}}}},{"id":15,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":10,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.0822637528181076,"y":0.10399219393730164,"z":1.0000001192092896}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.0014320755144581199,"y":-0.0055144052021205425,"z":0.08206621557474136},"j1":{"w":0.0,"x":-0.10396077483892441,"y":-0.0019217761000618339,"z":0.0016849995590746403},"j2":{"w":0.0,"x":0.017349572852253914,"y":-0.9975795745849609,"z":-0.0673345997929573},"j3":{"w":1.0,"x":1.3664464950561523,"y":1.2094054222106934,"z":-2.3293323516845703}}}},{"id":16,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":11,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226368576288223,"y":0.1039920523762703,"z":0.9999992251396179}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.007250844966620207,"y":-0.00029188839835114777,"z":0.08194299042224884},"j1":{"w":0.0,"x":-0.10357026010751724,"y":0.0019194179913029075,"z":-0.009157725609838963},"j2":{"w":0.0,"x":-0.01807291805744171,"y":-0.9998225569725037,"z":-0.005160685162991285},"j3":{"w":1.0,"x":3.177853584289551,"y":1.1374287605285645,"z":-2.286043643951416}}}},{"id":17,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":12,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370066404343,"y":0.10399207472801208,"z":0.9999994039535522}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.007074753753840923,"y":-0.0009124425705522299,"z":0.08195383846759796},"j1":{"w":0.0,"x":-0.10360674560070038,"y":2.178741397074191e-06,"z":-0.008943937718868256},"j2":{"w":0.0,"x":0.0009330803295597434,"y":-0.999937891960144,"z":-0.01105236355215311},"j3":{"w":1.0,"x":4.739034652709961,"y":1.1431937217712402,"z":-2.344177484512329}}}},{"id":18,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":13,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370066404343,"y":0.10399207472801208,"z":0.9999992847442627}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-2.9848830308765173e-05,"y":-0.00011465383431641385,"z":0.08226361125707626},"j1":{"w":0.0,"x":-0.10399205982685089,"y":-5.103151488583535e-05,"z":-3.7807207263540477e-05},"j2":{"w":0.0,"x":0.0004912313306704164,"y":-0.9999982118606567,"z":-0.0013935555471107364},"j3":{"w":1.0,"x":5.269709587097168,"y":0.35375744104385376,"z":-2.396353006362915}}}},{"id":19,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":14,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226397633552551,"y":0.10399534553289413,"z":1.0000017881393433}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.0029943662229925394,"y":-0.004902660381048918,"z":0.08206314593553543},"j1":{"w":0.0,"x":-0.1038932278752327,"y":-0.00239846995100379,"z":-0.0039341989904642105},"j2":{"w":0.0,"x":0.025261566042900085,"y":-0.9979578852653503,"z":-0.05869881808757782},"j3":{"w":1.0,"x":0.45395728945732117,"y":1.9912066459655762,"z":-2.3605315685272217}}}},{"id":20,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":15,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226369321346283,"y":0.10399205982685089,"z":0.9999991655349731}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.0047220797277987,"y":-0.006254853215068579,"z":0.08188952505588531},"j1":{"w":0.0,"x":-0.10381996631622314,"y":0.000815314007923007,"z":-0.005924399942159653},"j2":{"w":0.0,"x":-0.0034728916361927986,"y":-0.9970735311508179,"z":-0.0763583704829216},"j3":{"w":1.0,"x":2.0099921226501465,"y":1.9823397397994995,"z":-2.1112253665924072}}}},{"id":21,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":16,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370066404343,"y":0.10399207472801208,"z":0.9999992847442627}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.0015184117946773767,"y":-0.001873633824288845,"z":0.08222834020853043},"j1":{"w":0.0,"x":-0.10390593856573105,"y":0.0038146909791976213,"z":-0.0018317853100597858},"j2":{"w":0.0,"x":-0.036265525966882706,"y":-0.9990666508674622,"z":-0.02343420498073101},"j3":{"w":1.0,"x":3.611302614212036,"y":1.9326788187026978,"z":-2.369572162628174}}}},{"id":22,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":17,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370811462402,"y":0.10399207472801208,"z":0.9999992251396179}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.0011607652995735407,"y":-0.005252636969089508,"z":0.08208763599395752},"j1":{"w":0.0,"x":-0.1039327085018158,"y":-0.003092399565503001,"z":-0.0016675429651513696},"j2":{"w":0.0,"x":0.03069702349603176,"y":-0.9975154995918274,"z":-0.06339509040117264},"j3":{"w":1.0,"x":0.911769449710846,"y":2.8139379024505615,"z":-2.3714351654052734}}}},{"id":23,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":18,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226369321346283,"y":0.10399208217859268,"z":0.9999988079071045}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.002328230533748865,"y":-0.01567736454308033,"z":0.08072245121002197},"j1":{"w":0.0,"x":-0.10387608408927917,"y":0.0032992407213896513,"z":0.0036367876455187798},"j2":{"w":0.0,"x":-0.03779618442058563,"y":-0.9811586737632751,"z":-0.189463809132576},"j3":{"w":1.0,"x":2.5983128547668457,"y":2.8227591514587402,"z":-2.0519001483917236}}}},{"id":24,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":19,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226368576288223,"y":0.1039920523762703,"z":0.9999991655349731}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.0064202528446912766,"y":-0.002519079018384218,"z":0.0819740742444992},"j1":{"w":0.0,"x":-0.10356941819190979,"y":0.0044377571903169155,"z":0.008247978053987026},"j2":{"w":0.0,"x":-0.044952504336833954,"y":-0.9986188411712646,"z":-0.027167029678821564},"j3":{"w":1.0,"x":4.155186176300049,"y":2.7027955055236816,"z":-2.4178249835968018}}}},{"id":25,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":20,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226369321346283,"y":0.10399205982685089,"z":0.9999993443489075}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.007614439819008112,"y":-0.014711390249431133,"z":0.08057859539985657},"j1":{"w":0.0,"x":-0.1032203733921051,"y":-0.006378653459250927,"z":-0.010918588377535343},"j2":{"w":0.0,"x":0.07885781675577164,"y":-0.9819651246070862,"z":-0.17182737588882446},"j3":{"w":1.0,"x":1.3723328113555908,"y":3.7512500286102295,"z":-2.243227481842041}}}},{"id":26,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":21,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370066404343,"y":0.10399207472801208,"z":0.9999992847442627}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.005531982518732548,"y":-0.015606719069182873,"z":0.08058004826307297},"j1":{"w":0.0,"x":-0.10365156084299088,"y":0.005922866519540548,"z":-0.005968747194856405},"j2":{"w":0.0,"x":-0.0449003241956234,"y":-0.9801850318908691,"z":-0.19292448461055756},"j3":{"w":1.0,"x":3.1063742637634277,"y":3.642221689224243,"z":-2.205120325088501}}}},{"id":27,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":22,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226369321346283,"y":0.10399165004491806,"z":0.9999992251396179}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.009233793243765831,"y":-2.8461645484867404e-08,"z":-0.08174382150173187},"j1":{"w":0.0,"x":5.111483005748596e-07,"y":-0.10399164259433746,"z":-2.153150546746474e-08},"j2":{"w":0.0,"x":-0.9936796426773071,"y":-4.907456968794577e-06,"z":0.11224624514579773},"j3":{"w":1.0,"x":5.397507667541504,"y":1.5309886932373047,"z":-0.8703097105026245}}}},{"id":28,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":23,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226369321346283,"y":0.1039920523762703,"z":0.9999992251396179}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.004304870497435331,"y":-0.016259904950857162,"z":0.08052577078342438},"j1":{"w":0.0,"x":-0.10374186187982559,"y":0.0035653808154165745,"z":0.006265922449529171},"j2":{"w":0.0,"x":-0.04547032341361046,"y":-0.9796709418296814,"z":-0.19538608193397522},"j3":{"w":1.0,"x":3.7071003913879395,"y":4.404808521270752,"z":-2.0641326904296875}}}},{"id":29,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":24,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226374536752701,"y":0.1039920300245285,"z":1.0000001192092896}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.004521988797932863,"y":-0.014796562492847443,"z":0.08079565316438675},"j1":{"w":0.0,"x":-0.10348106175661087,"y":-0.007410035468637943,"z":-0.0071486919187009335},"j2":{"w":0.0,"x":0.0823487713932991,"y":-0.9811068177223206,"z":-0.17506666481494904},"j3":{"w":1.0,"x":1.740257740020752,"y":4.569649696350098,"z":-2.0765440464019775}}}},{"id":30,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":25,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226379007101059,"y":0.1486254185438156,"z":0.9800000190734863}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.0822434350848198,"y":-3.559059393865027e-07,"z":-0.0018298403592780232},"j1":{"w":0.0,"x":6.938781211829337e-07,"y":0.1486254185438156,"z":2.2790266029915074e-06},"j2":{"w":0.0,"x":0.021798700094223022,"y":-1.5125399841053877e-05,"z":0.97975754737854},"j3":{"w":1.0,"x":-0.42584455013275146,"y":-0.042439818382263184,"z":0.7894344925880432}}}},{"id":31,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":26,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226379007101059,"y":0.01507602445781231,"z":0.9800000190734863}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.07320480048656464,"y":4.977956632501446e-05,"z":-0.03752845898270607},"j1":{"w":0.0,"x":0.006859811022877693,"y":-0.0011024783598259091,"z":0.013379612006247044},"j2":{"w":0.0,"x":-0.032167207449674606,"y":-0.9773759245872498,"z":-0.0640433058142662},"j3":{"w":1.0,"x":2.4300098419189453,"y":0.3631786108016968,"z":1.207587718963623}}}},{"id":32,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":27,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226379007101059,"y":0.1486254185438156,"z":0.9800000190734863}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.06837532669305801,"y":-0.0017373006558045745,"z":-0.04570697247982025},"j1":{"w":0.0,"x":0.05685741454362869,"y":0.11100539565086365,"z":0.08083657920360565},"j2":{"w":0.0,"x":0.39542150497436523,"y":-0.6513306498527527,"z":0.6162874698638916},"j3":{"w":1.0,"x":3.135746955871582,"y":0.2095150351524353,"z":-1.027677297592163}}}},{"id":33,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":28,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226379007101059,"y":0.1486254185438156,"z":0.9800000190734863}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.0716107115149498,"y":-4.5638077494913887e-07,"z":-0.040487490594387054},"j1":{"w":0.0,"x":0.0005247447988949716,"y":0.14862160384655,"z":0.0009264472755603492},"j2":{"w":0.0,"x":0.4823108911514282,"y":-0.007020606193691492,"z":0.8530691862106323},"j3":{"w":1.0,"x":2.5021331310272217,"y":-0.04527723789215088,"z":0.6787291169166565}}}}],"id":9,"name":{"name":"Staircase"},"root":false},{"id":34,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":29,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226368576288223,"y":0.1039920523762703,"z":0.9999991655349731}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-3.9226383705681656e-06,"y":0.0,"z":0.08226368576288223},"j1":{"w":0.0,"x":-0.1039920523762703,"y":-2.479363736540563e-08,"z":-4.958727458870271e-06},"j2":{"w":0.0,"x":2.384183801495965e-07,"y":-0.9999991655349731,"z":0.0},"j3":{"w":1.0,"x":3.1176745891571045,"y":5.388330459594727,"z":-4.729436874389648}}}},{"entities":[{"entities":[{"id":37,"mesh":{"dontCull":false,"resourcePath":"chromesphere.gltf","visible":true},"name":{"name":"Sphere"},"rigidBody":{"bodyIndex":32,"creationSettings":{"objectLayer":1,"restitution":0.8999999761581421,"shape":{"sphereSettings":{"density":1.0,"radius":1.0000001192092896,"scale":{"x":1.0,"y":1.0,"z":1.0}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.9554489850997925,"y":0.03446338698267937,"z":0.2931373119354248},"j1":{"w":0.0,"x":-0.09065437316894531,"y":0.9794195890426636,"z":0.18033011257648468},"j2":{"w":0.0,"x":-0.28088968992233276,"y":-0.19887040555477142,"z":0.9389097690582275},"j3":{"w":1.0,"x":-1.6795064210891724,"y":-0.4496800899505615,"z":6.649222373962402}}}}],"id":36,"mesh":{"dontCull":false,"resourcePath":"chromesphere.gltf","visible":true},"name":{"name":"Sphere"},"rigidBody":{"bodyIndex":31,"creationSettings":{"angularVelocity":{"x":-0.003580757649615407,"y":-0.0010163785191252828,"z":-0.001152479788288474},"linearVelocity":{"x":0.0011589848436415195,"y":-0.276141881942749,"z":-0.003600968746468425},"objectLayer":1,"restitution":0.8999999761581421,"shape":{"sphereSettings":{"density":1.0,"radius":1.0000001192092896,"scale":{"x":1.0,"y":1.0,"z":1.0}}}},"layer":1},"root":false,"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.7511735558509827,"y":0.22571858763694763,"z":-0.6203140616416931},"j1":{"w":0.0,"x":-0.39222922921180725,"y":0.6032152771949768,"z":0.6944692730903625},"j2":{"w":0.0,"x":0.5309374332427979,"y":0.7649720907211304,"z":-0.3645859360694885},"j3":{"w":1.0,"x":-11.71251392364502,"y":4.754361152648926,"z":-4.003150939941406}}}}],"id":35,"mesh":{"dontCull":false,"resourcePath":"chromesphere.gltf","visible":true},"name":{"name":"Sphere"},"rigidBody":{"bodyIndex":30,"creationSettings":{"angularVelocity":{"x":0.16539807617664337,"y":0.1814352571964264,"z":-0.11671467125415802},"linearVelocity":{"x":0.11671468615531921,"y":2.4347741600649897e-09,"z":0.16539809107780457},"objectLayer":1,"restitution":0.8999999761581421,"shape":{"sphereSettings":{"density":1.0,"radius":1.0000001192092896,"scale":{"x":1.0,"y":1.0,"z":1.0}}}},"layer":1},"root":false,"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.6672989130020142,"y":0.0363946259021759,"z":0.7439002990722656},"j1":{"w":0.0,"x":0.5453938245773315,"y":0.7040697336196899,"z":0.45478731393814087},"j2":{"w":0.0,"x":-0.5072058439254761,"y":0.7091977000236511,"z":-0.48967432975769043},"j3":{"w":1.0,"x":-12.277113914489746,"y":0.9699291586875916,"z":-0.5359781384468079}}}}],"id":0,"name":{"name":"Root"},"root":false}],"fog":{"ambientFactor":0.009999999776482582,"density":0.0005000000237487257,"enable":true,"extinctionCoefficients":{"w":1.0,"x":0.9300000071525574,"y":0.9649999737739563,"z":1.0},"extinctionFactor":0.1599999964237213,"height":0.0,"heightFalloff":0.0284000001847744,"rayMarchStepCount":10,"rayMarching":true,"scatteringAnisotropy":-0.6000000238418579,"scatteringFactor":2.0,"volumetricIntensity":1.0},"irradianceVolume":{"aabb":{"max":{"x":23.738000869750977,"y":18.340999603271484,"z":17.85099983215332},"min":{"x":-38.63600158691406,"y":-9.817999839782715,"z":-21.163000106811523}},"bias":0.30000001192092896,"enable":true,"gamma":5.0,"hysteresis":0.9800000190734863,"lowerResMoments":true,"opacityCheck":false,"optimizeProbes":true,"probeCount":{"x":20,"y":20,"z":20},"rayCount":100,"rayCountInactive":32,"sampleEmissives":false,"sharpness":50.0,"strength":1.0,"useShadowMap":false},"name":"sponza","physicsWorld":null,"postProcessing":{"chromaticAberration":{"colorsReversed":false,"enable":false,"strength":1.0},"contrast":1.0,"filmGrain":{"enable":false,"strength":0.10000000149011612},"filmicTonemapping":false,"paperWhiteLuminance":150.0,"saturation":1.0,"screenMaxLuminance":1600.0,"sharpen":{"enable":true,"factor":0.15000000596046448},"taa":{"enable":true,"jitterRange":0.9900000095367432},"vignette":{"color":{"x":0.0,"y":0.0,"z":0.0},"enable":false,"offset":0.0,"power":0.0,"strength":0.0}},"reflection":{"bias":0.0,"currentClipFactor":2.0,"enable":true,"gi":true,"historyClipMax":1.0,"opacityCheck":false,"radianceLimit":10.0,"rt":true,"spatialFilterStrength":10.0,"temporalWeight":0.9520000219345093,"textureLevel":4,"useShadowMap":false},"sky":{"atmosphere":{"height":100000.0,"probeResolution":128},"clouds":{"castShadow":false,"coverageResolution":512,"coverageScale":0.25,"coverageSpeed":5.0,"darkEdgeAmbient":0.10000000149011612,"darkEdgeFocus":2.0,"densityMultiplier":0.800000011920929,"detailResolution":32,"detailScale":16.0,"detailSpeed":10.0,"detailStrength":0.15000000596046448,"distanceLimit":8000.0,"enable":true,"heightStretch":0.5,"maxHeight":1700.0,"minHeight":1400.0,"occlusionSampleCount":5,"sampleCount":64,"scattering":{"eccentricityFirstPhase":0.0,"eccentricitySecondPhase":-0.5,"extinctionCoefficients":{"w":1.0,"x":0.9300000071525574,"y":0.9649999737739563,"z":1.0},"extinctionFactor":0.1599999964237213,"phaseAlpha":0.5,"scatteringFactor":2.0},"shadowResolution":512,"shadowSampleFraction":4,"shapeResolution":128,"shapeScale":2.0,"shapeSpeed":5.0,"stochasticOcclusionSampling":true},"planetCenter":{"x":0.0,"y":-650000.0,"z":0.0},"planetRadius":649000.0},"ssgi":{"aoStrength":1.0,"enable":true,"enableAo":true,"irradianceLimit":10.0,"opacityCheck":false,"radius":1.0,"rayCount":2,"rt":false,"sampleCount":8},"sss":{"enable":true,"maxLength":0.4970000088214874,"sampleCount":8,"thickness":0.30000001192092896}} \ No newline at end of file +{"aabb":{"max":{"x":128.0,"y":128.0,"z":128.0},"min":{"x":-128.0,"y":-128.0,"z":-128.0}},"ao":{"enable":false,"opacityCheck":false,"radius":3.0,"rt":true,"sampleCount":16,"strength":1.0},"depth":5.0,"entities":[{"entities":[{"id":1,"light":{"color":{"x":1.0,"y":0.9254902005195618,"z":0.8196078538894653},"intensity":10.0,"isMain":true,"mobility":0,"properties":{"direction":{"x":0.0,"y":-1.0,"z":0.2800000011920929}},"shadow":{"allowDynamicEntities":false,"allowTerrain":true,"bias":0.800000011920929,"cascadeBlendDistance":2.5,"center":{"x":0.0,"y":0.0,"z":0.0},"distance":75.0,"edgeSoftness":0.05000000074505806,"followMainCamera":false,"isCascaded":false,"longRange":false,"longRangeDistance":1024.0,"resolution":2048,"splitCorrection":0.0,"useCubemap":false,"viewCount":1,"views":[{"farDistance":75.0,"frustumMatrix":{"j0":{"w":0.0,"x":0.019999999552965164,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":-0.02380952425301075,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":-0.0002500000118743628},"j3":{"w":1.0,"x":0.0,"y":0.02380952425301075,"z":0.5}},"nearDistance":0.0,"orthoSize":{"w":43.0,"x":-50.0,"y":50.0,"z":-41.0},"projectionMatrix":{"j0":{"w":0.0,"x":0.019999999552965164,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":-0.02380952425301075,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":-0.0002500000118743628},"j3":{"w":1.0,"x":0.0,"y":0.02380952425301075,"z":0.5}},"terrainFrustumMatrix":{"j0":{"w":0.0,"x":0.019999999552965164,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":-0.02380952425301075,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":-0.0002500000118743628},"j3":{"w":1.0,"x":0.0,"y":0.02380952425301075,"z":0.5}},"viewMatrix":{"j0":{"w":0.0,"x":-1.0,"y":0.0,"z":-0.0},"j1":{"w":0.0,"x":0.0,"y":0.26962992548942566,"z":0.9629640579223633},"j2":{"w":0.0,"x":0.0,"y":0.9629640579223633,"z":-0.26962992548942566},"j3":{"w":1.0,"x":-0.0,"y":-0.0,"z":0.0}}}]},"type":0,"volumetric":true},"name":{"name":"Directional light"}},{"id":2,"mesh":{"dontCull":false,"resourcePath":"sponza/sponza.obj","visible":true},"name":{"name":"Sponza"},"rigidBody":{"bodyIndex":32,"creationSettings":{"angularDampening":0.0,"linearDampening":0.0,"shape":{"meshSettings":{"resourcePath":"sponza/sponza.obj","scale":{"x":0.012193998321890831,"y":0.012000000104308128,"z":0.012193998321890831}}}},"layer":0},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.012193998321890831,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":0.012000000104308128,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":0.012193998321890831},"j3":{"w":1.0,"x":0.0,"y":0.0,"z":0.0}}}},{"id":3,"mesh":{"dontCull":false,"resourcePath":"chromesphere.gltf","visible":true},"name":{"name":"Sphere"},"rigidBody":{"bodyIndex":0,"creationSettings":{"objectLayer":1,"restitution":0.8999999761581421,"shape":{"sphereSettings":{"density":1.0,"radius":1.0000001192092896,"scale":{"x":1.0000003576278687,"y":1.0000003576278687,"z":1.0000005960464478}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.4756948947906494,"y":0.00011953715875279158,"z":-0.8796106576919556},"j1":{"w":0.0,"x":0.5917145013809204,"y":-0.739871621131897,"z":-0.32010072469711304},"j2":{"w":0.0,"x":-0.6508373022079468,"y":-0.6727486252784729,"z":0.3518824875354767},"j3":{"w":1.0,"x":-15.995047569274902,"y":0.9694054126739502,"z":0.2113814800977707}}}},{"id":4,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Wall"},"rigidBody":{"bodyIndex":1,"creationSettings":{"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":1.0,"scale":{"x":0.1481112539768219,"y":0.17914418876171112,"z":2.874448299407959}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.12404608726501465,"y":-7.875383403188607e-07,"z":0.08092907071113586},"j1":{"w":0.0,"x":-6.167340416141087e-07,"y":0.17914418876171112,"z":2.688605945877498e-06},"j2":{"w":0.0,"x":-1.5706194639205933,"y":-4.1537619836162776e-05,"z":2.407406806945801},"j3":{"w":1.0,"x":7.4162163734436035,"y":-0.04500603675842285,"z":-0.9572893381118774}}}},{"id":5,"mesh":{"dontCull":false,"resourcePath":"chromesphere.gltf","visible":true},"name":{"name":"Sphere"},"rigidBody":{"bodyIndex":2,"creationSettings":{"objectLayer":1,"restitution":0.8999999761581421,"shape":{"sphereSettings":{"density":1.0,"radius":1.0000001192092896,"scale":{"x":0.9999986290931702,"y":1.0,"z":0.9999988079071045}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.30071619153022766,"y":0.9535101652145386,"z":0.01963132992386818},"j1":{"w":0.0,"x":-0.02151578664779663,"y":-0.013796210289001465,"z":0.9996733665466309},"j2":{"w":0.0,"x":0.9534696936607361,"y":-0.3010404407978058,"z":0.016366761177778244},"j3":{"w":1.0,"x":4.233027935028076,"y":0.966492235660553,"z":1.2846850156784058}}}},{"id":6,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":3,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226368576288223,"y":0.1039920523762703,"z":0.9999991655349731}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.0475580133497715,"y":-8.188627589333919e-07,"z":0.06712339073419571},"j1":{"w":0.0,"x":-3.60343005922914e-06,"y":-0.1039920523762703,"z":1.2844517414123402e-06},"j2":{"w":0.0,"x":0.8159534335136414,"y":-3.541418118402362e-05,"z":-0.5781162977218628},"j3":{"w":1.0,"x":-9.601022720336914,"y":1.530970811843872,"z":-0.44825008511543274}}}},{"camera":{"aspectRatio":2.0,"exposure":1.0,"farPlane":400.0,"fieldOfView":55.20000076293945,"isMain":true,"location":{"x":0.0,"y":1.2000000476837158,"z":0.0},"nearPlane":1.0,"rotation":{"x":51.511505126953125,"y":0.15597067773342133},"thirdPerson":true,"thirdPersonDistance":3.0,"useEntityRotation":true,"useEntityTranslation":true},"id":7,"mesh":{"dontCull":false,"resourcePath":"capsule.gltf","visible":true},"name":{"name":"Player"},"player":{"allowInput":true,"creationSettings":{"shape":{"capsuleShapeSettings":{"density":1.0,"height":1.2000000476837158,"radius":0.30000001192092896,"scale":{"x":1.0,"y":1.0,"z":1.0}}}},"fastVelocity":4.0,"jumpVelocity":4.0,"slowVelocity":1.600000023841858},"text":{"halfSize":{"x":0.5,"y":1.0},"outlineColor":{"w":1.0,"x":0.0,"y":0.0,"z":0.0},"outlineFactor":0.0,"position":{"x":0.0,"y":1.600000023841858,"z":0.0},"resourcePath":"font/roboto.ttf","rotation":{"w":1.0,"x":0.0,"y":0.0,"z":0.0},"text":"This is the player","textColor":{"w":1.0,"x":1.0,"y":1.0,"z":1.0},"textScale":0.07999999821186066},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":1.0,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":1.0,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":1.0},"j3":{"w":1.0,"x":-10.923478126525879,"y":-0.030071211978793144,"z":-1.5454801321029663}}}},{"audio":{"cutoff":0.0010000000474974513,"falloffFactor":0.10000000149011612,"falloffPower":2.0,"stream":{"loop":false,"pitch":1.0,"resourcePath":"/music.wav","time":0.0,"volume":0.006747064646333456},"volume":1.0},"id":8,"name":{"name":"WelcomeText"},"text":{"halfSize":{"x":1.899999976158142,"y":1.0},"outlineColor":{"w":1.0,"x":1.0,"y":0.0,"z":0.0},"outlineFactor":0.15000000596046448,"position":{"x":0.0,"y":0.0,"z":1.2999999523162842},"resourcePath":"font/roboto.ttf","rotation":{"w":1.0,"x":0.0,"y":0.0,"z":0.0},"text":"Welcome to this demo scene!","textColor":{"w":1.0,"x":1.0,"y":1.0,"z":1.0},"textScale":0.1899999976158142},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.01578390598297119,"y":0.00355260306969285,"z":0.9998670816421509},"j1":{"w":0.0,"x":0.40691956877708435,"y":0.9134560227394104,"z":0.003178075887262821},"j2":{"w":0.0,"x":-0.913324773311615,"y":0.4069172441959381,"z":-0.015863558277487755},"j3":{"w":1.0,"x":2.9802322387695313e-08,"y":4.168000221252441,"z":-0.02871951460838318}}}},{"entities":[{"id":10,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":4,"creationSettings":{"angularVelocity":{"x":0.3400594890117645,"y":0.002075438853353262,"z":-0.2711464762687683},"linearVelocity":{"x":0.027797559276223183,"y":-0.06926704198122025,"z":0.03678030148148537},"motionQuality":1,"objectLayer":1,"restitution":-0.0,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226305991411209,"y":0.10399112105369568,"z":0.24259740114212036}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.06749320030212402,"y":-0.0013515298487618566,"z":0.04701119661331177},"j1":{"w":0.0,"x":-0.05943548306822777,"y":-5.547449109144509e-05,"z":-0.08533213287591934},"j2":{"w":0.0,"x":0.003344531636685133,"y":-0.2425646185874939,"z":-0.0021718384232372046},"j3":{"w":1.0,"x":-6.993166923522949,"y":0.07752954214811325,"z":-0.49586528539657593}}}},{"id":11,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":5,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226487040519714,"y":0.10399449616670609,"z":1.000009298324585}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.001214503077790141,"y":4.0089940739562735e-05,"z":0.08225589245557785},"j1":{"w":0.0,"x":-0.10398011654615402,"y":-0.000795417174231261,"z":0.0015356455696746707},"j2":{"w":0.0,"x":0.0076551553793251514,"y":-0.9999799728393555,"z":0.00037435046397149563},"j3":{"w":1.0,"x":-0.18109244108200073,"y":1.1424553394317627,"z":-2.4032680988311768}}}},{"id":12,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":6,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370066404343,"y":0.10399212688207626,"z":0.9999992847442627}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.004975396674126387,"y":-3.6774740692635532e-06,"z":0.0821131020784378},"j1":{"w":0.0,"x":-0.10380175709724426,"y":-6.8306521825434174e-06,"z":-0.006289551965892315},"j2":{"w":0.0,"x":6.824726733611897e-05,"y":-0.9999992847442627,"z":-4.065033863298595e-05},"j3":{"w":1.0,"x":0.49817052483558655,"y":0.3519432246685028,"z":-2.3503992557525635}}}},{"id":13,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":7,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226367831230164,"y":0.10399219393730164,"z":0.9999990463256836}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.006919844541698694,"y":0.0009341590339317918,"z":0.08196679502725601},"j1":{"w":0.0,"x":-0.10362283140420914,"y":-0.00030928864725865424,"z":0.008751623332500458},"j2":{"w":0.0,"x":0.003919091075658798,"y":-0.9999301433563232,"z":0.011065145023167133},"j3":{"w":1.0,"x":2.0737833976745605,"y":0.3635621964931488,"z":-1.7112125158309937}}}},{"id":14,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":8,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226367831230164,"y":0.1039920523762703,"z":0.9999991655349731}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.00037123600486665964,"y":-0.00020935118664056063,"z":0.08226258307695389},"j1":{"w":0.0,"x":-0.10399100184440613,"y":-7.686027743147861e-07,"z":0.000469290855107829},"j2":{"w":0.0,"x":-4.082914983882802e-06,"y":-0.9999959468841553,"z":-0.0025448778178542852},"j3":{"w":1.0,"x":3.7019379138946533,"y":0.35346531867980957,"z":-2.4043333530426025}}}},{"id":15,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":9,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.0822637528181076,"y":0.10399219393730164,"z":1.0000001192092896}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.0014320656191557646,"y":-0.005514409858733416,"z":0.08206624537706375},"j1":{"w":0.0,"x":-0.1039608046412468,"y":-0.0019218007801100612,"z":0.0016850243555381894},"j2":{"w":0.0,"x":0.01734951324760914,"y":-0.9975799322128296,"z":-0.06733495742082596},"j3":{"w":1.0,"x":1.3664464950561523,"y":1.2094060182571411,"z":-2.3293323516845703}}}},{"id":16,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":10,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226368576288223,"y":0.1039920523762703,"z":0.9999992251396179}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.007250844966620207,"y":-0.00029188839835114777,"z":0.08194299042224884},"j1":{"w":0.0,"x":-0.10357026010751724,"y":0.0019194179913029075,"z":-0.009157725609838963},"j2":{"w":0.0,"x":-0.01807291805744171,"y":-0.9998225569725037,"z":-0.005160685162991285},"j3":{"w":1.0,"x":3.177853584289551,"y":1.137428641319275,"z":-2.286043643951416}}}},{"id":17,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":11,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370066404343,"y":0.10399207472801208,"z":0.9999994039535522}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.007074753753840923,"y":-0.0009124425705522299,"z":0.08195383846759796},"j1":{"w":0.0,"x":-0.10360674560070038,"y":2.178741397074191e-06,"z":-0.008943937718868256},"j2":{"w":0.0,"x":0.0009330803295597434,"y":-0.999937891960144,"z":-0.01105236355215311},"j3":{"w":1.0,"x":4.739034652709961,"y":1.1431937217712402,"z":-2.344177484512329}}}},{"id":18,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":12,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370066404343,"y":0.10399207472801208,"z":0.9999992847442627}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-2.9814507797709666e-05,"y":-0.00011468570301076397,"z":0.08226361125707626},"j1":{"w":0.0,"x":-0.1039920523762703,"y":-5.103151488583535e-05,"z":-3.7763817090308294e-05},"j2":{"w":0.0,"x":0.0004912313306704164,"y":-0.9999982118606567,"z":-0.0013939131749793887},"j3":{"w":1.0,"x":5.269709587097168,"y":0.3537576496601105,"z":-2.396353006362915}}}},{"id":19,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":13,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226397633552551,"y":0.10399534553289413,"z":1.0000017881393433}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.0029943662229925394,"y":-0.004902660381048918,"z":0.08206314593553543},"j1":{"w":0.0,"x":-0.1038932278752327,"y":-0.00239846995100379,"z":-0.0039341989904642105},"j2":{"w":0.0,"x":0.025261566042900085,"y":-0.9979578852653503,"z":-0.05869881808757782},"j3":{"w":1.0,"x":0.4539576470851898,"y":1.9912066459655762,"z":-2.3605332374572754}}}},{"id":20,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":14,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226369321346283,"y":0.10399205982685089,"z":0.9999991655349731}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.0047220797277987,"y":-0.006254853215068579,"z":0.08188952505588531},"j1":{"w":0.0,"x":-0.10381996631622314,"y":0.000815314007923007,"z":-0.005924399942159653},"j2":{"w":0.0,"x":-0.0034728916361927986,"y":-0.9970735311508179,"z":-0.0763583704829216},"j3":{"w":1.0,"x":2.0099921226501465,"y":1.9823397397994995,"z":-2.1112253665924072}}}},{"id":21,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":15,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370066404343,"y":0.10399207472801208,"z":0.9999992847442627}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.0015184117946773767,"y":-0.001873633824288845,"z":0.08222834020853043},"j1":{"w":0.0,"x":-0.10390593856573105,"y":0.0038146909791976213,"z":-0.0018317853100597858},"j2":{"w":0.0,"x":-0.036265525966882706,"y":-0.9990666508674622,"z":-0.02343420498073101},"j3":{"w":1.0,"x":3.611302614212036,"y":1.9326788187026978,"z":-2.369572162628174}}}},{"id":22,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":16,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370811462402,"y":0.10399207472801208,"z":0.9999992251396179}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.0011607652995735407,"y":-0.005252636969089508,"z":0.08208763599395752},"j1":{"w":0.0,"x":-0.1039327085018158,"y":-0.003092399565503001,"z":-0.0016675429651513696},"j2":{"w":0.0,"x":0.03069702349603176,"y":-0.9975154995918274,"z":-0.06339509040117264},"j3":{"w":1.0,"x":0.911769449710846,"y":2.8139381408691406,"z":-2.3714351654052734}}}},{"id":23,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":17,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226369321346283,"y":0.10399208217859268,"z":0.9999988079071045}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.002328230533748865,"y":-0.01567736454308033,"z":0.08072245121002197},"j1":{"w":0.0,"x":-0.10387608408927917,"y":0.0032992407213896513,"z":0.0036367876455187798},"j2":{"w":0.0,"x":-0.03779618442058563,"y":-0.9811586737632751,"z":-0.189463809132576},"j3":{"w":1.0,"x":2.5983128547668457,"y":2.8227591514587402,"z":-2.0519001483917236}}}},{"id":24,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":18,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226368576288223,"y":0.1039920523762703,"z":0.9999991655349731}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.006420230958610773,"y":-0.0025190962478518486,"z":0.0819740742444992},"j1":{"w":0.0,"x":-0.10356941819190979,"y":0.004437707830220461,"z":0.008247951045632362},"j2":{"w":0.0,"x":-0.04495199769735336,"y":-0.9986188411712646,"z":-0.027167268097400665},"j3":{"w":1.0,"x":4.155186176300049,"y":2.7027957439422607,"z":-2.4178249835968018}}}},{"id":25,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":19,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226369321346283,"y":0.10399205982685089,"z":0.9999993443489075}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.007614439819008112,"y":-0.014711390249431133,"z":0.08057859539985657},"j1":{"w":0.0,"x":-0.1032203733921051,"y":-0.006378653459250927,"z":-0.010918588377535343},"j2":{"w":0.0,"x":0.07885781675577164,"y":-0.9819651246070862,"z":-0.17182737588882446},"j3":{"w":1.0,"x":1.3723328113555908,"y":3.7512500286102295,"z":-2.243227481842041}}}},{"id":26,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":20,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226370066404343,"y":0.10399207472801208,"z":0.9999992847442627}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.005531982518732548,"y":-0.015606719069182873,"z":0.08058004826307297},"j1":{"w":0.0,"x":-0.10365156084299088,"y":0.005922866519540548,"z":-0.005968747194856405},"j2":{"w":0.0,"x":-0.0449003241956234,"y":-0.9801850318908691,"z":-0.19292448461055756},"j3":{"w":1.0,"x":3.1063742637634277,"y":3.642221689224243,"z":-2.205120325088501}}}},{"id":27,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":21,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226369321346283,"y":0.10399165004491806,"z":0.9999992251396179}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.009233793243765831,"y":-2.8461645484867404e-08,"z":-0.08174382150173187},"j1":{"w":0.0,"x":5.111483005748596e-07,"y":-0.10399164259433746,"z":-2.153150546746474e-08},"j2":{"w":0.0,"x":-0.9936796426773071,"y":-4.907456968794577e-06,"z":0.11224624514579773},"j3":{"w":1.0,"x":5.397507667541504,"y":1.5309886932373047,"z":-0.8703097105026245}}}},{"id":28,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":22,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226369321346283,"y":0.1039920523762703,"z":0.9999992251396179}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.004304870497435331,"y":-0.016259904950857162,"z":0.08052577078342438},"j1":{"w":0.0,"x":-0.10374186187982559,"y":0.0035653808154165745,"z":0.006265922449529171},"j2":{"w":0.0,"x":-0.04547032341361046,"y":-0.9796709418296814,"z":-0.19538608193397522},"j3":{"w":1.0,"x":3.7071003913879395,"y":4.404808521270752,"z":-2.0641326904296875}}}},{"id":29,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":23,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226374536752701,"y":0.1039920300245285,"z":1.0000001192092896}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.004521988797932863,"y":-0.014796562492847443,"z":0.08079565316438675},"j1":{"w":0.0,"x":-0.10348106175661087,"y":-0.007410035468637943,"z":-0.0071486919187009335},"j2":{"w":0.0,"x":0.0823487713932991,"y":-0.9811068177223206,"z":-0.17506666481494904},"j3":{"w":1.0,"x":1.740257740020752,"y":4.569649696350098,"z":-2.0765440464019775}}}},{"id":30,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":24,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226379007101059,"y":0.1486254185438156,"z":0.9800000190734863}}}},"layer":1},"script":{"resourcePath":"scripts/example.lua","scriptProperties":{"duplicateEntityName":{"type":"string","value":""}}},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.0822434350848198,"y":-3.559059393865027e-07,"z":-0.0018298403592780232},"j1":{"w":0.0,"x":6.938781211829337e-07,"y":0.1486254185438156,"z":2.2790266029915074e-06},"j2":{"w":0.0,"x":0.021798700094223022,"y":-1.5125399841053877e-05,"z":0.97975754737854},"j3":{"w":1.0,"x":-0.42584455013275146,"y":-0.042439818382263184,"z":0.7894344925880432}}}},{"id":31,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":25,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226379007101059,"y":0.01507602445781231,"z":0.9800000190734863}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.07320480048656464,"y":4.977956632501446e-05,"z":-0.03752845898270607},"j1":{"w":0.0,"x":0.006859811022877693,"y":-0.0011024783598259091,"z":0.013379612006247044},"j2":{"w":0.0,"x":-0.032167207449674606,"y":-0.9773759245872498,"z":-0.0640433058142662},"j3":{"w":1.0,"x":2.4300098419189453,"y":0.3631786108016968,"z":1.207587718963623}}}},{"id":32,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":26,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226379007101059,"y":0.1486254185438156,"z":0.9800000190734863}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.06837532669305801,"y":-0.0017373006558045745,"z":-0.04570697247982025},"j1":{"w":0.0,"x":0.05685741454362869,"y":0.11100539565086365,"z":0.08083657920360565},"j2":{"w":0.0,"x":0.39542150497436523,"y":-0.6513306498527527,"z":0.6162874698638916},"j3":{"w":1.0,"x":3.135746955871582,"y":0.2095150351524353,"z":-1.027677297592163}}}},{"id":33,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":27,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226379007101059,"y":0.1486254185438156,"z":0.9800000190734863}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.0716107115149498,"y":-4.5638077494913887e-07,"z":-0.040487490594387054},"j1":{"w":0.0,"x":0.0005247447988949716,"y":0.14862160384655,"z":0.0009264472755603492},"j2":{"w":0.0,"x":0.4823108911514282,"y":-0.007020606193691492,"z":0.8530691862106323},"j3":{"w":1.0,"x":2.5021331310272217,"y":-0.04527640342712402,"z":0.6787291169166565}}}}],"id":9,"name":{"name":"Staircase"},"root":false},{"id":34,"mesh":{"dontCull":false,"resourcePath":"metallicwall.gltf","visible":true},"name":{"name":"Entity 7"},"rigidBody":{"bodyIndex":28,"creationSettings":{"motionQuality":1,"objectLayer":1,"shape":{"boundingBoxSettings":{"aabb":{"max":{"x":7.46401834487915,"y":15.011363983154297,"z":0.4019695222377777},"min":{"x":-7.46401834487915,"y":0.0833272933959961,"z":-0.4019695222377777}},"density":20.139999389648438,"scale":{"x":0.08226368576288223,"y":0.1039920523762703,"z":0.9999991655349731}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-3.9226383705681656e-06,"y":0.0,"z":0.08226368576288223},"j1":{"w":0.0,"x":-0.1039920523762703,"y":-2.479363736540563e-08,"z":-4.958727458870271e-06},"j2":{"w":0.0,"x":2.384183801495965e-07,"y":-0.9999991655349731,"z":0.0},"j3":{"w":1.0,"x":3.1176745891571045,"y":5.388330459594727,"z":-4.729436874389648}}}},{"entities":[{"entities":[{"id":37,"mesh":{"dontCull":false,"resourcePath":"chromesphere.gltf","visible":true},"name":{"name":"Sphere"},"rigidBody":{"bodyIndex":31,"creationSettings":{"objectLayer":1,"restitution":0.8999999761581421,"shape":{"sphereSettings":{"density":1.0,"radius":1.0000001192092896,"scale":{"x":1.0,"y":0.9999997615814209,"z":1.0}}}},"layer":1},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.9554481506347656,"y":0.03446343168616295,"z":0.2931368052959442},"j1":{"w":0.0,"x":-0.090654656291008,"y":0.9794187545776367,"z":0.18033011257648468},"j2":{"w":0.0,"x":-0.28088951110839844,"y":-0.1988704651594162,"z":0.9389098882675171},"j3":{"w":0.9999997019767761,"x":-1.679507851600647,"y":-0.44968080520629883,"z":6.649218559265137}}}}],"id":36,"mesh":{"dontCull":false,"resourcePath":"chromesphere.gltf","visible":true},"name":{"name":"Sphere"},"rigidBody":{"bodyIndex":30,"creationSettings":{"angularVelocity":{"x":-0.003580757649615407,"y":-0.0010163785191252828,"z":-0.001152479788288474},"linearVelocity":{"x":0.0011589848436415195,"y":-0.276141881942749,"z":-0.003600968746468425},"objectLayer":1,"restitution":0.8999999761581421,"shape":{"sphereSettings":{"density":1.0,"radius":1.0000001192092896,"scale":{"x":1.0,"y":1.0,"z":1.0}}}},"layer":1},"root":false,"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.751174807548523,"y":0.22571837902069092,"z":-0.6203150153160095},"j1":{"w":0.0,"x":-0.39222919940948486,"y":0.6032152771949768,"z":0.6944692730903625},"j2":{"w":0.0,"x":0.5309374332427979,"y":0.7649720907211304,"z":-0.3645859360694885},"j3":{"w":1.0,"x":-11.712514877319336,"y":4.754337310791016,"z":-4.003152370452881}}}}],"id":35,"mesh":{"dontCull":false,"resourcePath":"chromesphere.gltf","visible":true},"name":{"name":"Sphere"},"rigidBody":{"bodyIndex":29,"creationSettings":{"angularVelocity":{"x":0.16539807617664337,"y":0.1814352571964264,"z":-0.11671467125415802},"linearVelocity":{"x":0.11671468615531921,"y":2.4347741600649897e-09,"z":0.16539809107780457},"objectLayer":1,"restitution":0.8999999761581421,"shape":{"sphereSettings":{"density":1.0,"radius":1.0000001192092896,"scale":{"x":1.0,"y":1.0,"z":1.0}}}},"layer":1},"root":false,"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":-0.6672989130020142,"y":0.0363946259021759,"z":0.7439002990722656},"j1":{"w":0.0,"x":0.5453938245773315,"y":0.7040697336196899,"z":0.45478731393814087},"j2":{"w":0.0,"x":-0.5072058439254761,"y":0.7091977000236511,"z":-0.48967432975769043},"j3":{"w":1.0,"x":-12.277113914489746,"y":0.9699291586875916,"z":-0.5359781384468079}}}},{"id":38,"name":{"name":"Entity 39"},"script":{"resourcePath":"scripts/entitySpawner.lua","scriptProperties":{"spawnEntityName":{"type":"string","value":"Sphere"},"spawnRate":{"type":"double","value":1.0}}},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":1.0,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":1.0,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":1.0},"j3":{"w":1.0,"x":0.0,"y":9.527641296386719,"z":0.0}}}},{"id":39,"name":{"name":"Entity 39"},"script":{"resourcePath":"scripts/entitySpawner.lua","scriptProperties":{"spawnEntityName":{"type":"string","value":"Sphere"},"spawnRate":{"type":"double","value":1.0}}},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":1.0,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":1.0,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":1.0},"j3":{"w":1.0,"x":-5.397964000701904,"y":12.993012428283691,"z":0.0}}}},{"entities":[{"id":41,"mesh":{"dontCull":false,"resourcePath":"tree.obj","visible":true},"name":{"name":"Tree base"},"rigidBody":{"bodyIndex":32,"creationSettings":{"angularDampening":0.0,"linearDampening":0.0,"shape":{"meshSettings":{"resourcePath":"tree.obj","scale":{"x":0.15000003576278687,"y":0.15000003576278687,"z":0.15000003576278687}}}},"layer":0},"transform":{"isStatic":false,"matrix":{"j0":{"w":0.0,"x":0.15000003576278687,"y":0.0,"z":0.0},"j1":{"w":0.0,"x":0.0,"y":0.15000003576278687,"z":0.0},"j2":{"w":0.0,"x":0.0,"y":0.0,"z":0.15000003576278687},"j3":{"w":1.0,"x":0.0,"y":0.0,"z":0.0}}}}],"id":40,"name":{"name":"Trees"},"root":false}],"id":0,"name":{"name":"Root"},"root":false}],"fog":{"ambientFactor":0.009999999776482582,"density":0.0005000000237487257,"enable":true,"extinctionCoefficients":{"w":1.0,"x":0.9300000071525574,"y":0.9649999737739563,"z":1.0},"extinctionFactor":0.1599999964237213,"height":0.0,"heightFalloff":0.0284000001847744,"rayMarchStepCount":10,"rayMarching":true,"scatteringAnisotropy":-0.6000000238418579,"scatteringFactor":2.0,"volumetricIntensity":1.0},"irradianceVolume":{"aabb":{"max":{"x":23.738000869750977,"y":18.340999603271484,"z":17.85099983215332},"min":{"x":-38.63600158691406,"y":-9.817999839782715,"z":-21.163000106811523}},"bias":0.30000001192092896,"enable":true,"gamma":5.0,"hysteresis":0.9800000190734863,"lowerResMoments":true,"opacityCheck":false,"optimizeProbes":true,"probeCount":{"x":20,"y":20,"z":20},"rayCount":100,"rayCountInactive":32,"sampleEmissives":false,"sharpness":50.0,"strength":1.0,"useShadowMap":false},"name":"sponza","physicsWorld":null,"postProcessing":{"chromaticAberration":{"colorsReversed":false,"enable":false,"strength":1.0},"contrast":1.0,"filmGrain":{"enable":false,"strength":0.10000000149011612},"filmicTonemapping":false,"fsr2":true,"paperWhiteLuminance":150.0,"saturation":1.0,"screenMaxLuminance":1600.0,"sharpen":{"enable":true,"factor":0.15000000596046448},"taa":{"enable":true,"jitterRange":0.9900000095367432},"tint":{"x":1.0,"y":1.0,"z":1.0},"vignette":{"color":{"x":0.0,"y":0.0,"z":0.0},"enable":false,"offset":0.0,"power":0.0,"strength":0.0}},"reflection":{"bias":0.0,"currentClipFactor":2.0,"enable":true,"gi":true,"historyClipMax":1.0,"opacityCheck":false,"radianceLimit":10.0,"rt":true,"spatialFilterStrength":10.0,"temporalWeight":0.9520000219345093,"textureLevel":4,"useShadowMap":false},"sky":{"atmosphere":{"height":100000.0,"probeResolution":128},"clouds":{"castShadow":false,"coverageResolution":512,"coverageScale":0.25,"coverageSpeed":5.0,"darkEdgeAmbient":0.10000000149011612,"darkEdgeFocus":2.0,"densityMultiplier":0.800000011920929,"detailResolution":32,"detailScale":16.0,"detailSpeed":10.0,"detailStrength":0.15000000596046448,"distanceLimit":8000.0,"enable":true,"heightStretch":0.5,"maxHeight":1700.0,"minHeight":1400.0,"occlusionSampleCount":5,"sampleCount":64,"scattering":{"eccentricityFirstPhase":0.0,"eccentricitySecondPhase":-0.5,"extinctionCoefficients":{"w":1.0,"x":0.9300000071525574,"y":0.9649999737739563,"z":1.0},"extinctionFactor":0.1599999964237213,"phaseAlpha":0.5,"scatteringFactor":2.0},"shadowResolution":512,"shadowSampleFraction":4,"shapeResolution":128,"shapeScale":2.0,"shapeSpeed":5.0,"stochasticOcclusionSampling":true},"planetCenter":{"x":0.0,"y":-650000.0,"z":0.0},"planetRadius":649000.0},"ssgi":{"aoStrength":1.0,"enable":true,"enableAo":true,"irradianceLimit":10.0,"opacityCheck":false,"radius":1.0,"rayCount":2,"rt":false,"sampleCount":8},"sss":{"enable":true,"maxLength":0.4970000088214874,"sampleCount":8,"thickness":0.30000001192092896}} \ No newline at end of file diff --git a/data/scripts/cameraAnimation.lua b/data/scripts/cameraAnimation.lua new file mode 100644 index 000000000..438c4cd68 --- /dev/null +++ b/data/scripts/cameraAnimation.lua @@ -0,0 +1,54 @@ +-- This is a comment + +ScriptProperties = { + animationLength = { type = "double", value = 30.0 }, + animationActive = { type = "boolean", value = false } +} + +animationTime = 0.0 + +function Update(delta) + + local entity = GetThisEntity() + local scene = GetThisScene() + + if scene:HasMainCamera() ~= true or ScriptProperties.animationActive.value ~= true then + return + end + + local camera = scene:GetMainCamera() + local hierarchy = entity:GetHierarchyComponent() + + local children = hierarchy:GetChildren() + + if children == nil then + return + end + + if #children <= 1 then + return + end + + animationTime = animationTime + Atlas.Clock.GetDelta() + + local animationProgress = animationTime / ScriptProperties.animationLength.value + if animationProgress >= 1.0 then + return + end + + local childProgress = animationProgress * (#children - 1.0) + + local lowerChildIndex = math.floor(childProgress) + local upperChildIndex = math.ceil(childProgress) + local childFraction = childProgress - lowerChildIndex + + local lowerChildEntity = children[lowerChildIndex + 1] + local upperChildEntity = children[upperChildIndex + 1] + + local lowerChildCamera = lowerChildEntity:GetCameraComponent() + local upperChildCamera = upperChildEntity:GetCameraComponent() + + camera.location = Glm.Mix(lowerChildCamera:GetLocation(), upperChildCamera:GetLocation(), childFraction) + camera.rotation = Glm.Mix(lowerChildCamera.rotation, upperChildCamera.rotation, childFraction) + +end \ No newline at end of file diff --git a/data/scripts/entitySpawner.lua b/data/scripts/entitySpawner.lua new file mode 100644 index 000000000..8c588a022 --- /dev/null +++ b/data/scripts/entitySpawner.lua @@ -0,0 +1,61 @@ +-- This is a comment + +ScriptProperties = { + spawnEntityName = { type = "string", value = "" }, + spawnRate = { type = "double", value = 1.0 } +} + +lastSpawn = 0.0 + +function Update(delta) + + local entity = GetThisEntity() + local scene = GetThisScene() + local spawnEntity = scene:GetEntityByName(ScriptProperties.spawnEntityName.value) + + if not spawnEntity:IsValid() then + return + end + + transform = entity:GetTransformComponent() + + spawnTransform = spawnEntity:GetTransformComponent() + spawnRigidBody = spawnEntity:GetRigidBodyComponent() + + if spawnTransform == nil or spawnRigidBody == nil or transform == nil then + return + end + + local time = Atlas.Clock.Get() + local spawnFraction = 1.0 / ScriptProperties.spawnRate.value + + if time - lastSpawn > spawnFraction then + local decomp = Atlas.MatrixDecomposition(transform.globalMatrix) + + local spawnCenter = decomp.translation + + local deg = math.random(0.0, 1.0) * 2.0 * 3.14159 + local dist = math.random(0.0, 1.0) + math.random(0.0, 1.0) + + if dist > 1.0 then + dist = 2.0 - dist + end + + local dir = Glm.Vec3(math.cos(deg), 0.0, math.sin(deg)) * dist * 5.0 + + local spawnPoint = dir + spawnCenter + local matrix = Glm.Translate(spawnPoint) + + local newEntity = scene:DuplicateEntity(spawnEntity) + + local newTransform = newEntity:GetTransformComponent() + local newRigidBody = newEntity:GetRigidBodyComponent() + + newRigidBody:SetLinearVelocity(dir) + newTransform:Set(matrix) + + lastSpawn = time + + Atlas.Log.Warning("New spawn") + end +end \ No newline at end of file diff --git a/data/scripts/example.lua b/data/scripts/example.lua new file mode 100644 index 000000000..c0d1af858 --- /dev/null +++ b/data/scripts/example.lua @@ -0,0 +1,27 @@ +-- This is a comment + +ScriptProperties = { + duplicateEntityName = { type = "string", value = "" } +} + +function Update(delta) + entity = GetThisEntity() + + transform = entity:GetTransformComponent() + rigidBody = entity:GetRigidBodyComponent() + + local time = Atlas.Clock.Get() + + local offset = Glm.Vec3(0.0, math.sin(time), 0.0) + Glm.Vec3(0.0, 5.0, 0.0) + local matrix = Glm.Translate(offset) + + Atlas.Log.Warning(tostring(offset.y)) + + transform:Set(matrix) + + -- ~= is equal to != in most other languages + if rigidBody ~= nil then + rigidBody:SetLinearVelocity(Glm.Vec3(0.0)) + rigidBody:SetAngularVelocity(Glm.Vec3(0.0)) + end +end \ No newline at end of file diff --git a/data/scripts/thirdPersonPlayer.lua b/data/scripts/thirdPersonPlayer.lua new file mode 100644 index 000000000..3cb2065d0 --- /dev/null +++ b/data/scripts/thirdPersonPlayer.lua @@ -0,0 +1,34 @@ +-- This is a comment + +ScriptProperties = { + spawnEntityName = { type = "string", value = "" }, + spawnRate = { type = "double", value = 1.0 } +} + +lastSpawn = 0.0 + +function Update(delta) + + -- Only update the player rotation if there is input + local playerInput = (Atlas.KeyboardMap.IsKeyPressed(Atlas.Keycode.KeyW, true) or + Atlas.KeyboardMap.IsKeyPressed(Atlas.Keycode.KeyA, true) or + Atlas.KeyboardMap.IsKeyPressed(Atlas.Keycode.KeyS, true) or + Atlas.KeyboardMap.IsKeyPressed(Atlas.Keycode.KeyD, true)) + + if playerInput ~= true then + return + end + + local entity = GetThisEntity() + local scene = GetThisScene() + + local camera = entity:GetCameraComponent() + local transform = entity:GetTransformComponent() + local player = entity:GetPlayerComponent() + + local rotationMatrix = Glm.Rotate(Glm.Mat4(1.0), camera.rotation.x, Glm.Vec3(0.0, 1.0, 0.0)) + local recomposed = Atlas.MatrixDecomposition(rotationMatrix) + + player:SetRotation(Glm.Quat(recomposed.rotation)) + +end \ No newline at end of file diff --git a/data/shader/deferred/direct.csh b/data/shader/deferred/direct.csh index 8552c0ee2..2f71f6c2e 100644 --- a/data/shader/deferred/direct.csh +++ b/data/shader/deferred/direct.csh @@ -63,7 +63,7 @@ void main() { // for transmissive materials vec3 shadowNormal = surface.material.transmissive ? dot(-uniforms.light.direction.xyz, geometryNormal) < 0.0 ? -geometryNormal : geometryNormal : geometryNormal; - shadowFactor = CalculateCascadedShadow(uniforms.light.shadow, cascadeMaps, surface.P, + shadowFactor = CalculateCascadedShadow(uniforms.light.shadow, cascadeMaps, surface.P, vec3(vec2(pixel) + 0.5, 0.0), shadowNormal, saturate(dot(-uniforms.light.direction.xyz, shadowNormal))); #endif #ifdef SCREEN_SPACE_SHADOWS diff --git a/data/shader/fsr2/ffx_fsr2_upsample.h b/data/shader/fsr2/ffx_fsr2_upsample.h index 119ebbf67..58a19d23f 100644 --- a/data/shader/fsr2/ffx_fsr2_upsample.h +++ b/data/shader/fsr2/ffx_fsr2_upsample.h @@ -177,10 +177,6 @@ FfxFloat32x4 ComputeUpsampledColorAndWeight(const AccumulationPassCommonParams p Deringing(clippingBox, fColorAndWeight.xyz); } - #if FFX_FSR2_OPTION_UPSAMPLE_SAMPLERS_USE_DATA_HALF && FFX_HALF - #include "ffx_fsr2_force16_end.h" - #endif - return fColorAndWeight; } diff --git a/data/shader/pathtracer/temporal.csh b/data/shader/pathtracer/temporal.csh index 4802f5083..e3de1f27e 100644 --- a/data/shader/pathtracer/temporal.csh +++ b/data/shader/pathtracer/temporal.csh @@ -399,7 +399,7 @@ void main() { historyRadiance, currentRadiance); float adjClipBlend = clamp(clipBlend, 0.0, pushConstants.historyClipMax); currentRadiance = clamp(currentRadiance, currentNeighbourhoodMin, currentNeighbourhoodMax); - //historyRadiance = mix(historyRadiance, currentRadiance, adjClipBlend); + // historyRadiance = mix(historyRadiance, currentRadiance, adjClipBlend); historyRadiance = YCoCgToRGB(historyRadiance); currentRadiance = YCoCgToRGB(currentRadiance); diff --git a/data/shader/postprocessing.fsh b/data/shader/postprocessing.fsh index 673e85a45..08cd7a055 100644 --- a/data/shader/postprocessing.fsh +++ b/data/shader/postprocessing.fsh @@ -25,7 +25,7 @@ layout(set = 3, binding = 4) uniform UniformBuffer { float vignettePower; float vignetteStrength; vec4 vignetteColor; - + vec4 tintColor; } Uniforms; const float gamma = 1.0 / 2.2; @@ -65,7 +65,7 @@ float ToneMap(float luminance) { vec3 saturate(vec3 color, float factor) { const vec3 luma = vec3(0.299, 0.587, 0.114); - vec3 pixelLuminance = vec3(dot(color, luma)); + vec3 pixelLuminance = max(vec3(dot(color, luma)), vec3(0.0)); return mix(pixelLuminance, color, factor); } @@ -180,6 +180,8 @@ void main() { #endif #endif + color = color * Uniforms.tintColor.rgb; + color = clamp(saturate(color, Uniforms.saturation), vec3(0.0), vec3(1.0)); color = ((color - 0.5) * max(Uniforms.contrast, 0.0)) + 0.5; diff --git a/data/shader/shadow.hsh b/data/shader/shadow.hsh index f2e915708..1ebf61ae9 100644 --- a/data/shader/shadow.hsh +++ b/data/shader/shadow.hsh @@ -2,6 +2,10 @@ #extension GL_EXT_texture_shadow_lod : require #endif +#include +#include +#include + // Shadow cascades struct Cascade { @@ -21,11 +25,11 @@ struct Shadow { float distance; float bias; + float edgeSoftness; float cascadeBlendDistance; int cascadeCount; - float aligment0; float aligment1; vec2 resolution; @@ -34,6 +38,18 @@ struct Shadow { }; +vec2 VogelDiskSample(int sampleIndex, int samplesCount, float phi) { + const float goldenAngle = 2.4; + + float r = sqrt(float(sampleIndex) + 0.5) / sqrt(float(samplesCount)); + float theta = float(sampleIndex) * goldenAngle + phi; + + float sine = sin(theta); + float cosine = cos(theta); + + return vec2(r * cosine, r * sine); +} + // Filtering based on http://the-witness.net/news/2013/09/shadow-mapping-summary-part-1/ float offsetLookup(sampler2DArrayShadow cascadeMaps, vec2 flooredUV, float u, float v, float cascadeIndex, @@ -52,13 +68,35 @@ float offsetLookup(sampler2DArrayShadow cascadeMaps, vec2 flooredUV, float u, fl } -float cascadeLookup(Shadow shadow, sampler2DArrayShadow cascadeMaps, float cascadeIndex, mat4 cascadeTransform, vec3 fragmentPosition, float bias, bool fade) { +float offsetLookup(sampler2DArrayShadow cascadeMaps, vec2 uv, float cascadeIndex, float edgeSoftness, + vec2 texelSize, vec2 invResolution, vec3 fragmentPosition, int lookupIndex, float depth, float bias) { + + uv = 0.5 * (uv * invResolution) + 0.5; + vec2 samplingSpread = edgeSoftness * invResolution / texelSize; + + float phi = 2.0 * PI * GetInterleavedGradientNoise(fragmentPosition.xy); + vec2 offset = VogelDiskSample(lookupIndex, 16, phi) * samplingSpread; + +#ifdef AE_TEXTURE_SHADOW_LOD + // This fixes issues that can occur at cascade borders + return textureLod(cascadeMaps, + vec4(uv + offset, cascadeIndex, depth + bias), 0); +#else + return texture(cascadeMaps, + vec4(uv + offset, cascadeIndex, depth + bias)); +#endif + +} + + +float cascadeLookup(Shadow shadow, sampler2DArrayShadow cascadeMaps, float cascadeIndex, mat4 cascadeTransform, + vec3 fragmentPosition, vec3 position, float bias, bool fade) { vec4 shadowCoords = cascadeTransform * vec4(fragmentPosition, 1.0); shadowCoords.xyz /= shadowCoords.w; - float fadeout = fade ? clamp((-fragmentPosition.z + 2.0 - shadow.distance) * 0.5, 0.0, 1.0) : 0.0; - + float fadeout = fade ? clamp((-fragmentPosition.z + 2.0 - shadow.distance) * 0.5, 0.0, 1.0) : 0.0; + //shadowCoords.z = shadowCoords.z * 0.5 + 0.5; if (abs(fadeout - 1.0) < 1e-6) @@ -176,6 +214,19 @@ float cascadeLookup(Shadow shadow, sampler2DArrayShadow cascadeMaps, float casca visibility /= 2704.0; #endif +#define SHADOW_FILTER_VOGEL + +#ifdef SHADOW_FILTER_VOGEL + visibility = 0.0; + + vec2 texelSize = vec2(shadow.cascades[int(cascadeIndex)].texelSize); + for (int i = 0; i < 16; i++) { + visibility += offsetLookup(cascadeMaps, uv, float(cascadeIndex), shadow.edgeSoftness, texelSize, resInv, position, i, shadowCoords.z, bias); + } + + visibility /= 16.0; +#endif + // Fade out shadow in the distance return clamp(visibility + fadeout, 0.0, 1.0); @@ -217,7 +268,89 @@ float CalculateCascadedShadow(Shadow shadow, sampler2DArrayShadow cascadeMaps, v fragmentPosition += bias; float visibility = cascadeLookup(shadow, cascadeMaps, float(cascadeIndex), - cascadeMatrix, fragmentPosition, 0.0, true); + cascadeMatrix, fragmentPosition, fragmentPosition, 0.0, true); + +#ifdef SHADOW_CASCADE_BLENDING + if (cascadeIndex < shadow.cascadeCount - 1) { + + float cascadeDistance = shadow.cascades[0].distance; + cascadeDistance = cascadeIndex > 0 ? shadow.cascades[1].distance : cascadeDistance; + cascadeDistance = cascadeIndex > 1 ? shadow.cascades[2].distance : cascadeDistance; + cascadeDistance = cascadeIndex > 2 ? shadow.cascades[3].distance : cascadeDistance; + cascadeDistance = cascadeIndex > 3 ? shadow.cascades[4].distance : cascadeDistance; + + float blend = (cascadeDistance - distance) + / shadow.cascadeBlendDistance; + blend = clamp(blend, 0.0, 1.0); + + if (blend <= 1.0) { + + cascadeIndex += 1; + fragmentPosition -= bias; + + mat4 cascadeMatrix = shadow.cascades[0].cascadeSpace; + cascadeMatrix = cascadeIndex > 0 ? shadow.cascades[1].cascadeSpace : cascadeMatrix; + cascadeMatrix = cascadeIndex > 1 ? shadow.cascades[2].cascadeSpace : cascadeMatrix; + cascadeMatrix = cascadeIndex > 2 ? shadow.cascades[3].cascadeSpace : cascadeMatrix; + cascadeMatrix = cascadeIndex > 3 ? shadow.cascades[4].cascadeSpace : cascadeMatrix; + cascadeMatrix = cascadeIndex > 4 ? shadow.cascades[5].cascadeSpace : cascadeMatrix; + + float texelSize = shadow.cascades[0].texelSize; + texelSize = cascadeIndex > 0 ? shadow.cascades[1].texelSize : texelSize; + texelSize = cascadeIndex > 1 ? shadow.cascades[2].texelSize : texelSize; + texelSize = cascadeIndex > 2 ? shadow.cascades[3].texelSize : texelSize; + texelSize = cascadeIndex > 3 ? shadow.cascades[4].texelSize : texelSize; + texelSize = cascadeIndex > 4 ? shadow.cascades[5].texelSize : texelSize; + + bias = shadow.bias * texelSize * normal / max(cosTheta, 0.5); + fragmentPosition += bias; + + visibility = mix(cascadeLookup(shadow, cascadeMaps, float(cascadeIndex), + cascadeMatrix, fragmentPosition, fragmentPosition, 0.0, true), visibility, blend); + } + } +#endif + + return visibility; +} + +float CalculateCascadedShadow(Shadow shadow, sampler2DArrayShadow cascadeMaps, vec3 fragmentPosition, vec3 position, vec3 normal, float cosTheta) { + + // Note: The code below is actually the fastest code on every platform tested + // Some platforms have problems directly indexing the cascade array. + // We allow 6 cascades +#ifdef SHADOW_CASCADE_BLENDING + float distance = -fragmentPosition.z - shadow.cascadeBlendDistance; +#else + float distance = -fragmentPosition.z; +#endif + int cascadeIndex = 0; + cascadeIndex = distance >= shadow.cascades[0].distance ? 1 : cascadeIndex; + cascadeIndex = distance >= shadow.cascades[1].distance ? 2 : cascadeIndex; + cascadeIndex = distance >= shadow.cascades[2].distance ? 3 : cascadeIndex; + cascadeIndex = distance >= shadow.cascades[3].distance ? 4 : cascadeIndex; + cascadeIndex = distance >= shadow.cascades[4].distance ? 5 : cascadeIndex; + cascadeIndex = min(shadow.cascadeCount - 1, cascadeIndex); + + mat4 cascadeMatrix = shadow.cascades[0].cascadeSpace; + cascadeMatrix = cascadeIndex > 0 ? shadow.cascades[1].cascadeSpace : cascadeMatrix; + cascadeMatrix = cascadeIndex > 1 ? shadow.cascades[2].cascadeSpace : cascadeMatrix; + cascadeMatrix = cascadeIndex > 2 ? shadow.cascades[3].cascadeSpace : cascadeMatrix; + cascadeMatrix = cascadeIndex > 3 ? shadow.cascades[4].cascadeSpace : cascadeMatrix; + cascadeMatrix = cascadeIndex > 4 ? shadow.cascades[5].cascadeSpace : cascadeMatrix; + + float texelSize = shadow.cascades[0].texelSize; + texelSize = cascadeIndex > 0 ? shadow.cascades[1].texelSize : texelSize; + texelSize = cascadeIndex > 1 ? shadow.cascades[2].texelSize : texelSize; + texelSize = cascadeIndex > 2 ? shadow.cascades[3].texelSize : texelSize; + texelSize = cascadeIndex > 3 ? shadow.cascades[4].texelSize : texelSize; + texelSize = cascadeIndex > 4 ? shadow.cascades[5].texelSize : texelSize; + + vec3 bias = shadow.bias * texelSize * normal / max(cosTheta, 0.5); + fragmentPosition += bias; + + float visibility = cascadeLookup(shadow, cascadeMaps, float(cascadeIndex), + cascadeMatrix, fragmentPosition, position, 0.0, true); #ifdef SHADOW_CASCADE_BLENDING if (cascadeIndex < shadow.cascadeCount - 1) { @@ -255,7 +388,7 @@ float CalculateCascadedShadow(Shadow shadow, sampler2DArrayShadow cascadeMaps, v fragmentPosition += bias; visibility = mix(cascadeLookup(shadow, cascadeMaps, float(cascadeIndex), - cascadeMatrix, fragmentPosition, 0.0, true), visibility, blend); + cascadeMatrix, fragmentPosition, position, 0.0, true), visibility, blend); } } #endif @@ -271,5 +404,5 @@ float CalculateShadowWorldSpace(Shadow shadow, sampler2DArrayShadow cascadeMaps, position += bias; return cascadeLookup(shadow, cascadeMaps, 0.0, - cascadeMatrix, position, 0.0, false); + cascadeMatrix, position, position, 0.0, false); } \ No newline at end of file diff --git a/data/shader/ssgi/ssgi.csh b/data/shader/ssgi/ssgi.csh index 6c07fd14b..4c5a2df7b 100644 --- a/data/shader/ssgi/ssgi.csh +++ b/data/shader/ssgi/ssgi.csh @@ -134,17 +134,20 @@ void main() { ivec2 stepPixel = ivec2(uvPos * vec2(resolution)); float stepDepth = texelFetch(depthTexture, stepPixel, 0).r; - float stepLinearDepth = -ConvertDepthToViewSpaceDepth(stepDepth); + vec3 stepPos = ConvertDepthToViewSpace(stepDepth, uvPos); + float stepLinearDepth = -stepPos.z; float rayDepth = -rayPos.z; float depthDelta = rayDepth - stepLinearDepth; vec3 worldNorm = normalize(vec3(globalData.ivMatrix * vec4(DecodeNormal(texelFetch(normalTexture, stepPixel, 0).rg), 0.0))); - if (depthDelta > 0.0 && abs(depthDelta) < rayLength) { + // Check if we are now behind the depth buffer, use that hit as the source of radiance + if (stepLinearDepth < rayDepth && abs(depthDelta) < rayLength) { float NdotL = dot(worldNorm, -ray.direction); if (NdotL >= 0.0) { vec3 rayIrradiance = texelFetch(directLightTexture, stepPixel * 2 + pixelOffset, 0).rgb; - irradiance += rayIrradiance; + float dist = distance(viewPos, stepPos); + irradiance += rayIrradiance / max(0.01, dist); } hit = true; diff --git a/data/shader/taa.csh b/data/shader/taa.csh index ba7ca084d..05d9708ef 100644 --- a/data/shader/taa.csh +++ b/data/shader/taa.csh @@ -24,11 +24,12 @@ layout(push_constant) uniform constants { } PushConstants; const float minVelocityBlend = 0.05; -const float maxVelocityBlend = 0.5; +const float maxVelocityBlend = 0.2; #define TAA_YCOCG #define TAA_BICUBIC // Nearly always use the bicubic sampling for better quality and sharpness under movement #define TAA_TONE // Somehow introduces more flickering as well +#define TAA_CLIP //#define TAA_DENOISE #ifdef PATHTRACE diff --git a/data/shader/volumetric/volumetric.hsh b/data/shader/volumetric/volumetric.hsh index 0439c7e99..8aec38c03 100644 --- a/data/shader/volumetric/volumetric.hsh +++ b/data/shader/volumetric/volumetric.hsh @@ -38,11 +38,19 @@ vec3 ApplyVolumetrics(Fog fog, vec3 inputColor, vec4 volumetricFog, vec4 volumet inputColor = alpha * inputColor; #endif +#ifdef FOG vec3 outputColor = fog.density > 0.0 ? inputColor * fogExtinction + volumetricFog.rgb : inputColor; +#else + vec3 outputColor = inputColor; +#endif #ifdef CLOUDS fogExtinction = intersectDists.x < 0.0 ? fogExtinction : 1.0; +#ifdef FOG outputColor += volumetricClouds.rgb * fogExtinction; +#else + outputColor += volumetricClouds.rgb; +#endif #endif return outputColor; diff --git a/libs/ImguiExtension/ImguiWrapper.cpp b/libs/ImguiExtension/ImguiWrapper.cpp index d1e683530..8ac97357a 100644 --- a/libs/ImguiExtension/ImguiWrapper.cpp +++ b/libs/ImguiExtension/ImguiWrapper.cpp @@ -137,7 +137,7 @@ namespace Atlas::ImguiExtension { commandList->EndCommands(); - device->SubmitCommandList(commandList, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT); + device->SubmitCommandList(commandList); } @@ -252,7 +252,7 @@ namespace Atlas::ImguiExtension { ImGuiIO &io = ImGui::GetIO(); UpdateKeyModifiers(event.keyModifiers); - ImGuiKey key = KeycodeToImGuiKey(event.keyCode); + ImGuiKey key = KeycodeToImGuiKey(static_cast(event.keyCode)); io.AddKeyEvent(key, event.down); } diff --git a/libs/ImguiExtension/panels/FogPanel.cpp b/libs/ImguiExtension/panels/FogPanel.cpp index 764b63a86..ad8cb0776 100644 --- a/libs/ImguiExtension/panels/FogPanel.cpp +++ b/libs/ImguiExtension/panels/FogPanel.cpp @@ -22,7 +22,7 @@ namespace Atlas::ImguiExtension { ImGui::Text("Volumetric"); ImGui::Checkbox("Raymarching", &fog->rayMarching); ImGui::SliderInt("Raymarch step count", &fog->rayMarchStepCount, 1, 32); - ImGui::SliderFloat("Intensity#", &fog->volumetricIntensity, 0.0f, 1.0f); + ImGui::SliderFloat("Intensity", &fog->volumetricIntensity, 0.0f, 1.0f); ImGui::PopID(); diff --git a/libs/ImguiExtension/panels/PostProcessingPanel.cpp b/libs/ImguiExtension/panels/PostProcessingPanel.cpp index 9de7b0fbe..04b4aea86 100644 --- a/libs/ImguiExtension/panels/PostProcessingPanel.cpp +++ b/libs/ImguiExtension/panels/PostProcessingPanel.cpp @@ -18,6 +18,7 @@ namespace Atlas::ImguiExtension { ImGui::Separator(); ImGui::Text("Image effects"); ImGui::Checkbox("Filmic tonemapping", &postProcessing.filmicTonemapping); + ImGui::ColorEdit3("Tint", glm::value_ptr(postProcessing.tint)); ImGui::SliderFloat("Saturation", &postProcessing.saturation, 0.0f, 2.0f); ImGui::SliderFloat("Contrast", &postProcessing.contrast, 0.0f, 2.0f); ImGui::SliderFloat("Paper white luminance", &postProcessing.paperWhiteLuminance, 0.0f, 300.0f); diff --git a/src/demo/App.cpp b/src/demo/App.cpp index d8eaafd46..1774da86e 100644 --- a/src/demo/App.cpp +++ b/src/demo/App.cpp @@ -16,15 +16,6 @@ using namespace Atlas::ImguiExtension; void App::LoadContent() { - music = Atlas::ResourceManager::GetOrLoadResource("more.wav"); - audio = Atlas::ResourceManager::GetOrLoadResource("more.wav"); - // static auto audioStream = Atlas::Audio::AudioManager::CreateStream(audio); - - for (uint32_t i = 0; i < 10000; i++) { - //audioStreams.push_back(Atlas::Audio::AudioManager::CreateStream(audio)); - //audioStreams.back()->SetVolume(0.0001); - } - renderTarget = Atlas::CreateRef(1920, 1080); pathTraceTarget = Atlas::CreateRef(1920, 1080); @@ -49,16 +40,16 @@ void App::LoadContent() { Atlas::Events::EventManager::KeyboardEventDelegate.Subscribe( [this](Atlas::Events::KeyboardEvent event) { - if (event.keyCode == AE_KEY_ESCAPE) { + if (event.keyCode == Keycode::KeyEscape) { Exit(); } - if (event.keyCode == AE_KEY_F11 && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyF11 && event.state == AE_BUTTON_RELEASED) { renderUI = !renderUI; } - if (event.keyCode == AE_KEY_LSHIFT && event.state == AE_BUTTON_PRESSED) { + if (event.keyCode == Keycode::KeyLeftShift && event.state == AE_BUTTON_PRESSED) { keyboardHandler.speed = cameraSpeed * 4.0f; } - if (event.keyCode == AE_KEY_LSHIFT && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyLeftShift && event.state == AE_BUTTON_RELEASED) { keyboardHandler.speed = cameraSpeed; } }); @@ -77,7 +68,8 @@ void App::LoadContent() { directionalLight.properties.directional.direction = glm::vec3(0.0f, -1.0f, 1.0f); directionalLight.color = glm::vec3(255, 236, 209) / 255.0f; - directionalLight.AddDirectionalShadow(200.0f, 3.0f, 4096, glm::vec3(0.0f), glm::vec4(-100.0f, 100.0f, -70.0f, 120.0f)); + directionalLight.AddDirectionalShadow(200.0f, 3.0f, 4096, 0.125f, + glm::vec3(0.0f), glm::vec4(-100.0f, 100.0f, -70.0f, 120.0f)); directionalLight.isMain = true; scene->ao = Atlas::CreateRef(16); @@ -216,7 +208,6 @@ void App::Update(float deltaTime) { }; auto& rigidBodyComponent = entity.AddComponent(bodySettings); rigidBodyComponent.SetRestitution(sphereRestitution); - entity.AddComponent(audio); entities.push_back(entity); lastSpawn = Atlas::Clock::Get(); @@ -241,8 +232,6 @@ void App::Update(float deltaTime) { camera.direction * meshes.back()->data.radius * 2.0f)); auto entity = scene->CreatePrefab(meshes.back(), matrix, false); - entity.AddComponent(audio); - auto bodySettings = Atlas::Physics::BodyCreationSettings { .objectLayer = Atlas::Physics::Layers::MOVABLE, .motionQuality = Atlas::Physics::MotionQuality::LinearCast, @@ -280,15 +269,21 @@ void App::Render(float deltaTime) { static float cloudDepthDebug = 0.0f; + graphicsDevice->WaitForPreviousFrameCompletion(); + #ifndef AE_HEADLESS auto windowFlags = window.GetFlags(); if (windowFlags & AE_WINDOW_HIDDEN || windowFlags & AE_WINDOW_MINIMIZED || !(windowFlags & AE_WINDOW_SHOWN)) { + // If we take the early way out we need to make sure that stuff is completed (usually main renderer takes care of that) + scene->WaitForAsyncWorkCompletion(); return; } #endif if (!loadingComplete) { DisplayLoadingScreen(deltaTime); + // If we take the early way out we need to make sure that stuff is completed + scene->WaitForAsyncWorkCompletion(); return; } @@ -490,6 +485,8 @@ void App::Render(float deltaTime) { ImGui::SliderInt("Max accumulated frames##Pathtrace", &mainRenderer->pathTracingRenderer.historyLengthMax, 1, 256); ImGui::SliderFloat("Current clip##Pathtrace", &mainRenderer->pathTracingRenderer.currentClipFactor, 0.1f, 4.0f); ImGui::SliderFloat("Max history clip##Pathtrace", &mainRenderer->pathTracingRenderer.historyClipMax, 0.0f, 1.0f); + + scene->rayTracingWorld->includeObjectHistory = pathTrace; } if (ImGui::CollapsingHeader("DDGI")) { irradianceVolumePanel.Render(volume); @@ -522,6 +519,7 @@ void App::Render(float deltaTime) { } } ImGui::SliderFloat("Bias##Shadow", &shadow->bias, 0.0f, 2.0f); + ImGui::DragFloat("Edge softness##Shadow", &shadow->edgeSoftness, 0.005f, 0.0f, 1.0f); } if (ImGui::CollapsingHeader("Screen-space shadows")) { ImGui::Checkbox("Debug##SSS", &debugSSS); @@ -587,10 +585,6 @@ void App::Render(float deltaTime) { if (ImGui::Button("Restore state##Physics")) { scene->physicsWorld->RestoreState(); } - ImGui::SameLine(); - if (ImGui::Button("Serialize##Physics")) { - Atlas::Scene::SceneSerializer::SerializeScene(scene, "test.json"); - } } if (ImGui::CollapsingHeader("Materials")) { int32_t id = 0; @@ -896,7 +890,7 @@ bool App::LoadScene() { scene->fog->volumetricIntensity = 0.0f; } else if (sceneSelection == FOREST) { - auto otherScene = Atlas::Loader::ModelLoader::LoadScene("forest/forest.gltf"); + auto otherScene = Atlas::Loader::ModelLoader::LoadScene("forest/forest.gltf", -glm::vec3(2048.0f), glm::vec3(2048.0f), 5); otherScene->Timestep(1.0f); CopyActors(otherScene); @@ -913,7 +907,7 @@ bool App::LoadScene() { scene->fog->volumetricIntensity = 0.08f; } else if (sceneSelection == EMERALDSQUARE) { - auto otherScene = Atlas::Loader::ModelLoader::LoadScene("emeraldsquare/square.gltf", false, 1024); + auto otherScene = Atlas::Loader::ModelLoader::LoadScene("emeraldsquare/square.gltf", -glm::vec3(2048.0f), glm::vec3(2048.0f), 5); otherScene->Timestep(1.0f); CopyActors(otherScene); @@ -1074,6 +1068,8 @@ void App::CheckLoadScene() { material->metalness = 0.0f; } + graphicsDevice->WaitForPreviousFrameCompletion(); + static std::future future; auto buildRTStructure = [&]() { diff --git a/src/demo/App.h b/src/demo/App.h index 00c246f5a..5608fe7a3 100644 --- a/src/demo/App.h +++ b/src/demo/App.h @@ -67,9 +67,6 @@ class App : public Atlas::EngineInstance { Ref scene; - Atlas::ResourceHandle audio; - Atlas::ResourceHandle music; - std::vector> meshes; Atlas::Scene::Entity cameraEntity; diff --git a/src/editor/App.cpp b/src/editor/App.cpp index 8afbabab9..92816fc2d 100644 --- a/src/editor/App.cpp +++ b/src/editor/App.cpp @@ -1,7 +1,7 @@ #include "App.h" #include "FileImporter.h" #include "Singletons.h" -#include "Serializer.h" +#include "Serialization.h" #include "Notifications.h" #include "ui/panels/PopupPanels.h" #include @@ -38,16 +38,9 @@ namespace Atlas::Editor { Singletons::imguiWrapper = CreateRef(); Singletons::imguiWrapper->Load(&window); Singletons::config = CreateRef(); - - Physics::SphereShapeSettings settings { - .radius = 1.0f, - .scale = vec3(0.9f), - }; - auto shape = Physics::ShapesManager::CreateShape(settings); - - shape->Scale(vec3(0.8f)); + - Serializer::DeserializeConfig(); + Serialization::DeserializeConfig(); // Everything that needs the config comes afterwards Singletons::icons = CreateRef(); @@ -70,10 +63,12 @@ namespace Atlas::Editor { Singletons::imguiWrapper->Unload(); for (const auto& sceneWindow : sceneWindows) { - Serializer::SerializeSceneWindow(sceneWindow); + if (sceneWindow->isPlaying) + sceneWindow->StopPlaying(); + Serialization::SerializeSceneWindow(sceneWindow); } - Serializer::SerializeConfig(); + Serialization::SerializeConfig(); Singletons::Destruct(); @@ -91,7 +86,7 @@ namespace Atlas::Editor { std::swap(waitToLoadScenes[i], waitToLoadScenes.back()); // After the scene is loaded we can retrieve the window configuration and deserialize it - sceneWindows.emplace_back(Serializer::DeserializeSceneWindow(waitToLoadScenes.back())); + sceneWindows.emplace_back(Serialization::DeserializeSceneWindow(waitToLoadScenes.back())); waitToLoadScenes.pop_back(); i--; } @@ -135,7 +130,9 @@ namespace Atlas::Editor { std::reverse(toBeDeletedSceneWindows.begin(), toBeDeletedSceneWindows.end()); for (auto sceneWindowIdx : toBeDeletedSceneWindows) { // Serialize window before erasing it - Serializer::SerializeSceneWindow(sceneWindows[sceneWindowIdx]); + if (sceneWindows[sceneWindowIdx]->isPlaying) + sceneWindows[sceneWindowIdx]->StopPlaying(); + Serialization::SerializeSceneWindow(sceneWindows[sceneWindowIdx]); sceneWindows.erase(sceneWindows.begin() + sceneWindowIdx); } @@ -152,7 +149,7 @@ namespace Atlas::Editor { auto cameraEntity = activeSceneWindow->cameraEntity; if (cameraEntity.IsValid() && activeSceneWindow->viewportPanel.isFocused && !lockMovement && - !ImGuizmo::IsUsing() && (!activeSceneWindow->isPlaying || !activeSceneWindow->hasPlayer)) { + !ImGuizmo::IsUsing() && !activeSceneWindow->isPlaying) { auto& camera = cameraEntity.GetComponent(); mouseHandler.sensibility = activeSceneWindow->cameraRotationSpeed; keyboardHandler.speed = activeSceneWindow->cameraMovementSpeed; @@ -189,6 +186,10 @@ namespace Atlas::Editor { ImGuizmo::Enable(activeSceneWindow->needGuizmoEnabled); + graphicsDevice->WaitForPreviousFrameCompletion(); + + + // This crashes when we start with path tracing and do the bvh build async // Launch BVH builds asynchronously auto buildRTStructure = [&]() { auto sceneMeshes = ResourceManager::GetResources(); @@ -209,11 +210,13 @@ namespace Atlas::Editor { else if(bvhBuilderFuture.wait_for(std::chrono::microseconds(0)) == std::future_status::ready) { bvhBuilderFuture.get(); } - + } void App::Render(float deltaTime) { + graphicsDevice->WaitForPreviousFrameCompletion(); + auto windowFlags = window.GetFlags(); if (windowFlags & AE_WINDOW_HIDDEN || windowFlags & AE_WINDOW_MINIMIZED || !(windowFlags & AE_WINDOW_SHOWN)) { return; @@ -296,7 +299,8 @@ namespace Atlas::Editor { contentBrowserWindow.Render(); logWindow.Render(); profilerWindow.Render(); - geometryBrushWindow.Render(sceneWindows[activeSceneIdx]); + + geometryBrushWindow.Render(sceneWindows.empty() ? nullptr : sceneWindows[activeSceneIdx]); for (auto& sceneWindow : sceneWindows) { sceneWindow->Render(); diff --git a/src/editor/DataCreator.cpp b/src/editor/DataCreator.cpp index e1141aa51..ef010e966 100644 --- a/src/editor/DataCreator.cpp +++ b/src/editor/DataCreator.cpp @@ -1,11 +1,14 @@ #include "DataCreator.h" +#include "loader/ModelLoader.h" +#include "volume/AABB.h" + namespace Atlas::Editor { using namespace Scene::Components; using namespace Scene::Prefabs; - Ref DataCreator::CreateScene(const std::string &name, vec3 min, vec3 max, int32_t depth) { + Ref DataCreator::CreateScene(const std::string& name, vec3 min, vec3 max, int32_t depth) { auto scene = CreateRef(name, min, max, depth); @@ -20,7 +23,8 @@ namespace Atlas::Editor { directionalLight.properties.directional.direction = glm::vec3(0.0f, -1.0f, 1.0f); directionalLight.color = glm::vec3(255, 236, 209) / 255.0f; directionalLight.intensity = 10.0f; - directionalLight.AddDirectionalShadow(200.0f, 3.0f, 4096, glm::vec3(0.0f), vec4(-100.0f, 100.0f, -70.0f, 120.0f)); + directionalLight.AddDirectionalShadow(200.0f, 3.0f, 4096, 0.05f, + glm::vec3(0.0f), vec4(-100.0f, 100.0f, -70.0f, 120.0f)); directionalLight.isMain = true; mainHierarchy.AddChild(directionalLightEntity); @@ -64,4 +68,110 @@ namespace Atlas::Editor { } + Ref DataCreator::CreateSceneFromMesh(const std::string& filename, vec3 min, vec3 max, + int32_t depth, bool invertUVs, bool addRigidBodies, bool combineMeshes, bool makeMeshesStatic) { + + auto scene = Loader::ModelLoader::LoadScene(filename, min, max, depth, + combineMeshes, makeMeshesStatic, false, 2048); + + auto rootEntity = scene->GetEntityByName("Root"); + auto& mainHierarchy = rootEntity.GetComponent(); + + auto directionalLightEntity = scene->CreateEntity(); + directionalLightEntity.AddComponent("Directional light"); + auto& directionalLight = directionalLightEntity.AddComponent(LightType::DirectionalLight); + + directionalLight.properties.directional.direction = glm::vec3(0.0f, -1.0f, 1.0f); + directionalLight.color = glm::vec3(255, 236, 209) / 255.0f; + directionalLight.intensity = 10.0f; + directionalLight.AddDirectionalShadow(200.0f, 3.0f, 4096, 0.05f, + glm::vec3(0.0f), vec4(-100.0f, 100.0f, -70.0f, 120.0f)); + directionalLight.isMain = true; + + mainHierarchy.AddChild(directionalLightEntity); + + scene->ao = CreateRef(16); + scene->ao->rt = true; + // Use SSGI by default + scene->ao->enable = false; + scene->reflection = CreateRef(); + scene->reflection->useShadowMap = true; + + scene->fog = CreateRef(); + scene->fog->enable = true; + scene->fog->density = 0.0002f; + scene->fog->heightFalloff = 0.0284f; + scene->fog->height = 0.0f; + + scene->sky.atmosphere = CreateRef(); + + scene->postProcessing.taa = PostProcessing::TAA(0.99f); + scene->postProcessing.sharpen.enable = true; + scene->postProcessing.sharpen.factor = 0.15f; + + scene->irradianceVolume = CreateRef(Volume::AABB(min, max), ivec3(20)); + + scene->sss = CreateRef(); + + scene->ssgi = CreateRef(); + + scene->sky.clouds = CreateRef(); + scene->sky.clouds->minHeight = 1400.0f; + scene->sky.clouds->maxHeight = 1700.0f; + scene->sky.clouds->castShadow = false; + + scene->physicsWorld = CreateRef(); + scene->physicsWorld->pauseSimulation = true; + + scene->rayTracingWorld = CreateRef(); + scene->postProcessing.fsr2 = true; + + scene->Timestep(1.0f); + + min = glm::vec3(std::numeric_limits::max()); + max = glm::vec3(-std::numeric_limits::max()); + + Volume::AABB aabb(min, max); + auto meshSubset = scene->GetSubset(); + for (auto entity : meshSubset) { + const auto& meshComponent = meshSubset.Get(entity); + + aabb.Grow(meshComponent.aabb); + } + + // Adjust settings based on calculated size + scene->irradianceVolume->SetAABB(aabb); + + if (invertUVs) { + auto meshes = scene->GetMeshes(); + + for (const auto& mesh : meshes) + mesh->invertUVs = true; + } + + if (addRigidBodies) { + for (auto entity : meshSubset) { + const auto& meshComponent = meshSubset.Get(entity); + + auto transformComponent = entity.GetComponent(); + Atlas::Physics::MeshShapeSettings settings = { + .mesh = meshComponent.mesh, + .scale = transformComponent.DecomposeGlobal().scale + }; + auto shape = Atlas::Physics::ShapesManager::CreateShape(settings); + + auto bodySettings = Atlas::Physics::BodyCreationSettings{ + .objectLayer = Atlas::Physics::Layers::STATIC, + .shape = shape, + }; + entity.AddComponent(bodySettings); + } + } + + scene->physicsWorld->OptimizeBroadphase(); + + return scene; + + } + } \ No newline at end of file diff --git a/src/editor/DataCreator.h b/src/editor/DataCreator.h index b6459f60e..2e4e47493 100644 --- a/src/editor/DataCreator.h +++ b/src/editor/DataCreator.h @@ -9,6 +9,9 @@ namespace Atlas::Editor { public: static Ref CreateScene(const std::string& name, vec3 min, vec3 max, int32_t depth); + static Ref CreateSceneFromMesh(const std::string& filename,vec3 min, vec3 max, int32_t depth, + bool invertUVs, bool addRigidBodies, bool combineMeshes, bool makeMeshesStatic); + }; } \ No newline at end of file diff --git a/src/editor/FileImporter.cpp b/src/editor/FileImporter.cpp index 2402178d1..06625bb0d 100644 --- a/src/editor/FileImporter.cpp +++ b/src/editor/FileImporter.cpp @@ -29,6 +29,7 @@ namespace Atlas::Editor { case FileType::Audio: ImportFile(filename); break; case FileType::Mesh: ImportFile(filename); break; case FileType::Scene: ImportFile(filename); break; + case FileType::Script: ImportFile(filename); break; case FileType::Font: ImportFile(filename); break; default: break; } diff --git a/src/editor/FileImporter.h b/src/editor/FileImporter.h index 75489f393..a5fcd1f5b 100644 --- a/src/editor/FileImporter.h +++ b/src/editor/FileImporter.h @@ -10,10 +10,11 @@ #include "mesh/Mesh.h" #include "scene/Scene.h" #include "audio/AudioData.h" +#include "scripting/Script.h" #include "Font.h" #include "loader/ModelLoader.h" -#include "scene/SceneSerializer.h" +#include "Serializer.h" namespace Atlas::Editor { @@ -55,14 +56,15 @@ namespace Atlas::Editor { } else if constexpr (std::is_same_v) { handle = ResourceManager::GetOrLoadResourceWithLoaderAsync(filename, - ResourceOrigin::User, Loader::ModelLoader::LoadMesh, false, 8192); + ResourceOrigin::User, Loader::ModelLoader::LoadMesh, false, 2048); } else if constexpr (std::is_same_v) { handle = ResourceManager::GetOrLoadResourceWithLoaderAsync(filename, - ResourceOrigin::User, Scene::SceneSerializer::DeserializeScene); + ResourceOrigin::User, Serializer::DeserializeScene, false); } - else if constexpr (std::is_same_v) { - // Load script here + else if constexpr (std::is_same_v) { + handle = ResourceManager::GetOrLoadResourceAsync( + filename, ResourceOrigin::User); } else if constexpr (std::is_same_v) { handle = ResourceManager::GetOrLoadResourceAsync(filename, @@ -93,7 +95,7 @@ namespace Atlas::Editor { else if constexpr (std::is_same_v) { return type == FileType::Scene; } - else if constexpr (std::is_same_v) { + else if constexpr (std::is_same_v) { return type == FileType::Script; } else if constexpr (std::is_same_v) { diff --git a/src/editor/Serializer.cpp b/src/editor/Serialization.cpp similarity index 83% rename from src/editor/Serializer.cpp rename to src/editor/Serialization.cpp index acc1fd21e..13e4e35a2 100644 --- a/src/editor/Serializer.cpp +++ b/src/editor/Serialization.cpp @@ -1,19 +1,19 @@ -#include "Serializer.h" +#include "Serialization.h" #include "Singletons.h" #include "FileImporter.h" #include "common/SerializationHelper.h" -#include "scene/EntitySerializer.h" +#include "scene/SceneSerializer.h" #include "Log.h" #include "loader/AssetLoader.h" namespace Atlas::Editor { - const std::string Serializer::configPath = ".config/"; - const std::string Serializer::configFilename = configPath + "config.json"; + const std::string Serialization::configPath = ".config/"; + const std::string Serialization::configFilename = configPath + "config.json"; - void Serializer::SerializeConfig() { + void Serialization::SerializeConfig() { const auto& config = Singletons::config; @@ -31,7 +31,7 @@ namespace Atlas::Editor { } - void Serializer::DeserializeConfig() { + void Serialization::DeserializeConfig() { auto serialized = TryReadFromFile(configFilename); @@ -57,14 +57,14 @@ namespace Atlas::Editor { } - void Serializer::SerializeSceneWindow(const Ref& sceneWindow) { + void Serialization::SerializeSceneWindow(const Ref& sceneWindow) { if (!sceneWindow->scene.IsLoaded()) return; json camera; std::set insertedEntites; - Scene::EntityToJson(camera, sceneWindow->cameraEntity, sceneWindow->scene.Get(), insertedEntites); + Scene::EntityToJson(camera, sceneWindow->cameraEntity, sceneWindow->scene.Get().get(), insertedEntites); json j = { { "cameraMovementSpeed", sceneWindow->cameraMovementSpeed }, @@ -78,7 +78,7 @@ namespace Atlas::Editor { } - Ref Serializer::DeserializeSceneWindow(ResourceHandle handle) { + Ref Serialization::DeserializeSceneWindow(ResourceHandle handle) { if (!handle.IsLoaded()) return nullptr; @@ -104,7 +104,7 @@ namespace Atlas::Editor { j.at("camera").get_to(camera); sceneWindow->cameraEntity = sceneWindow->scene->CreateEntity(); - Scene::EntityFromJson(camera, sceneWindow->cameraEntity, sceneWindow->scene.Get()); + Scene::EntityFromJson(camera, sceneWindow->cameraEntity, sceneWindow->scene.Get().get()); // When closing the application while playing the entity is saved in the wrong state sceneWindow->cameraEntity.GetComponent().isMain = true; @@ -113,7 +113,7 @@ namespace Atlas::Editor { } - void Serializer::TryWriteToFile(const std::string& filename, const std::string& content) { + void Serialization::TryWriteToFile(const std::string& filename, const std::string& content) { auto fileStream = Loader::AssetLoader::WriteFile(filename, std::ios::out | std::ios::binary); @@ -128,7 +128,7 @@ namespace Atlas::Editor { } - std::string Serializer::TryReadFromFile(const std::string& filename) { + std::string Serialization::TryReadFromFile(const std::string& filename) { Loader::AssetLoader::UnpackFile(filename); auto path = Loader::AssetLoader::GetFullPath(filename); diff --git a/src/editor/Serializer.h b/src/editor/Serialization.h similarity index 96% rename from src/editor/Serializer.h rename to src/editor/Serialization.h index 7dde5009b..e962cf501 100644 --- a/src/editor/Serializer.h +++ b/src/editor/Serialization.h @@ -6,7 +6,7 @@ namespace Atlas::Editor { - class Serializer { + class Serialization { public: static void SerializeConfig(); diff --git a/src/editor/ui/panels/EntityPropertiesPanel.cpp b/src/editor/ui/panels/EntityPropertiesPanel.cpp index 7a4c7fe2d..9c29aed7e 100644 --- a/src/editor/ui/panels/EntityPropertiesPanel.cpp +++ b/src/editor/ui/panels/EntityPropertiesPanel.cpp @@ -57,6 +57,11 @@ namespace Atlas::Editor::UI { entity, textComponentPanel, comp); } + if (entity.HasComponent()) { + RenderComponentPanel("Lua script component", scene, + entity, luaScriptComponentPanel, entity.GetComponent()); + } + if (entity.HasComponent()) { auto comp = entity.GetComponent(); RenderComponentPanel("Rigid body component", scene, @@ -101,6 +106,8 @@ namespace Atlas::Editor::UI { entity.AddComponent(); if (!entity.HasComponent() && ImGui::MenuItem("Add text component")) entity.AddComponent(); + if (!entity.HasComponent() && ImGui::MenuItem("Add lua script component")) + entity.AddComponent(); // Just make the player component addable if there is a transform component if (entity.HasComponent() && @@ -154,6 +161,8 @@ namespace Atlas::Editor::UI { entity.RemoveComponent(); if (entity.HasComponent() && ImGui::MenuItem("Remove text component")) entity.RemoveComponent(); + if (entity.HasComponent() && ImGui::MenuItem("Remove lua script component")) + entity.RemoveComponent(); if (entity.HasComponent() && ImGui::MenuItem("Remove player component")) entity.RemoveComponent(); if (entity.HasComponent() && ImGui::MenuItem("Remove rigid body component")) diff --git a/src/editor/ui/panels/EntityPropertiesPanel.h b/src/editor/ui/panels/EntityPropertiesPanel.h index 4e6591bd5..9cabb2d0a 100644 --- a/src/editor/ui/panels/EntityPropertiesPanel.h +++ b/src/editor/ui/panels/EntityPropertiesPanel.h @@ -9,6 +9,7 @@ #include "components/LightComponentPanel.h" #include "components/AudioComponentPanel.h" #include "components/AudioVolumeComponentPanel.h" +#include "components/LuaScriptComponentPanel.h" #include "components/RigidBodyComponentPanel.h" #include "components/PlayerComponentPanel.h" #include "components/CameraComponentPanel.h" @@ -32,6 +33,7 @@ namespace Atlas::Editor::UI { LightComponentPanel lightComponentPanel; AudioComponentPanel audioComponentPanel; AudioVolumeComponentPanel audioVolumeComponentPanel; + LuaScriptComponentPanel luaScriptComponentPanel; RigidBodyComponentPanel rigidBodyComponentPanel; PlayerComponentPanel playerComponentPanel; CameraComponentPanel cameraComponentPanel; diff --git a/src/editor/ui/panels/PopupPanels.cpp b/src/editor/ui/panels/PopupPanels.cpp index 23164ec2a..6a10cdaf3 100644 --- a/src/editor/ui/panels/PopupPanels.cpp +++ b/src/editor/ui/panels/PopupPanels.cpp @@ -9,10 +9,14 @@ namespace Atlas::Editor::UI { bool PopupPanels::isNewScenePopupVisible = false; + bool PopupPanels::isImportScenePopupVisible = false; + + std::string PopupPanels::filename = ""; void PopupPanels::Render() { RenderNewScenePopup(); + RenderImportScenePopup(); } @@ -28,13 +32,20 @@ namespace Atlas::Editor::UI { SetupPopupSize(0.6f, 0.3f); + bool popupNew = false; + if (!ImGui::IsPopupOpen("New scene")) { + popupNew = true; ImGui::OpenPopup("New scene"); } if (ImGui::BeginPopupModal("New scene", nullptr, ImGuiWindowFlags_NoResize)) { + if (popupNew) + ImGui::SetKeyboardFocusHere(); + ImGui::InputTextWithHint("Name", "Type scene name here", &name); + ImGui::DragFloat3("Min size", &minSize[0], 1.0f, -8192.0f, 8192.0f, "%.3f", ImGuiSliderFlags_Logarithmic); ImGui::DragFloat3("Max size", &maxSize[0], 1.0f, -8192.0f, 8192.0f, "%.3f", ImGuiSliderFlags_Logarithmic); ImGui::SliderInt("Octree depth", &octreeDepth, 1, 12); @@ -46,7 +57,7 @@ namespace Atlas::Editor::UI { ImGui::SameLine(); - if (ImGui::Button("Ok")) { + if (ImGui::Button("Ok") || ImGui::IsKeyReleased(ImGuiKey_Enter)) { auto scene = DataCreator::CreateScene(name, minSize, maxSize, octreeDepth); bool alreadyExisted; @@ -66,6 +77,79 @@ namespace Atlas::Editor::UI { } + void PopupPanels::RenderImportScenePopup() { + + if (!isImportScenePopupVisible) + return; + + static std::string name; + static auto minSize = glm::vec3(-2048.0f); + static auto maxSize = glm::vec3(2048.0f); + static int32_t octreeDepth = 5; + static bool invertUVs = false; + static bool addRigidBodies = false; + static bool combineMeshes = false; + static bool makeMeshesStatic = false; + + SetupPopupSize(0.6f, 0.3f); + + bool popupNew = false; + + if (!ImGui::IsPopupOpen("Import scene")) { + popupNew = true; + ImGui::OpenPopup("Import scene"); + } + + if (ImGui::BeginPopupModal("Import scene", nullptr, ImGuiWindowFlags_NoResize)) { + + if (popupNew) { + ImGui::SetKeyboardFocusHere(); + name = Common::Path::GetFileNameWithoutExtension(filename); + } + + ImGui::Text("General properties"); + + ImGui::InputTextWithHint("Name", "Type scene name here", &name); + + ImGui::DragFloat3("Min size", &minSize[0], 1.0f, -8192.0f, 8192.0f, "%.3f", ImGuiSliderFlags_Logarithmic); + ImGui::DragFloat3("Max size", &maxSize[0], 1.0f, -8192.0f, 8192.0f, "%.3f", ImGuiSliderFlags_Logarithmic); + ImGui::SliderInt("Octree depth", &octreeDepth, 1, 12); + + ImGui::Text("Import properties"); + ImGui::Checkbox("Invert UVs", &invertUVs); + ImGui::Checkbox("Attach mesh rigid body components", &addRigidBodies); + ImGui::Checkbox("Combine meshes", &combineMeshes); + ImGui::Checkbox("Make meshes static", &makeMeshesStatic); + + if (ImGui::Button("Cancel")) { + isImportScenePopupVisible = false; + ImGui::CloseCurrentPopup(); + } + + ImGui::SameLine(); + + if (ImGui::Button("Ok") || ImGui::IsKeyReleased(ImGuiKey_Enter)) { + auto scene = DataCreator::CreateSceneFromMesh(filename, minSize, maxSize, + octreeDepth, invertUVs, addRigidBodies, combineMeshes, makeMeshesStatic); + scene->name = name; + + bool alreadyExisted; + Atlas::ResourceManager::AddResource(name, scene, alreadyExisted); + + if (alreadyExisted) { + Log::Warning("Scene couldn't be created due to scene with same name existing already"); + } + + isImportScenePopupVisible = false; + ImGui::CloseCurrentPopup(); + } + + ImGui::EndPopup(); + + } + + } + void PopupPanels::SetupPopupSize(float horizontalFactor, float verticalFactor) { auto viewport = ImGui::GetMainViewport(); diff --git a/src/editor/ui/panels/PopupPanels.h b/src/editor/ui/panels/PopupPanels.h index dea8b7f2e..c1de77c67 100644 --- a/src/editor/ui/panels/PopupPanels.h +++ b/src/editor/ui/panels/PopupPanels.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace Atlas::Editor::UI { class PopupPanels { @@ -7,13 +9,18 @@ namespace Atlas::Editor::UI { public: static void Render(); + static void SetupPopupSize(float horizontalFactor, float verticalFactor); + static bool isNewScenePopupVisible; + static bool isImportScenePopupVisible; static bool isAddComponentPopupVisible; + static std::string filename; + private: static void RenderNewScenePopup(); - static void SetupPopupSize(float horizontalFactor, float verticalFactor); + static void RenderImportScenePopup(); }; diff --git a/src/editor/ui/panels/SceneHierarchyPanel.cpp b/src/editor/ui/panels/SceneHierarchyPanel.cpp index e1bad9308..31651a0c6 100644 --- a/src/editor/ui/panels/SceneHierarchyPanel.cpp +++ b/src/editor/ui/panels/SceneHierarchyPanel.cpp @@ -10,6 +10,9 @@ namespace Atlas::Editor::UI { ImGui::Begin(GetNameID()); + if (ImGui::IsDragDropActive() && ImGui::IsWindowHovered() && !ImGui::IsWindowFocused()) + ImGui::SetWindowFocus(); + isFocused = ImGui::IsWindowFocused(); if (scene != nullptr) { @@ -38,7 +41,17 @@ namespace Atlas::Editor::UI { ImGui::InputTextWithHint("Search", "Type to search for entity", &entitySearch); - TraverseHierarchy(scene, root, inFocus); + // Search should be case-insensitive + transformedEntitySearch = entitySearch; + std::transform(transformedEntitySearch.begin(), transformedEntitySearch.end(), + transformedEntitySearch.begin(), ::tolower); + + std::unordered_map matchMap; + matchMap.reserve(scene->GetEntityCount()); + if (!transformedEntitySearch.empty()) + SearchHierarchy(scene, root, matchMap, false); + + TraverseHierarchy(scene, root, matchMap, inFocus); RenderExtendedHierarchy(scene); @@ -49,9 +62,9 @@ namespace Atlas::Editor::UI { #else controlDown = io.KeyCtrl; #endif - if (inFocus && controlDown && ImGui::IsKeyReleased(ImGuiKey_D)) + if (inFocus && controlDown && ImGui::IsKeyPressed(ImGuiKey_D, false)) DuplicateSelectedEntity(scene); - if (inFocus && ImGui::IsKeyReleased(ImGuiKey_Delete)) + if (inFocus && ImGui::IsKeyPressed(ImGuiKey_Delete, false)) DeleteSelectedEntity(scene); } @@ -60,7 +73,8 @@ namespace Atlas::Editor::UI { } - void SceneHierarchyPanel::TraverseHierarchy(Ref& scene, Scene::Entity entity, bool inFocus) { + void SceneHierarchyPanel::TraverseHierarchy(Ref& scene, Scene::Entity entity, + std::unordered_map& matchMap, bool inFocus) { ImGuiTreeNodeFlags baseFlags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick; @@ -74,8 +88,11 @@ namespace Atlas::Editor::UI { std::string nodeName = nameComponent ? nameComponent->name : "Entity " + std::to_string(entity); + // If the search term matches we want to display everything below this item in the hierarchy + bool validSearch = (transformedEntitySearch.empty() || matchMap[entity]); + // If we have a search term and the name doesn't match, return - if (nodeName != "Root" && !entitySearch.empty() && nodeName.find(entitySearch) == std::string::npos) + if (nodeName != "Root" && !validSearch) return; auto nodeFlags = baseFlags; @@ -130,7 +147,7 @@ namespace Atlas::Editor::UI { auto children = hierarchyComponent->GetChildren(); for (auto childEntity : children) { - TraverseHierarchy(scene, childEntity, inFocus); + TraverseHierarchy(scene, childEntity, matchMap, inFocus); } @@ -271,4 +288,33 @@ namespace Atlas::Editor::UI { } + bool SceneHierarchyPanel::SearchHierarchy(Ref& scene, Scene::Entity entity, + std::unordered_map& matchMap, bool parentMatches) { + + auto hierarchyComponent = entity.TryGetComponent(); + auto nameComponent = entity.TryGetComponent(); + + std::string nodeName = nameComponent ? nameComponent->name : "Entity " + std::to_string(entity); + std::transform(nodeName.begin(), nodeName.end(), nodeName.begin(), ::tolower); + + parentMatches |= nodeName.find(transformedEntitySearch) != std::string::npos; + bool matches = parentMatches; + + if (hierarchyComponent) { + + auto children = hierarchyComponent->GetChildren(); + for (auto childEntity : children) { + + matches |= SearchHierarchy(scene, childEntity, matchMap, parentMatches); + + } + + } + + matchMap[entity] = matches; + + return matches; + + } + } \ No newline at end of file diff --git a/src/editor/ui/panels/SceneHierarchyPanel.h b/src/editor/ui/panels/SceneHierarchyPanel.h index 3e1da111f..1da1c53cf 100644 --- a/src/editor/ui/panels/SceneHierarchyPanel.h +++ b/src/editor/ui/panels/SceneHierarchyPanel.h @@ -27,7 +27,8 @@ namespace Atlas::Editor::UI { SelectedProperty selectedProperty; private: - void TraverseHierarchy(Ref& scene, Scene::Entity entity, bool inFocus); + void TraverseHierarchy(Ref& scene, Scene::Entity entity, + std::unordered_map& matchMap, bool inFocus); void RenderExtendedHierarchy(const Ref& scene); @@ -37,7 +38,11 @@ namespace Atlas::Editor::UI { void DuplicateSelectedEntity(Ref& scene); + bool SearchHierarchy(Ref& scene, Scene::Entity entity, + std::unordered_map& matchMap, bool parentMatches); + std::string entitySearch; + std::string transformedEntitySearch; }; diff --git a/src/editor/ui/panels/ScenePropertiesPanel.h b/src/editor/ui/panels/ScenePropertiesPanel.h index 159583495..f001e4d9f 100644 --- a/src/editor/ui/panels/ScenePropertiesPanel.h +++ b/src/editor/ui/panels/ScenePropertiesPanel.h @@ -20,6 +20,9 @@ namespace Atlas::Editor::UI { ImGui::Begin(GetNameID()); + if (ImGui::IsDragDropActive() && ImGui::IsWindowHovered() && !ImGui::IsWindowFocused()) + ImGui::SetWindowFocus(); + isFocused = ImGui::IsWindowFocused(); if constexpr (std::is_same_v) { diff --git a/src/editor/ui/panels/components/AudioComponentPanel.cpp b/src/editor/ui/panels/components/AudioComponentPanel.cpp index c198f4001..ce332a7a2 100644 --- a/src/editor/ui/panels/components/AudioComponentPanel.cpp +++ b/src/editor/ui/panels/components/AudioComponentPanel.cpp @@ -14,9 +14,20 @@ namespace Atlas::Editor::UI { resource = audioComponent.stream->data.GetResource(); auto buttonName = resource != nullptr ? resource->GetFileName() : "Drop resource here"; - ImGui::Button(buttonName.c_str(), {-FLT_MIN, 0}); + if (ImGui::Button(buttonName.c_str(), {-FLT_MIN, 0})) + audioSelectionPopup.Open(); + + // Such that drag and drop will work from the content browser + if (ImGui::IsDragDropActive() && ImGui::IsItemHovered(ImGuiHoveredFlags_RectOnly)) { + ImGui::SetWindowFocus(); + ImGui::SetItemDefaultFocus(); + } auto handle = ResourcePayloadHelper::AcceptDropResource(); + + auto audioResources = ResourceManager::GetResources(); + handle = audioSelectionPopup.Render(audioResources); + if (handle.IsValid()) { audioComponent.ChangeResource(handle); resourceChanged = true; diff --git a/src/editor/ui/panels/components/AudioComponentPanel.h b/src/editor/ui/panels/components/AudioComponentPanel.h index f9405e340..c1efeca79 100644 --- a/src/editor/ui/panels/components/AudioComponentPanel.h +++ b/src/editor/ui/panels/components/AudioComponentPanel.h @@ -5,6 +5,8 @@ #include "scene/Scene.h" #include "scene/components/AudioComponent.h" +#include "../../popups/ResourceSelectionPopup.h" + namespace Atlas::Editor::UI { class AudioComponentPanel : public Panel { @@ -14,6 +16,9 @@ namespace Atlas::Editor::UI { bool Render(Ref& scene, Scene::Entity entity, AudioComponent& audioVolumeComponent); + private: + ResourceSelectionPopup audioSelectionPopup; + }; } diff --git a/src/editor/ui/panels/components/AudioVolumeComponentPanel.cpp b/src/editor/ui/panels/components/AudioVolumeComponentPanel.cpp index a4e9161eb..62493c21e 100644 --- a/src/editor/ui/panels/components/AudioVolumeComponentPanel.cpp +++ b/src/editor/ui/panels/components/AudioVolumeComponentPanel.cpp @@ -14,9 +14,20 @@ namespace Atlas::Editor::UI { resource = audioVolumeComponent.stream->data.GetResource(); auto buttonName = resource != nullptr ? resource->GetFileName() : "Drop resource here"; - ImGui::Button(buttonName.c_str(), {-FLT_MIN, 0}); + if (ImGui::Button(buttonName.c_str(), {-FLT_MIN, 0})) + audioSelectionPopup.Open(); + + // Such that drag and drop will work from the content browser + if (ImGui::IsDragDropActive() && ImGui::IsItemHovered(ImGuiHoveredFlags_RectOnly)) { + ImGui::SetWindowFocus(); + ImGui::SetItemDefaultFocus(); + } auto handle = ResourcePayloadHelper::AcceptDropResource(); + + auto audioResources = ResourceManager::GetResources(); + handle = audioSelectionPopup.Render(audioResources); + if (handle.IsValid()) { audioVolumeComponent.ChangeResource(handle); resourceChanged = true; diff --git a/src/editor/ui/panels/components/AudioVolumeComponentPanel.h b/src/editor/ui/panels/components/AudioVolumeComponentPanel.h index ba20cb3b3..073c6dbc0 100644 --- a/src/editor/ui/panels/components/AudioVolumeComponentPanel.h +++ b/src/editor/ui/panels/components/AudioVolumeComponentPanel.h @@ -5,6 +5,8 @@ #include "scene/Scene.h" #include "scene/components/AudioVolumeComponent.h" +#include "../../popups/ResourceSelectionPopup.h" + namespace Atlas::Editor::UI { class AudioVolumeComponentPanel : public Panel { @@ -14,6 +16,9 @@ namespace Atlas::Editor::UI { bool Render(Ref& scene, Scene::Entity entity, AudioVolumeComponent& audioVolumeComponent); + private: + ResourceSelectionPopup audioSelectionPopup; + }; } diff --git a/src/editor/ui/panels/components/CameraComponentPanel.cpp b/src/editor/ui/panels/components/CameraComponentPanel.cpp index d0e8463dd..dda85c129 100644 --- a/src/editor/ui/panels/components/CameraComponentPanel.cpp +++ b/src/editor/ui/panels/components/CameraComponentPanel.cpp @@ -9,7 +9,7 @@ namespace Atlas::Editor::UI { ImGui::Text("Transform"); ImGui::DragFloat3("Position", glm::value_ptr(cameraComponent.location), 0.1f, -10000.0f, 10000.0f); - ImGui::DragFloat2("Rotation", glm::value_ptr(cameraComponent.rotation), 0.01f, -glm::pi() / 2.0f, glm::pi() / 2.0f); + ImGui::DragFloat2("Rotation", glm::value_ptr(cameraComponent.rotation), 0.01f, -glm::pi(), glm::pi()); ImGui::Checkbox("Use entity translation", &cameraComponent.useEntityTranslation); ImGui::Checkbox("Use entity rotation", &cameraComponent.useEntityRotation); diff --git a/src/editor/ui/panels/components/LightComponentPanel.cpp b/src/editor/ui/panels/components/LightComponentPanel.cpp index 39aec7814..b7514e717 100644 --- a/src/editor/ui/panels/components/LightComponentPanel.cpp +++ b/src/editor/ui/panels/components/LightComponentPanel.cpp @@ -79,6 +79,7 @@ namespace Atlas::Editor::UI { ImGui::DragFloat("Bias", &shadow->bias, 0.05f, 0.0f, 10.0f); ImGui::DragFloat("Distance", &shadow->distance, 1.0f, 0.0f, 10000.0f); + ImGui::DragFloat("Edge softness", &shadow->edgeSoftness, 0.005f, 0.0f, 1.0f); ImGui::Separator(); @@ -106,7 +107,7 @@ namespace Atlas::Editor::UI { auto matrix = glm::ortho(-200.0f, 200.0f, -200.0f, 200.0f, -120.0f, 120.0f); lightComponent.AddDirectionalShadow(shadow->distance, shadow->bias, shadow->resolution, - shadow->center, orthoSize); + shadow->edgeSoftness, shadow->center, orthoSize); } else { ImGui::SliderInt("Cascade count", &shadow->viewCount, 1, 5); @@ -114,7 +115,7 @@ namespace Atlas::Editor::UI { ImGui::Checkbox("Long range", &shadow->longRange); ImGui::DragFloat("Long range distance", &shadow->longRangeDistance, 10.0f, 10.0f, 10000.0f); - lightComponent.AddDirectionalShadow(shadow->distance, shadow->bias, shadow->resolution, + lightComponent.AddDirectionalShadow(shadow->distance, shadow->bias, shadow->resolution, shadow->edgeSoftness, shadow->viewCount, shadow->splitCorrection, shadow->longRange, shadow->longRangeDistance); } } diff --git a/src/editor/ui/panels/components/LuaScriptComponentPanel.cpp b/src/editor/ui/panels/components/LuaScriptComponentPanel.cpp new file mode 100644 index 000000000..0d78df670 --- /dev/null +++ b/src/editor/ui/panels/components/LuaScriptComponentPanel.cpp @@ -0,0 +1,60 @@ +#include "LuaScriptComponentPanel.h" + +#include "../../../tools/ResourcePayloadHelper.h" + +#include "imgui_stdlib.h" + +namespace Atlas::Editor::UI +{ + bool LuaScriptComponentPanel::Render(Ref& scene, Scene::Entity entity, LuaScriptComponent &luaScriptComponent) + { + auto buttonName = luaScriptComponent.script.IsValid() ? luaScriptComponent.script.GetResource()->GetFileName() : "Drop script resource here"; + if (ImGui::Button(buttonName.c_str(), {-FLT_MIN, 0})) + scriptSelectionPopup.Open(); + + // Such that drag and drop will work from the content browser + if (ImGui::IsDragDropActive() && ImGui::IsItemHovered(ImGuiHoveredFlags_RectOnly)) { + ImGui::SetWindowFocus(); + ImGui::SetItemDefaultFocus(); + } + + auto handle = ResourcePayloadHelper::AcceptDropResource(); + + auto scriptResources = ResourceManager::GetResources(); + handle = scriptSelectionPopup.Render(scriptResources); + + if (handle.IsValid()) { + // Needs to be implemented + // luaScriptComponent.ChangeResource(handle); + luaScriptComponent.script = handle; + } + + if (!luaScriptComponent.script.IsLoaded()) + return false; + + ImGui::InputTextMultiline("Code", &luaScriptComponent.script->code, ImVec2(0, 0), ImGuiInputTextFlags_ReadOnly); + + ImGui::Separator(); + ImGui::Text("Script defined properties:"); + for (auto &property : luaScriptComponent.properties) + { + switch (property.type) + { + case LuaScriptComponent::PropertyType::Boolean: + ImGui::Checkbox(property.name.c_str(), &property.booleanValue); + break; + case LuaScriptComponent::PropertyType::Integer: + ImGui::InputInt(property.name.c_str(), &property.integerValue); + break; + case LuaScriptComponent::PropertyType::Double: + ImGui::InputDouble(property.name.c_str(), &property.doubleValue); + break; + case LuaScriptComponent::PropertyType::String: + ImGui::InputText(property.name.c_str(), &property.stringValue); + break; + } + } + + return false; + } +} \ No newline at end of file diff --git a/src/editor/ui/panels/components/LuaScriptComponentPanel.h b/src/editor/ui/panels/components/LuaScriptComponentPanel.h new file mode 100644 index 000000000..3ffb9478f --- /dev/null +++ b/src/editor/ui/panels/components/LuaScriptComponentPanel.h @@ -0,0 +1,23 @@ +#pragma once + +#include "../Panel.h" + +#include "scene/components/LuaScriptComponent.h" +#include "../../popups/ResourceSelectionPopup.h" + +namespace Atlas::Editor::UI +{ + + class LuaScriptComponentPanel : public Panel { + + public: + LuaScriptComponentPanel() : Panel("Lua script component") {} + + bool Render(Ref& scene, Scene::Entity entity, LuaScriptComponent &luaScriptComponent); + + private: + ResourceSelectionPopup scriptSelectionPopup; + + }; + +} \ No newline at end of file diff --git a/src/editor/ui/panels/components/MeshComponentPanel.cpp b/src/editor/ui/panels/components/MeshComponentPanel.cpp index c8e5b6410..fd853b726 100644 --- a/src/editor/ui/panels/components/MeshComponentPanel.cpp +++ b/src/editor/ui/panels/components/MeshComponentPanel.cpp @@ -14,9 +14,20 @@ namespace Atlas::Editor::UI { auto buttonName = meshComponent.mesh.IsValid() ? meshComponent.mesh.GetResource()->GetFileName() : "Drop mesh resource here"; - ImGui::Button(buttonName.c_str(), {-FLT_MIN, 0}); + if (ImGui::Button(buttonName.c_str(), {-FLT_MIN, 0})) + meshSelectionPopup.Open(); + + // Such that drag and drop will work from the content browser + if (ImGui::IsDragDropActive() && ImGui::IsItemHovered(ImGuiHoveredFlags_RectOnly)) { + ImGui::SetWindowFocus(); + ImGui::SetItemDefaultFocus(); + } auto handle = ResourcePayloadHelper::AcceptDropResource(); + + auto meshResources = ResourceManager::GetResources(); + handle = meshSelectionPopup.Render(meshResources); + if (handle.IsValid()) { meshComponent.mesh = handle; resourceChanged = true; @@ -29,6 +40,12 @@ namespace Atlas::Editor::UI { auto& mesh = meshComponent.mesh; ImGui::Separator(); ImGui::Text("Mesh settings"); + + const char* mobilityItems[] = { "Stationary", "Movable" }; + int mobilityItem = static_cast(mesh->mobility); + ImGui::Combo("Mobility", &mobilityItem, mobilityItems, IM_ARRAYSIZE(mobilityItems)); + mesh->mobility = static_cast(mobilityItem); + ImGui::Checkbox("Invert UVs", &mesh->invertUVs); ImGui::Checkbox("Cull backfaces", &mesh->cullBackFaces); ImGui::Separator(); diff --git a/src/editor/ui/panels/components/MeshComponentPanel.h b/src/editor/ui/panels/components/MeshComponentPanel.h index c154de55b..6e5b2b730 100644 --- a/src/editor/ui/panels/components/MeshComponentPanel.h +++ b/src/editor/ui/panels/components/MeshComponentPanel.h @@ -6,6 +6,7 @@ #include "scene/Entity.h" #include "scene/components/MeshComponent.h" +#include "../../popups/ResourceSelectionPopup.h" #include "ImguiExtension/panels/MaterialsPanel.h" namespace Atlas::Editor::UI { @@ -19,6 +20,7 @@ namespace Atlas::Editor::UI { private: ImguiExtension::MaterialsPanel materialsPanel; + ResourceSelectionPopup meshSelectionPopup; }; diff --git a/src/editor/ui/panels/components/TransformComponentPanel.cpp b/src/editor/ui/panels/components/TransformComponentPanel.cpp index 6cf63f5e3..bdd4c378f 100644 --- a/src/editor/ui/panels/components/TransformComponentPanel.cpp +++ b/src/editor/ui/panels/components/TransformComponentPanel.cpp @@ -11,7 +11,8 @@ namespace Atlas::Editor::UI { // Make sure the local matrix is updated from the global one // This needs to happen when external system like physics just updated the globalMatrix - transform.ReconstructLocalMatrix(scene); + auto parentEntity = scene->GetParentEntity(entity); + transform.ReconstructLocalMatrix(parentEntity); // The matrix decomposition/composition code is a bit unstable and // we work with fixed information that is recomposed when changed, diff --git a/src/editor/ui/popups/Popup.h b/src/editor/ui/popups/Popup.h new file mode 100644 index 000000000..018ee3f5f --- /dev/null +++ b/src/editor/ui/popups/Popup.h @@ -0,0 +1,34 @@ +#pragma once + +#include +#include + +namespace Atlas::Editor::UI { + + class Popup { + + public: + Popup(const std::string& name) : name(name), nameID(name + "##" + std::to_string(ID)) {} + + const char* GetNameID() const { return nameID.c_str(); } + + void Open() { ImGui::OpenPopup(GetNameID()); } + + std::string name; + + protected: + int32_t ID = GetID(); + + std::string nameID; + + private: + static int32_t GetID() { + + static int32_t counter = 0; + return counter++; + + } + + }; + +} \ No newline at end of file diff --git a/src/editor/ui/popups/ResourceSelectionPopup.cpp b/src/editor/ui/popups/ResourceSelectionPopup.cpp new file mode 100644 index 000000000..feb066b23 --- /dev/null +++ b/src/editor/ui/popups/ResourceSelectionPopup.cpp @@ -0,0 +1,7 @@ +#include "ResourceSelectionPopup.h" + +namespace Atlas::Editor::UI { + + + +} \ No newline at end of file diff --git a/src/editor/ui/popups/ResourceSelectionPopup.h b/src/editor/ui/popups/ResourceSelectionPopup.h new file mode 100644 index 000000000..8c88f75ec --- /dev/null +++ b/src/editor/ui/popups/ResourceSelectionPopup.h @@ -0,0 +1,96 @@ +#pragma once + +#include "Popup.h" + +#include "resource/Resource.h" + +#include +#include + +namespace Atlas::Editor::UI { + + class ResourceSelectionPopup : public Popup { + + public: + ResourceSelectionPopup() : Popup("ResourceSelection") {} + + template + ResourceHandle Render(std::vector> resources) { + + ResourceHandle handle; + + ImGui::SetNextWindowSize(ImVec2(-FLT_MAX, 200.0f)); + + if (ImGui::BeginPopup(GetNameID())) { + + ImGui::InputTextWithHint("Search", "Type to search for loaded resource", &resourceSearch); + + ImGui::BeginChild("Resource list"); + + resources = ApplySearchAndSortFiltering(resources); + + for (size_t i = 0; i < resources.size(); i++) { + bool isSelected = false; + const auto& resource = resources[i].GetResource(); + + auto itemName = resource->GetFileName(); + + ImGui::Selectable(itemName.c_str(), &isSelected, ImGuiSelectableFlags_SpanAvailWidth); + + if (isSelected) + handle = resources[i]; + } + + ImGui::EndChild(); + + if (handle.IsValid()) + ImGui::CloseCurrentPopup(); + + ImGui::EndPopup(); + + } + + return handle; + + } + + private: + template + std::vector> ApplySearchAndSortFiltering(const std::vector>& resources) { + + std::vector> filteredResources; + + if (!resourceSearch.empty()) { + std::string searchQuery = resourceSearch; + std::transform(searchQuery.begin(), searchQuery.end(), searchQuery.begin(), ::tolower); + + for (const auto& handle : resources) { + auto filename = handle.GetResource()->GetFileName(); + std::transform(filename.begin(), filename.end(), filename.begin(), ::tolower); + + // Filter out by search query, if it is a valid (non-empty) query + if (searchQuery.empty() || filename.find(searchQuery) != std::string::npos) + filteredResources.push_back(handle); + } + } + else { + filteredResources = resources; + } + + std::sort(filteredResources.begin(), filteredResources.end(), + [](const ResourceHandle& res0, const ResourceHandle& res1) { + auto res0Filename = res0.GetResource()->GetFileName(); + auto res1Filename = res1.GetResource()->GetFileName(); + + return res0Filename < res1Filename; + }); + + return filteredResources; + + } + + std::string resourceSearch; + + }; + +} \ No newline at end of file diff --git a/src/editor/ui/windows/ContentBrowserWindow.cpp b/src/editor/ui/windows/ContentBrowserWindow.cpp index cb48c06e6..2245e277f 100644 --- a/src/editor/ui/windows/ContentBrowserWindow.cpp +++ b/src/editor/ui/windows/ContentBrowserWindow.cpp @@ -1,5 +1,7 @@ #include "ContentBrowserWindow.h" #include "FileImporter.h" +#include "DataCreator.h" +#include "ui/panels/PopupPanels.h" #include "mesh/Mesh.h" #include "scene/Scene.h" @@ -16,7 +18,7 @@ namespace Atlas::Editor::UI { - ContentBrowserWindow::ContentBrowserWindow(bool show) : Window("Object browser", show) { + ContentBrowserWindow::ContentBrowserWindow(bool show) : Window("Content browser", show) { @@ -57,8 +59,14 @@ namespace Atlas::Editor::UI { End(); ImGui::Begin("ResourceTypeSelection", nullptr); - ImGuiTreeNodeFlags nodeFlags = ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | - ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_Framed; + + ImGui::SetWindowFontScale(1.5f); + + ImGui::Text("Filters"); + + ImGui::SetWindowFontScale(1.0f); + + ImGui::Separator(); const char *items[] = {"Audio", "Mesh", "Terrain", "Scene", "Script", "Font", "Prefab"}; for (int i = 0; i < IM_ARRAYSIZE(items); i++) { @@ -87,6 +95,10 @@ namespace Atlas::Editor::UI { ImGui::EndChild(); + if (ImGui::IsDragDropActive() && ImGui::IsWindowHovered(ImGuiHoveredFlags_RectOnly)) { + ImGui::SetWindowFocus(); + } + if (ImGui::BeginDragDropTarget()) { auto dropPayload = ImGui::GetDragDropPayload(); if (ImGui::AcceptDragDropPayload(typeid(Scene::Entity).name())) { @@ -101,16 +113,23 @@ namespace Atlas::Editor::UI { // There must be a scene, otherwise we want to get a fatal error auto iter = std::find_if(scenes.begin(), scenes.end(), - [&](const ResourceHandle& item) -> bool { return item->name == scene->name; }); + [&](const ResourceHandle& item) -> bool { + if (!item.IsLoaded()) + return false; + return item->name == scene->name; + }); auto sceneHandle = *iter; auto nameComponent = entity.TryGetComponent(); auto entityName = nameComponent ? nameComponent->name : "Entity " + std::to_string(entity); auto assetDirectory = Loader::AssetLoader::GetAssetDirectory(); - auto assetPath = Common::Path::GetRelative(assetDirectory, currentDirectory); + auto assetPath = Common::Path::GetRelative(assetDirectory, currentDirectory) + "/"; + if (assetPath.starts_with('/')) + assetPath.erase(assetPath.begin()); + auto entityPath = assetPath + entityName + ".aeprefab"; - Scene::SceneSerializer::SerializePrefab(sceneHandle.Get(), entity, entityPath); + Serializer::SerializePrefab(sceneHandle.Get(), entity, entityPath); } } @@ -230,17 +249,33 @@ namespace Atlas::Editor::UI { } if (!isDirectory && ImGui::BeginDragDropSource()) { - ImGui::SetDragDropPayload("ContentBrowserResource", assetRelativePath.c_str(), assetRelativePath.size()); + ImGui::SetDragDropPayload("ContentBrowserResource", assetRelativePath.c_str(), assetRelativePath.length()); ImGui::Text("Drag to entity component"); ImGui::EndDragDropSource(); } if (ImGui::BeginPopupContextItem()) { + // Do a direct import here without relying on the file importer + if (type == FileType::Mesh && ImGui::MenuItem("Import as scene")) { + PopupPanels::filename = assetRelativePath; + PopupPanels::isImportScenePopupVisible = true; + } + // We shouldn't allow the user to delete the root entity if (ImGui::MenuItem("Open externally")) OpenExternally(std::filesystem::absolute(dirEntry.path()).string(), isDirectory); + if (ImGui::MenuItem("Rename")) { + renamePopupVisible = true; + auto dirEntryFilename = dirEntry.path().filename(); + renameString = dirEntryFilename.replace_extension("").string(); + renameDirEntry = dirEntry; + } + + if (ImGui::MenuItem("Delete")) + std::filesystem::remove(dirEntry.path()); + ImGui::EndPopup(); } @@ -264,6 +299,28 @@ namespace Atlas::Editor::UI { } + if (ImGui::BeginPopupContextWindow(nullptr, ImGuiPopupFlags_NoOpenOverItems | ImGuiPopupFlags_MouseButtonRight)) { + if (ImGui::BeginMenu("Create")) { + if (ImGui::MenuItem("Folder")) { + + } + if (ImGui::MenuItem("Script")) { + + } + ImGui::EndMenu(); + } + + ImGui::EndPopup(); + } + + if (TextInputPopup("Rename item", renamePopupVisible, renameString)) { + auto newPath = renameDirEntry.path(); + newPath = newPath.filename().replace_filename(renameString); + if (renameDirEntry.path().has_extension()) + newPath = newPath.replace_extension(renameDirEntry.path().extension()); + std::filesystem::rename(renameDirEntry.path(), newPath); + } + if (!nextDirectory.empty()) { currentDirectory = nextDirectory; } @@ -379,4 +436,48 @@ namespace Atlas::Editor::UI { } + bool ContentBrowserWindow::TextInputPopup(const char* name, bool& isVisible, std::string& input) { + + if (!isVisible) + return false; + + PopupPanels::SetupPopupSize(0.4f, 0.1f); + + bool popupNew = false; + + if (!ImGui::IsPopupOpen(name)) { + popupNew = true; + ImGui::OpenPopup(name); + } + + bool success = false; + + if (ImGui::BeginPopupModal(name, nullptr, ImGuiWindowFlags_NoResize)) { + + if (popupNew) + ImGui::SetKeyboardFocusHere(); + + ImGui::InputText("New name", &input); + + if (ImGui::Button("Cancel")) { + isVisible = false; + ImGui::CloseCurrentPopup(); + } + + ImGui::SameLine(); + + if (ImGui::Button("Ok") || ImGui::IsKeyReleased(ImGuiKey_Enter)) { + success = true; + isVisible = false; + ImGui::CloseCurrentPopup(); + } + + ImGui::EndPopup(); + + } + + return success; + + } + } \ No newline at end of file diff --git a/src/editor/ui/windows/ContentBrowserWindow.h b/src/editor/ui/windows/ContentBrowserWindow.h index 3cd61ccfe..423d7eee3 100644 --- a/src/editor/ui/windows/ContentBrowserWindow.h +++ b/src/editor/ui/windows/ContentBrowserWindow.h @@ -33,11 +33,17 @@ namespace Atlas::Editor::UI { void OpenExternally(const std::string& path, bool isDirectory); + bool TextInputPopup(const char* name, bool& isVisible, std::string& input); + int selectedFilter = -1; std::string currentDirectory = Loader::AssetLoader::GetAssetDirectory(); std::string assetSearch; + std::string renameString; + std::filesystem::directory_entry renameDirEntry; + bool renamePopupVisible = false; + }; } \ No newline at end of file diff --git a/src/editor/ui/windows/GeometryBrushWindow.cpp b/src/editor/ui/windows/GeometryBrushWindow.cpp index 86e5a0c67..f4425fcf0 100644 --- a/src/editor/ui/windows/GeometryBrushWindow.cpp +++ b/src/editor/ui/windows/GeometryBrushWindow.cpp @@ -10,7 +10,7 @@ namespace Atlas::Editor::UI { if (!Begin()) return; - std::string buttonName = "Drop entity here"; + std::string buttonName = "Drop entity with transform component here"; if (brushEntity.IsValid() && brushEntity.HasComponent()) buttonName = brushEntity.GetComponent().name; @@ -22,8 +22,6 @@ namespace Atlas::Editor::UI { if (dropPayload->IsDataType(typeid(Scene::Entity).name())) { std::memcpy(&dropEntity, dropPayload->Data, dropPayload->DataSize); bool validEntity = dropEntity.HasComponent(); - if (!validEntity) - Notifications::Push({.message = "Entity needs to have a transform component"}); if (validEntity && ImGui::AcceptDragDropPayload(typeid(Scene::Entity).name())) { brushEntity = dropEntity; @@ -52,7 +50,9 @@ namespace Atlas::Editor::UI { ImGui::EndDragDropTarget(); } - if (brushEntity.IsValid() && parentEntity.IsValid()) { + if (brushEntity.IsValid() && parentEntity.IsValid() && activeSceneWindow != nullptr + && activeSceneWindow->scene.Get().get() == brushEntity.GetScene() + && activeSceneWindow->scene.Get().get() == parentEntity.GetScene()) { RenderBrushSettings(); if (brushEnabled) { @@ -88,7 +88,7 @@ namespace Atlas::Editor::UI { ImGui::Separator(); ImGui::Text("Drop randomization"); - + } @@ -160,6 +160,8 @@ namespace Atlas::Editor::UI { if (!parentEntity.HasComponent()) parentEntity.AddComponent(); + auto decomposition = brushEntity.GetComponent().Decompose(); + for (int32_t i = 0; i < dropsPerFrame; i++) { auto deg = Common::Random::SampleFastUniformFloat() * 2.0f * 3.14159f; auto dist = Common::Random::SampleFastUniformFloat() + Common::Random::SampleFastUniformFloat(); @@ -172,19 +174,23 @@ namespace Atlas::Editor::UI { Atlas::Volume::Ray ray(pos + dropTarget.normal * brushRayLength, -dropTarget.normal); auto rayCastResult = scene->CastRay(ray); - if (!rayCastResult.valid || !rayCastResult.IsNormalValid() || rayCastResult.hitDistance > 2.0f * brushRayLength) + if (!rayCastResult.valid || !rayCastResult.IsNormalValid() || rayCastResult.hitDistance > 2.0f * brushRayLength) { return; + } mat4 rot { 1.0f }; if (brushAlignToSurface) { - vec3 normal = rayCastResult.normal; - vec3 tangent = vec3(1.0f, 0.0f, 0.0f); - vec3 bitangent = normalize(cross(tangent, normal)); - rot = mat4(mat3(tangent, normal, bitangent)); + vec3 N = rayCastResult.normal; + vec3 up = abs(N.y) < 0.999 ? vec3(0.0, 1.0, 0.0) : vec3(1.0, 0.0, 0.0); + vec3 tangent = normalize(cross(up, N)); + vec3 bitangent = cross(N, tangent); + + rot = mat4(mat3(tangent, N, bitangent)); } - auto transform = glm::translate(ray.Get(rayCastResult.hitDistance)) * rot; + decomposition.translation = ray.Get(rayCastResult.hitDistance); + auto transform = decomposition.Compose() * rot; auto entity = scene->DuplicateEntity(brushEntity); auto& transformComponent = entity.GetComponent(); @@ -194,7 +200,7 @@ namespace Atlas::Editor::UI { // Ray cast result is in global space, so need to bring transform to valid local one transformComponent.globalMatrix = transform; - transformComponent.ReconstructLocalMatrix(activeSceneWindow->scene.Get()); + transformComponent.ReconstructLocalMatrix(parentEntity); } } diff --git a/src/editor/ui/windows/ProfilerWindow.cpp b/src/editor/ui/windows/ProfilerWindow.cpp index 5d301a445..b0f5cadae 100644 --- a/src/editor/ui/windows/ProfilerWindow.cpp +++ b/src/editor/ui/windows/ProfilerWindow.cpp @@ -1,5 +1,7 @@ #include "ProfilerWindow.h" +#include "Clock.h" + namespace Atlas::Editor::UI { void ProfilerWindow::Render() { @@ -7,6 +9,12 @@ namespace Atlas::Editor::UI { if (!Begin()) return; + ImGui::Text("Total frame time: %f ms", Clock::GetAverage() * 1000.0f); + + ImGui::Separator(); + + ImGui::Text("GPU time table"); + gpuProfilerPanel.Render(); End(); diff --git a/src/editor/ui/windows/SceneWindow.cpp b/src/editor/ui/windows/SceneWindow.cpp index b14c8c83c..9ee020ddf 100644 --- a/src/editor/ui/windows/SceneWindow.cpp +++ b/src/editor/ui/windows/SceneWindow.cpp @@ -1,8 +1,10 @@ #include "SceneWindow.h" #include "../../Singletons.h" +#include "../../Notifications.h" #include "../../tools/ResourcePayloadHelper.h" -#include "scene/SceneSerializer.h" +#include "Serializer.h" +#include "common/Hash.h" #include "Clock.h" #include @@ -22,12 +24,7 @@ namespace Atlas::Editor::UI { SceneWindow::~SceneWindow() { - if (!scene.IsLoaded()) - return; - - scene->DestroyEntity(cameraEntity); - - Scene::SceneSerializer::SerializeScene(scene.Get(), "scenes/" + std::string(scene->name) + ".aescene"); + } @@ -42,14 +39,27 @@ namespace Atlas::Editor::UI { camera.isMain = true; } - auto& camera = cameraEntity.GetComponent(); - camera.aspectRatio = float(viewportPanel.viewport->width) / std::max(float(viewportPanel.viewport->height), 1.0f); - // If we're playing we can update here since we don't expect values to change from the UI side if (isPlaying) { scene->Timestep(deltaTime); scene->Update(); } + else { + auto& camera = cameraEntity.GetComponent(); + camera.aspectRatio = float(viewportPanel.viewport->width) / std::max(float(viewportPanel.viewport->height), 1.0f); + } + + bool controlDown; + +#ifdef AE_OS_MACOS + controlDown = ImGui::IsKeyDown(ImGuiKey_LeftSuper); +#else + controlDown = ImGui::IsKeyDown(ImGuiKey_LeftCtrl); +#endif + if (inFocus && controlDown && ImGui::IsKeyPressed(ImGuiKey_S, false) && !isPlaying) { + SaveScene(); + Notifications::Push({ .message = "Saved scene " + scene->name }); + } } @@ -58,6 +68,10 @@ namespace Atlas::Editor::UI { if (!Begin()) return; + if (ImGui::IsDragDropActive() && ImGui::IsWindowHovered(ImGuiHoveredFlags_RectOnly)) { + ImGui::SetWindowFocus(); + } + ImGuiID dsID = ImGui::GetID(dockSpaceNameID.c_str()); if (!ImGui::DockBuilderGetNode(dsID) || resetDockingLayout) { @@ -130,6 +144,9 @@ namespace Atlas::Editor::UI { comp.isMain = false; } + // Path tracing needs history while ray tracing + scene->rayTracingWorld->includeObjectHistory = Singletons::config->pathTrace; + scene->Timestep(Clock::GetDelta()); scene->Update(); @@ -149,7 +166,7 @@ namespace Atlas::Editor::UI { auto path = ResourcePayloadHelper::AcceptDropResourceAndGetPath(); if (!path.empty()) { - auto entity = Scene::SceneSerializer::DeserializePrefab(scene.Get(), path); + auto entity = Serializer::DeserializePrefab(scene.Get(), path); PushEntityIntoSceneHierarchy(entity); } @@ -213,19 +230,8 @@ namespace Atlas::Editor::UI { auto offset = region.x / 2.0f - buttonSize.x - padding; ImGui::SetCursorPos(ImVec2(offset, 0.0f)); - if (ImGui::ImageButton(set, buttonSize, uvMin, uvMax) && scene.IsLoaded()) { - if (hasMainCamera) { - auto& camera = cameraEntity.GetComponent(); - camera.isMain = false; - } - - scene->physicsWorld->SaveState(); - scene->physicsWorld->pauseSimulation = false; - // Unselect when starting the simulation/scene (otherwise some physics settings might not - // be reverted after stopping - sceneHierarchyPanel.selectedEntity = Scene::Entity(); - - isPlaying = true; + if (ImGui::ImageButton(set, buttonSize, uvMin, uvMax) && scene.IsLoaded() && !isPlaying) { + StartPlaying(); } auto& stopIcon = Singletons::icons->Get(IconType::Stop); @@ -234,14 +240,7 @@ namespace Atlas::Editor::UI { offset = region.x / 2.0f + padding; ImGui::SetCursorPos(ImVec2(offset, 0.0f)); if (ImGui::ImageButton(set, buttonSize, uvMin, uvMax) && scene.IsLoaded() && isPlaying) { - // Set camera to main in any case - auto& camera = cameraEntity.GetComponent(); - camera.isMain = true; - - scene->physicsWorld->RestoreState(); - scene->physicsWorld->pauseSimulation = true; - - isPlaying = false; + StopPlaying(); } auto& settingsIcon = Singletons::icons->Get(IconType::Settings); @@ -265,6 +264,7 @@ namespace Atlas::Editor::UI { ImGui::Text("Editor camera"); + ImGui::DragFloat("Exposure", &camera.exposure, 0.1f, 1.0f, 180.0f); ImGui::DragFloat("Field of view", &camera.fieldOfView, 0.1f, 1.0f, 180.0f); ImGui::DragFloat("Near plane", &camera.nearPlane, 0.01f, 0.01f, 10.0f); @@ -311,18 +311,31 @@ namespace Atlas::Editor::UI { if (selectedEntity.IsValid() && selectedEntity.HasComponent()) { auto& transform = selectedEntity.GetComponent(); + auto mesh = selectedEntity.TryGetComponent(); + + auto globalDecomp = Common::MatrixDecomposition(transform.globalMatrix); - auto globalMatrix = transform.globalMatrix; + glm::vec3 offset = vec3(0.0f); + if (mesh) + offset = (0.5f * (mesh->aabb.min + mesh->aabb.max)) - globalDecomp.translation; + + globalDecomp.translation += offset; + auto globalMatrix = globalDecomp.Compose(); ImGuizmo::Manipulate(glm::value_ptr(vMatrix), glm::value_ptr(pMatrix), static_cast(guizmoMode), ImGuizmo::MODE::WORLD, glm::value_ptr(globalMatrix)); + globalDecomp = Common::MatrixDecomposition(globalMatrix); + globalDecomp.translation -= offset; + // Update both the local and global matrix, since e.g. the transform component // panel recovers the local matrix from the global one (needs to do this after // e.g. physics only updated the global matrix - transform.globalMatrix = globalMatrix; - transform.ReconstructLocalMatrix(scene.Get()); + transform.globalMatrix = globalDecomp.Compose(); + + auto parentEntity = scene->GetParentEntity(selectedEntity); + transform.ReconstructLocalMatrix(parentEntity); } const auto& io = ImGui::GetIO(); @@ -409,8 +422,14 @@ namespace Atlas::Editor::UI { if (!parentEntity.HasComponent()) parentEntity.AddComponent(); - auto& hierarchy = parentEntity.GetComponent(); - hierarchy.AddChild(entity); + auto& parentHierarchy = parentEntity.GetComponent(); + parentHierarchy.AddChild(entity); + + // We don't know where this entity came from, so disable root hierarchy in any case to + // avoid setting the matrices twice and getting unwanted movements + auto hierarchy = entity.TryGetComponent(); + if (hierarchy) + hierarchy->root = false; if (changeSelection) { sceneHierarchyPanel.selectedEntity = entity; @@ -418,4 +437,67 @@ namespace Atlas::Editor::UI { } } + void SceneWindow::StartPlaying() { + + SaveSceneState(); + + scene->physicsWorld->pauseSimulation = false; + // Unselect when starting the simulation/scene (otherwise some physics settings might not + // be reverted after stopping + sceneHierarchyPanel.selectedEntity = Scene::Entity(); + + isPlaying = true; + + } + + void SceneWindow::StopPlaying() { + + RestoreSceneState(); + + isPlaying = false; + + } + + void SceneWindow::SaveSceneState() { + + cameraState = Scene::Entity::Backup(scene.Get(), cameraEntity); + + scene->DestroyEntity(cameraEntity); + + sceneState = Scene::Scene::Backup(scene.Get()); + + } + + void SceneWindow::RestoreSceneState() { + + if (sceneState.empty()) + return; + + auto backupScene = Scene::Scene::Restore(sceneState); + scene.GetResource()->Swap(backupScene); + + cameraEntity = Scene::Entity::Restore(scene.Get(), cameraState); + + sceneState.clear(); + cameraState.clear(); + + } + + void SceneWindow::SaveScene() { + + if (!scene.IsLoaded()) + return; + + cameraState = Scene::Entity::Backup(scene.Get(), cameraEntity); + + scene->DestroyEntity(cameraEntity); + + Serializer::SerializeScene(scene.Get(), "scenes/" + std::string(scene->name) + ".aescene"); + + cameraEntity = Scene::Entity::Restore(scene.Get(), cameraState); + + cameraState.clear(); + + } + } diff --git a/src/editor/ui/windows/SceneWindow.h b/src/editor/ui/windows/SceneWindow.h index c04dc8fe7..5cac55363 100644 --- a/src/editor/ui/windows/SceneWindow.h +++ b/src/editor/ui/windows/SceneWindow.h @@ -28,6 +28,16 @@ namespace Atlas::Editor::UI { void PushEntityIntoSceneHierarchy(Scene::Entity entity, bool changeSelection = true); + void StartPlaying(); + + void StopPlaying(); + + void SaveSceneState(); + + void RestoreSceneState(); + + void SaveScene(); + SceneHierarchyPanel sceneHierarchyPanel; ViewportPanel viewportPanel; ScenePropertiesPanel scenePropertiesPanel; @@ -52,6 +62,9 @@ namespace Atlas::Editor::UI { private: void RenderEntityBoundingVolumes(Scene::Entity entity); + std::vector sceneState; + std::vector cameraState; + }; } \ No newline at end of file diff --git a/src/editor/ui/windows/Window.cpp b/src/editor/ui/windows/Window.cpp index 528f3167a..01a6718bc 100644 --- a/src/editor/ui/windows/Window.cpp +++ b/src/editor/ui/windows/Window.cpp @@ -1,5 +1,9 @@ #include "Window.h" +#include + +#include + namespace Atlas::Editor::UI { bool Window::Begin(ImGuiWindowFlags flags) { diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt index bafa7e31c..f85926788 100644 --- a/src/engine/CMakeLists.txt +++ b/src/engine/CMakeLists.txt @@ -24,12 +24,13 @@ endif() # Set built type macros ########################################################################### if (DEFINED CMAKE_BUILD_TYPE) + # We want the better/safer usertypes, such that we don't crash everything if(CMAKE_BUILD_TYPE STREQUAL "Release") - set(ATLAS_ENGINE_COMPILE_DEFINITIONS ${ATLAS_ENGINE_COMPILE_DEFINITIONS} AE_BUILDTYPE_RELEASE) + set(ATLAS_ENGINE_COMPILE_DEFINITIONS ${ATLAS_ENGINE_COMPILE_DEFINITIONS} AE_BUILDTYPE_RELEASE SOL_ALL_SAFETIES_ON) elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") - set(ATLAS_ENGINE_COMPILE_DEFINITIONS ${ATLAS_ENGINE_COMPILE_DEFINITIONS} AE_BUILDTYPE_RELWITHDEBINFO) + set(ATLAS_ENGINE_COMPILE_DEFINITIONS ${ATLAS_ENGINE_COMPILE_DEFINITIONS} AE_BUILDTYPE_RELWITHDEBINFO SOL_ALL_SAFETIES_ON) else() - set(ATLAS_ENGINE_COMPILE_DEFINITIONS ${ATLAS_ENGINE_COMPILE_DEFINITIONS} AE_BUILDTYPE_DEBUG) + set(ATLAS_ENGINE_COMPILE_DEFINITIONS ${ATLAS_ENGINE_COMPILE_DEFINITIONS} AE_BUILDTYPE_DEBUG SOL_ALL_SAFETIES_ON) endif() else() set(ATLAS_ENGINE_COMPILE_DEFINITIONS ${ATLAS_ENGINE_COMPILE_DEFINITIONS} AE_BUILDTYPE_RELEASE) @@ -40,8 +41,9 @@ if(WIN32) set(ATLAS_ENGINE_COMPILE_DEFINITIONS ${ATLAS_ENGINE_COMPILE_DEFINITIONS} AE_OS_WINDOWS) set(ATLAS_ENGINE_LIBS assimp::assimp SDL2::SDL2 SDL2::SDL2main SPIRV-Tools-opt - volk::volk volk::volk_headers GPUOpen::VulkanMemoryAllocator fsr2 - unofficial::spirv-reflect::spirv-reflect glslang::SPIRV unofficial::joltphysics::Jolt) + volk::volk volk::volk_headers GPUOpen::VulkanMemoryAllocator + unofficial::spirv-reflect::spirv-reflect glslang::SPIRV unofficial::joltphysics::Jolt + ${LUA_LIBRARIES} sol2 fsr2) endif() if (MINGW) @@ -54,15 +56,16 @@ if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_USE_PLATFORM_MACOS_MVK -DVK_EXAMPLE_XCODE_GENERATED") set(ATLAS_ENGINE_LIBS assimp::assimp SDL2::SDL2 SDL2::SDL2main SDL2::SDL2-static - volk::volk SPIRV-Tools-opt unofficial::joltphysics::Jolt + volk::volk SPIRV-Tools-opt unofficial::joltphysics::Jolt fsr2 GPUOpen::VulkanMemoryAllocator Vulkan::Vulkan Vulkan::Headers - unofficial::spirv-reflect::spirv-reflect glslang::SPIRV fsr2) + unofficial::spirv-reflect::spirv-reflect glslang::SPIRV ${LUA_LIBRARIES} sol2) endif() if(ANDROID) set(ATLAS_ENGINE_COMPILE_DEFINITIONS ${ATLAS_ENGINE_COMPILE_DEFINITIONS} AE_OS_ANDROID) - set(ATLAS_ENGINE_LIBS assimp::assimp SDL2::SDL2 SDL2::SDL2main SDL2::SDL2-static hidapi) + set(ATLAS_ENGINE_LIBS assimp::assimp SDL2::SDL2 SDL2::SDL2main SDL2::SDL2-static hidapi + ${LUA_LIBRARIES} sol2 fsr2) set(ATLAS_ENGINE_SYSTEM_LIBS android m) endif() @@ -77,9 +80,14 @@ if(UNIX AND NOT APPLE AND NOT ANDROID) set(CMAKE_INSTALL_RPATH "./") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - set(ATLAS_ENGINE_LIBS assimp::assimp SDL2::SDL2 SDL2::SDL2main SDL2::SDL2-static + set(ATLAS_ENGINE_LIBS assimp::assimp SDL2::SDL2 SDL2::SDL2main SDL2::SDL2-static fsr2 volk::volk volk::volk_headers GPUOpen::VulkanMemoryAllocator unofficial::joltphysics::Jolt - unofficial::spirv-reflect::spirv-reflect SPIRV-Tools-opt glslang::SPIRV fsr2) + unofficial::spirv-reflect::spirv-reflect SPIRV-Tools-opt glslang::SPIRV ${LUA_LIBRARIES} sol2) +endif() + +# Due to lua bindings we need more addressable functions (but not for clang) +if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + add_compile_options(/bigobj) endif() # Add source files ################################################################################ @@ -145,6 +153,7 @@ target_include_directories(${PROJECT_NAME} ${VULKAN_HEADERS_INCLUDE_DIRS} ${STB_INCLUDE_DIRS} ${GLM_INCLUDE_DIRS} + ${LUA_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../libs) diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index d6e02a5fd..d3eb2dba9 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -7,6 +7,7 @@ #include "pipeline/PipelineManager.h" #include "physics/PhysicsManager.h" #include "texture/Texture.h" +#include "input/KeyboardMap.h" #include "graphics/ShaderCompiler.h" @@ -71,6 +72,7 @@ namespace Atlas { Common::Random::Init(); PipelineManager::Init(); Physics::PhysicsManager::Init(); + Input::KeyboardMap::Init(); // We need lower sample size for smaller buffer on SDL side (e.g. 256 instead of 1024) Audio::AudioManager::Configure(48000, 2, 128); @@ -87,6 +89,7 @@ namespace Atlas { Physics::PhysicsManager::Shutdown(); Texture::Texture::Shutdown(); Audio::AudioManager::Shutdown(); + Input::KeyboardMap::Shutdown(); #ifdef AE_NO_APP SDL_Quit(); @@ -100,6 +103,7 @@ namespace Atlas { Events::EventManager::Update(); PipelineManager::Update(); Audio::AudioManager::Update(); + Physics::ShapesManager::Update(); } @@ -112,4 +116,4 @@ namespace Atlas { } -} \ No newline at end of file +} diff --git a/src/engine/Main.cpp b/src/engine/Main.cpp index 1a59f0a6b..fa273f94b 100644 --- a/src/engine/Main.cpp +++ b/src/engine/Main.cpp @@ -32,8 +32,6 @@ int main(int argc, char* argv[]) { setenv("MVK_DEBUG", "0", 1); #endif - // SetEnvironmentVariable("VK_ICD_FILENAMES", "C:\\Users\\tippe\\Documents\\Repos\\swiftshader\\build\\Windows\\vk_swiftshader_icd.json"); - Atlas::Engine::Init(Atlas::EngineInstance::engineConfig); auto graphicsInstance = Atlas::Graphics::Instance::DefaultInstance; diff --git a/src/engine/RenderList.cpp b/src/engine/RenderList.cpp index 63067376d..b60103f74 100644 --- a/src/engine/RenderList.cpp +++ b/src/engine/RenderList.cpp @@ -30,9 +30,20 @@ namespace Atlas { impostorMatrices.clear(); if (lastSize) impostorMatrices.reserve(lastSize); + // Fill in missing meshes since they are cleared at the end of each frame + auto meshes = scene->GetMeshes(); + for (auto& pass : passes) { + for (const auto& mesh : meshes) { + auto id = mesh.GetID(); + pass->meshIdToMeshMap[id] = mesh; + } + + std::erase_if(pass->meshToEntityMap, [pass](const auto& item) { return !pass->meshIdToMeshMap.contains(item.first); }); + std::erase_if(pass->meshToInstancesMap, [pass](const auto& item) { return !pass->meshIdToMeshMap.contains(item.first); }); + } } - void RenderList::NewMainPass() { + Ref RenderList::NewMainPass() { Pass pass { .type = RenderPassType::Main, @@ -40,90 +51,94 @@ namespace Atlas { .layer = 0 }; - passes.push_back(pass); + passes.push_back(CreateRef(pass)); + return passes.back(); } - void RenderList::NewShadowPass(ECS::Entity lightEntity, uint32_t layer) { + Ref RenderList::NewShadowPass(ECS::Entity lightEntity, uint32_t layer) { - Pass pass { + Pass pass{ .type = RenderPassType::Shadow, .lightEntity = lightEntity, - .layer = layer + .layer = layer, + .wasUsed = true }; - passes.push_back(pass); + passes.push_back(CreateRef(pass)); + return passes.back(); } - - RenderList::Pass* RenderList::GetMainPass() { + Ref RenderList::GetMainPass() { for (auto& pass : passes) { - if (pass.type == RenderPassType::Main) return &pass; + if (pass->type == RenderPassType::Main) return pass; } return nullptr; } - RenderList::Pass* RenderList::GetShadowPass(ECS::Entity lightEntity, const uint32_t layer) { + Ref RenderList::GetShadowPass(ECS::Entity lightEntity, const uint32_t layer) { for (auto& pass : passes) { - if (pass.type == RenderPassType::Shadow && - pass.lightEntity == lightEntity && pass.layer == layer) return &pass; + if (pass->type == RenderPassType::Shadow && + pass->lightEntity == lightEntity && pass->layer == layer) return pass; } return nullptr; } - void RenderList::Add(const ECS::Entity& entity, const MeshComponent& meshComponent) { + void RenderList::Add(const Ref& pass, const ECS::Entity& entity, const MeshComponent& meshComponent) { - auto& pass = passes.back(); - auto& meshToActorMap = pass.meshToEntityMap; + auto& meshToActorMap = pass->meshToEntityMap; if (!meshComponent.mesh.IsLoaded()) return; auto id = meshComponent.mesh.GetID(); - if (!meshToActorMap.contains(id)) { - auto& meshIdToMeshMap = pass.meshIdToMeshMap; - - meshToActorMap[id] = { entity }; - meshIdToMeshMap[id] = meshComponent.mesh; + auto item = meshToActorMap.find(id); + if (item != meshToActorMap.end()) { + item->second.Add(entity); } else { - meshToActorMap[id].push_back(entity); + auto& meshIdToMeshMap = pass->meshIdToMeshMap; + + EntityBatch batch; + batch.Add(entity); + + meshToActorMap[id] = batch; + meshIdToMeshMap[id] = meshComponent.mesh; } } - void RenderList::Update(vec3 cameraLocation) { + void RenderList::Update(const Ref& pass, vec3 cameraLocation) { - auto& pass = passes.back(); - auto type = pass.type; - auto& meshToActorMap = pass.meshToEntityMap; - auto& meshToInstancesMap = pass.meshToInstancesMap; - auto& meshIdToMeshMap = pass.meshIdToMeshMap; + auto type = pass->type; + auto& meshToEntityMap = pass->meshToEntityMap; + auto& meshToInstancesMap = pass->meshToInstancesMap; + auto& meshIdToMeshMap = pass->meshIdToMeshMap; size_t maxActorCount = 0; size_t maxImpostorCount = 0; - for (auto& [meshId, actors] : meshToActorMap) { + for (auto& [meshId, batch] : meshToEntityMap) { auto mesh = meshIdToMeshMap[meshId]; if (!mesh->castShadow && type == RenderPassType::Shadow) continue; auto hasImpostor = mesh->impostor != nullptr; - maxActorCount += actors.size(); - maxImpostorCount += hasImpostor ? actors.size() : 0; + maxActorCount += batch.count; + maxImpostorCount += hasImpostor ? batch.count : 0; } - for (auto& [meshId, entities] : meshToActorMap) { + for (auto& [meshId, batch] : meshToEntityMap) { auto mesh = meshIdToMeshMap[meshId]; - if (!entities.size()) continue; + if (!batch.count) continue; if (!mesh->castShadow && type == RenderPassType::Shadow) continue; auto hasImpostor = mesh->impostor != nullptr; @@ -140,7 +155,8 @@ namespace Atlas { instances.impostorOffset = impostorMatrices.size(); if (hasImpostor) { - for (auto ecsEntity : entities) { + for (size_t i = 0; i < batch.count; i++) { + auto& ecsEntity = batch.entities[i]; auto entity = Scene::Entity(ecsEntity, &scene->entityManager); auto& transformComponent = entity.GetComponent(); auto distance = glm::distance2( @@ -154,7 +170,7 @@ namespace Atlas { } else { // For now push back anyways (since indices of matrices per entity need to match) - lastEntityMatrices.push_back(glm::transpose(transformComponent.globalMatrix)); + lastEntityMatrices.push_back(currentEntityMatrices.back()); } } else { @@ -163,7 +179,8 @@ namespace Atlas { } } else { - for (auto ecsEntity : entities) { + for (size_t i = 0; i < batch.count; i++) { + auto& ecsEntity = batch.entities[i]; auto entity = Scene::Entity(ecsEntity, &scene->entityManager); auto& transformComponent = entity.GetComponent(); currentEntityMatrices.push_back(glm::transpose(transformComponent.globalMatrix)); @@ -172,7 +189,7 @@ namespace Atlas { } else { // For now push back anyways - lastEntityMatrices.push_back(glm::transpose(transformComponent.globalMatrix)); + lastEntityMatrices.push_back(currentEntityMatrices.back()); } } } @@ -229,7 +246,9 @@ namespace Atlas { // We can reset the scene now and delete the reference scene = nullptr; - passes.clear(); + std::erase_if(passes, [](const auto& item) { return item->wasUsed != true; }); + for (auto& pass : passes) + pass->Reset(); } diff --git a/src/engine/RenderList.h b/src/engine/RenderList.h index 815488d2e..d82d077ce 100644 --- a/src/engine/RenderList.h +++ b/src/engine/RenderList.h @@ -7,7 +7,7 @@ #include "graphics/Buffer.h" -#include +#include #include namespace Atlas { @@ -32,32 +32,63 @@ namespace Atlas { Shadow = 1 }; + struct EntityBatch { + size_t count = 0; + std::vector entities; + + inline void Add(ECS::Entity entity) { + if (count < entities.size()) + entities[count] = entity; + else + entities.push_back(entity); + count++; + } + }; + struct Pass { RenderPassType type; ECS::Entity lightEntity; uint32_t layer; - std::map> meshToEntityMap; - std::map meshToInstancesMap; - std::map> meshIdToMeshMap; + std::unordered_map meshToEntityMap; + std::unordered_map meshToInstancesMap; + std::unordered_map> meshIdToMeshMap; + + bool wasUsed = false; + + void Reset() { + + std::erase_if(meshToEntityMap, [](auto& item) { return item.second.count == 0; }); + for (auto& [id, batch] : meshToEntityMap) { + batch.entities.resize(batch.count); + batch.count = 0; + } + + // Need to clear this to free the references + meshIdToMeshMap.clear(); + meshToInstancesMap.clear(); + + wasUsed = false; + + } }; RenderList(); void NewFrame(Ref scene); - void NewMainPass(); + Ref NewMainPass(); - void NewShadowPass(const ECS::Entity lightEntity, uint32_t layer); + Ref NewShadowPass(const ECS::Entity lightEntity, uint32_t layer); - Pass* GetMainPass(); + Ref GetMainPass(); - Pass* GetShadowPass(const ECS::Entity lightEntity, const uint32_t layer); + Ref GetShadowPass(const ECS::Entity lightEntity, const uint32_t layer); - void Add(const ECS::Entity& entity, const MeshComponent& meshComponent); + void Add(const Ref& pass, const ECS::Entity& entity, const MeshComponent& meshComponent); - void Update(vec3 cameraLocation); + void Update(const Ref& pass, vec3 cameraLocation); void FillBuffers(); @@ -73,7 +104,7 @@ namespace Atlas { Ref lastMatricesBuffer; Ref impostorMatricesBuffer; - std::vector passes; + std::vector> passes; }; diff --git a/src/engine/Serializer.cpp b/src/engine/Serializer.cpp new file mode 100644 index 000000000..dab05c9a5 --- /dev/null +++ b/src/engine/Serializer.cpp @@ -0,0 +1,129 @@ +#include "Serializer.h" +#include "scene/SceneSerializer.h" + +#include "lighting/LightingSerializer.h" +#include "postprocessing/PostProcessingSerializer.h" +#include "physics/PhysicsSerializer.h" + +#include "loader/AssetLoader.h" +#include "loader/TerrainLoader.h" + +namespace Atlas { + + void Serializer::SerializeScene(Ref scene, const std::string& filename, bool binaryJson, bool formatJson) { + + auto path = Loader::AssetLoader::GetFullPath(filename); + auto fileStream = Loader::AssetLoader::WriteFile(path, std::ios::out | std::ios::binary); + + if (!fileStream.is_open()) { + Log::Error("Couldn't write scene file " + filename); + return; + } + + json j; + Scene::SceneToJson(j, scene.get()); + + if (binaryJson) { + auto data = json::to_bjdata(j); + fileStream.write(reinterpret_cast(data.data()), data.size()); + } + else { + fileStream << (formatJson ? j.dump(2) : j.dump()); + } + + fileStream.close(); + + } + + Ref Serializer::DeserializeScene(const std::string& filename, bool binaryJson) { + + Loader::AssetLoader::UnpackFile(filename); + auto path = Loader::AssetLoader::GetFullPath(filename); + + auto fileStream = Loader::AssetLoader::ReadFile(path, std::ios::in | std::ios::binary); + + if (!fileStream.is_open()) { + throw ResourceLoadException(filename, "Couldn't open scene file stream"); + } + + json j; + if (binaryJson) { + auto data = Loader::AssetLoader::GetFileContent(fileStream); + j = json::from_bjdata(data); + } + else { + std::string serialized((std::istreambuf_iterator(fileStream)), + std::istreambuf_iterator()); + j = json::parse(serialized); + } + + fileStream.close(); + + Ref scene; + Scene::SceneFromJson(j, scene); + + return scene; + + } + + void Serializer::SerializePrefab(Ref scene, Scene::Entity entity, const std::string& filename, bool formatJson) { + + auto path = Loader::AssetLoader::GetFullPath(filename); + auto fileStream = Loader::AssetLoader::WriteFile(path, std::ios::out | std::ios::binary); + + if (!fileStream.is_open()) { + Log::Error("Couldn't write entity file " + filename); + return; + } + + json j; + + std::set insertedEntities; + Scene::EntityToJson(j, entity, scene.get(), insertedEntities); + + auto rigidBody = entity.TryGetComponent(); + + if (rigidBody) { + j["body"] = rigidBody->GetBodyCreationSettings(); + } + + fileStream << (formatJson ? j.dump(2) : j.dump()); + + fileStream.close(); + + } + + Scene::Entity Serializer::DeserializePrefab(Ref scene, const std::string& filename) { + + Loader::AssetLoader::UnpackFile(filename); + auto path = Loader::AssetLoader::GetFullPath(filename); + + auto fileStream = Loader::AssetLoader::ReadFile(path, std::ios::in | std::ios::binary); + + if (!fileStream.is_open()) { + throw ResourceLoadException(filename, "Couldn't open entity file stream"); + } + + std::string serialized((std::istreambuf_iterator(fileStream)), + std::istreambuf_iterator()); + + fileStream.close(); + + json j = json::parse(serialized); + + auto entity = scene->CreateEntity(); + + Scene::EntityFromJson(j, entity, scene.get()); + + auto rigidBody = entity.TryGetComponent(); + if (rigidBody) + rigidBody->creationSettings = CreateRef(); + + if (rigidBody && j.contains("body")) + *rigidBody->creationSettings = j["body"]; + + return entity; + + } + +} \ No newline at end of file diff --git a/src/engine/Serializer.h b/src/engine/Serializer.h new file mode 100644 index 000000000..816ff35e1 --- /dev/null +++ b/src/engine/Serializer.h @@ -0,0 +1,20 @@ +#pragma once + +#include "scene/Scene.h" + +namespace Atlas { + + class Serializer { + + public: + static void SerializeScene(Ref scene, const std::string& filename, bool binaryJson = false, bool formatJson = false); + + static Ref DeserializeScene(const std::string& filename, bool binaryJson = false); + + static void SerializePrefab(Ref scene, Scene::Entity entity, const std::string& filename, bool formatJson = false); + + static Scene::Entity DeserializePrefab(Ref scene, const std::string& filename); + + }; + +} \ No newline at end of file diff --git a/src/engine/buffer/VertexArray.cpp b/src/engine/buffer/VertexArray.cpp index 5af0f609f..3dc7a1729 100644 --- a/src/engine/buffer/VertexArray.cpp +++ b/src/engine/buffer/VertexArray.cpp @@ -56,7 +56,7 @@ namespace Atlas { } - void VertexArray::Bind(Graphics::CommandList *commandList) const { + void VertexArray::Bind(Graphics::CommandList *commandList) { if (hasIndexComponent) { commandList->BindIndexBuffer(indexComponent.buffer, indexComponent.type); @@ -64,22 +64,22 @@ namespace Atlas { // Bind in batches to reduce driver binding overhead uint32_t bindingOffset = 0; - std::vector> buffers; + bindingBuffers.clear(); for (auto& [attribArray, vertexComponent] : vertexComponents) { - if (attribArray != bindingOffset + 1 && buffers.size() > 0) { - uint32_t bindingCount = uint32_t(buffers.size()); - commandList->BindVertexBuffers(buffers, bindingOffset, bindingCount); + if (attribArray != bindingOffset + 1 && bindingBuffers.size() > 0) { + uint32_t bindingCount = uint32_t(bindingBuffers.size()); + commandList->BindVertexBuffers(bindingBuffers, bindingOffset, bindingCount); - buffers.clear(); + bindingBuffers.clear(); bindingOffset = attribArray; } - buffers.push_back(vertexComponent.vertexBuffer.buffer); + bindingBuffers.push_back(vertexComponent.vertexBuffer.buffer); } - if (buffers.size()) { - uint32_t bindingCount = uint32_t(buffers.size()); - commandList->BindVertexBuffers(buffers, bindingOffset, bindingCount); + if (bindingBuffers.size()) { + uint32_t bindingCount = uint32_t(bindingBuffers.size()); + commandList->BindVertexBuffers(bindingBuffers, bindingOffset, bindingCount); } } diff --git a/src/engine/buffer/VertexArray.h b/src/engine/buffer/VertexArray.h index b0428ef76..a521183ef 100644 --- a/src/engine/buffer/VertexArray.h +++ b/src/engine/buffer/VertexArray.h @@ -5,6 +5,7 @@ #include "VertexBuffer.h" #include "../graphics/CommandList.h" +#include "../graphics/Buffer.h" #include @@ -53,7 +54,7 @@ namespace Atlas { */ VertexBuffer GetComponent(uint32_t attribArray); - void Bind(Graphics::CommandList* commandList) const; + void Bind(Graphics::CommandList* commandList); VkPipelineVertexInputStateCreateInfo GetVertexInputState(); @@ -71,6 +72,8 @@ namespace Atlas { std::vector bindingDescriptions; std::vector attributeDescriptions; + std::vector> bindingBuffers; + }; } diff --git a/src/engine/common/Image.h b/src/engine/common/Image.h index bf851c5dc..920c4404a 100644 --- a/src/engine/common/Image.h +++ b/src/engine/common/Image.h @@ -502,15 +502,17 @@ namespace Atlas { int32_t channelCount, int32_t mipLevel) const { std::vector channelData; - auto& level = mipLevels[mipLevel]; auto totalPixels = int32_t(level.data.size()) / channels; auto count = channelOffset + channelCount; + channelData.resize(channelCount * totalPixels); + size_t dataCount = 0; + for (int32_t i = 0; i < totalPixels; i++) { for (int32_t j = channelOffset; j < count; j++) { - channelData.push_back(level.data[i * channels + j]); + channelData[dataCount++] = level.data[i * channels + j]; } } diff --git a/src/engine/common/Path.cpp b/src/engine/common/Path.cpp index b837bd454..76cb5b8c0 100644 --- a/src/engine/common/Path.cpp +++ b/src/engine/common/Path.cpp @@ -68,6 +68,20 @@ namespace Atlas { } + std::string Path::GetFileNameWithoutExtension(std::string path) { + + auto offset = path.find_last_of("/\\") + 1; + if (offset == std::string::npos) + offset = 0; + + auto length = path.find_last_of(".") - offset; + if (length == std::string::npos) + length = path.length() - offset; + + return path.substr(offset, length); + + } + std::string Path::GetFileType(std::string path) { std::string fileType = ""; diff --git a/src/engine/common/Path.h b/src/engine/common/Path.h index f880418ca..93d35c4ee 100644 --- a/src/engine/common/Path.h +++ b/src/engine/common/Path.h @@ -37,6 +37,14 @@ namespace Atlas { */ static std::string GetFileName(std::string path); + /** + * Returns the file name of a path without its extension. + * @param path A path to a file. + * @return The file name in the path. + * @warning The paths must contain a filename. + */ + static std::string GetFileNameWithoutExtension(std::string path); + /** * Returns the file type of a path. * @param path A path to a file. diff --git a/src/engine/ecs/Storage.h b/src/engine/ecs/Storage.h index 7c570a0fd..b880d9f90 100644 --- a/src/engine/ecs/Storage.h +++ b/src/engine/ecs/Storage.h @@ -99,14 +99,15 @@ namespace Atlas { auto idx = EntityToIdx(entity); auto page = GetPage(idx); + auto offset = GetOffset(idx); - if (page >= pageData.size()) + if (page >= pageData.size() || offset >= pageData[page].size()) return EntityConfig::InvalidEntity; - return pageData[GetPage(idx)][GetOffset(idx)]; + return pageData[page][offset]; } } -} \ No newline at end of file +} diff --git a/src/engine/events/KeyboardEvent.h b/src/engine/events/KeyboardEvent.h index a40968f69..e0028a3ea 100644 --- a/src/engine/events/KeyboardEvent.h +++ b/src/engine/events/KeyboardEvent.h @@ -17,7 +17,7 @@ namespace Atlas { explicit KeyboardEvent(SDL_KeyboardEvent event) { windowID = event.windowID; - keyCode = event.keysym.sym; + keyCode = static_cast(event.keysym.sym); keyModifiers = event.keysym.mod; state = event.state; repeat = event.repeat > 0 ? true : false; diff --git a/src/engine/events/Keycodes.h b/src/engine/events/Keycodes.h index db1888d0d..9a982d991 100644 --- a/src/engine/events/Keycodes.h +++ b/src/engine/events/Keycodes.h @@ -2,267 +2,265 @@ #include "../System.h" -typedef int32_t Keycode; - #define SCANCODE_MASK (1 << 30) #define SCANCODE_TO_KEYCODE(X) (X | SCANCODE_MASK) #define KEYCODE_TO_SCANCODE(X) (X & ~(SCANCODE_MASK)) -enum { - AE_KEY_UNKNOWN = 0, +enum class Keycode { + KeyUnknown = 0, - AE_KEY_ENTER = '\r', - AE_KEY_ESCAPE = '\033', - AE_KEY_BACKSPACE = '\b', - AE_KEY_TAB = ' ', - AE_KEY_SPACE = ' ', - AE_KEY_EXCLAIM = '!', - AE_KEY_QUOTEDBL = '"', - AE_KEY_HASH = '#', - AE_KEY_PERCENT = '%', - AE_KEY_DOLLAR = '$', - AE_KEY_AMPERSAND = '&', - AE_KEY_QUOTE = '\'', - AE_KEY_LEFTPAREN = '(', - AE_KEY_RIGHTPAREN = ')', - AE_KEY_ASTERISK = '*', - AE_KEY_PLUS = '+', - AE_KEY_COMMA = ',', - AE_KEY_MINUS = '-', - AE_KEY_PERIOD = '.', - AE_KEY_SLASH = '/', - AE_KEY_0 = '0', - AE_KEY_1 = '1', - AE_KEY_2 = '2', - AE_KEY_3 = '3', - AE_KEY_4 = '4', - AE_KEY_5 = '5', - AE_KEY_6 = '6', - AE_KEY_7 = '7', - AE_KEY_8 = '8', - AE_KEY_9 = '9', - AE_KEY_COLON = ':', - AE_KEY_SEMICOLON = ';', - AE_KEY_LESS = '<', - AE_KEY_EQUALS = '=', - AE_KEY_GREATER = '>', - AE_KEY_QUESTION = '?', - AE_KEY_AT = '@', + KeyEnter = '\r', + KeyEscape = '\033', + KeyBackspace = '\b', + KeyTab = ' ', + KeySpace = ' ', + KeyExclaim = '!', + KeyDoubleQuote = '"', + KeyHash = '#', + KeyPercent = '%', + KeyDollar = '$', + KeyAnd = '&', + KeyQuote = '\'', + KeyLeftParen = '(', + KeyRightParen = ')', + KeyAsterisk = '*', + KeyPlus = '+', + KeyComma = ',', + KeyMinus = '-', + KeyPeriod = '.', + KeySlash = '/', + Key0 = '0', + Key1 = '1', + Key2 = '2', + Key3 = '3', + Key4 = '4', + Key5 = '5', + Key6 = '6', + Key7 = '7', + Key8 = '8', + Key9 = '9', + KeyColon = ':', + KeySemicolon = ';', + KeyLess = '<', + KeyEquals = '=', + KeyGreater = '>', + KeyQuestion = '?', + KeyAt = '@', /* Skip uppercase letters */ - AE_KEY_LEFTBRACKET = '[', - AE_KEY_BACKSLASH = '\\', - AE_KEY_RIGHTBRACKET = ']', - AE_KEY_CARET = '^', - AE_KEY_UNDERSCORE = '_', - AE_KEY_BACKQUOTE = '`', - AE_KEY_A = 'a', - AE_KEY_B = 'b', - AE_KEY_C = 'c', - AE_KEY_D = 'd', - AE_KEY_E = 'e', - AE_KEY_F = 'f', - AE_KEY_G = 'g', - AE_KEY_H = 'h', - AE_KEY_I = 'i', - AE_KEY_J = 'j', - AE_KEY_K = 'k', - AE_KEY_L = 'l', - AE_KEY_M = 'm', - AE_KEY_N = 'n', - AE_KEY_O = 'o', - AE_KEY_P = 'p', - AE_KEY_Q = 'q', - AE_KEY_R = 'r', - AE_KEY_S = 's', - AE_KEY_T = 't', - AE_KEY_U = 'u', - AE_KEY_V = 'v', - AE_KEY_W = 'w', - AE_KEY_X = 'x', - AE_KEY_Y = 'y', - AE_KEY_Z = 'z', + KeyLeftBracket = '[', + KeyBackSlash = '\\', + KeyRightBracket = ']', + KeyCaret = '^', + KeyUnderscore = '_', + KeyBackquote = '`', + KeyA = 'a', + KeyB = 'b', + KeyC = 'c', + KeyD = 'd', + KeyE = 'e', + KeyF = 'f', + KeyG = 'g', + KeyH = 'h', + KeyI = 'i', + KeyJ = 'j', + KeyK = 'k', + KeyL = 'l', + KeyM = 'm', + KeyN = 'n', + KeyO = 'o', + KeyP = 'p', + KeyQ = 'q', + KeyR = 'r', + KeyS = 's', + KeyT = 't', + KeyU = 'u', + KeyV = 'v', + KeyW = 'w', + KeyX = 'x', + KeyY = 'y', + KeyZ = 'z', - AE_KEY_CAPSLOCK = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK), + KeyCapsLock = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK), - AE_KEY_F1 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1), - AE_KEY_F2 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2), - AE_KEY_F3 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3), - AE_KEY_F4 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4), - AE_KEY_F5 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5), - AE_KEY_F6 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6), - AE_KEY_F7 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7), - AE_KEY_F8 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8), - AE_KEY_F9 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9), - AE_KEY_F10 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10), - AE_KEY_F11 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11), - AE_KEY_F12 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12), + KeyF1 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1), + KeyF2 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2), + KeyF3 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3), + KeyF4 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4), + KeyF5 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5), + KeyF6 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6), + KeyF7 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7), + KeyF8 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8), + KeyF9 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9), + KeyF10 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10), + KeyF11 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11), + KeyF12 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12), - AE_KEY_PRINTSCREEN = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN), - AE_KEY_SCROLLLOCK = SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK), - AE_KEY_PAUSE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE), - AE_KEY_INSERT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT), - AE_KEY_HOME = SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME), - AE_KEY_PAGEUP = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP), - AE_KEY_DELETE = '\177', - AE_KEY_END = SCANCODE_TO_KEYCODE(SDL_SCANCODE_END), - AE_KEY_PAGEDOWN = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN), - AE_KEY_RIGHT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT), - AE_KEY_LEFT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT), - AE_KEY_DOWN = SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN), - AE_KEY_UP = SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP), + KeyPrintScreen = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN), + KeyScrollLock = SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK), + KeyPause = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE), + KeyInsert= SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT), + KeyHome = SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME), + KeyPageUp = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP), + KeyDelete = '\177', + KeyEnd = SCANCODE_TO_KEYCODE(SDL_SCANCODE_END), + KeyPageDown = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN), + KeyRight = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT), + KeyLeft = SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT), + KeyDown = SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN), + KeyUp = SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP), - AE_KEY_NUMLOCKCLEAR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR), - AE_KEY_KEYPAD_DIVIDE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE), - AE_KEY_KEYPAD_MULTIPLY = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY), - AE_KEY_KEYPAD_MINUS = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS), - AE_KEY_KEYPAD_PLUS = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS), - AE_KEY_KEYPAD_ENTER = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER), - AE_KEY_KEYPAD_1 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1), - AE_KEY_KEYPAD_2 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2), - AE_KEY_KEYPAD_3 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3), - AE_KEY_KEYPAD_4 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4), - AE_KEY_KEYPAD_5 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5), - AE_KEY_KEYPAD_6 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6), - AE_KEY_KEYPAD_7 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7), - AE_KEY_KEYPAD_8 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8), - AE_KEY_KEYPAD_9 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9), - AE_KEY_KEYPAD_0 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0), - AE_KEY_KEYPAD_PERIOD = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD), + KeyNumLockClear = SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR), + KeyKeypadDivide = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE), + KeyKeypadMultiply = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY), + KeyKeypadMinus = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS), + KeyKeypadPlus = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS), + KeyKeypadEnter = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER), + KeyKeypad1 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1), + KeyKeypad2 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2), + KeyKeypad3 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3), + KeyKeypad4 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4), + KeyKeypad5 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5), + KeyKeypad6 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6), + KeyKeypad7 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7), + KeyKeypad8 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8), + KeyKeypad9 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9), + KeyKeypad0 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0), + KeyKeypadPeriod = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD), - AE_KEY_APPLICATION = SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION), - AE_KEY_POWER = SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER), - AE_KEY_KEYPAD_EQUALS = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS), - AE_KEY_F13 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13), - AE_KEY_F14 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14), - AE_KEY_F15 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15), - AE_KEY_F16 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16), - AE_KEY_F17 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17), - AE_KEY_F18 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18), - AE_KEY_F19 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19), - AE_KEY_F20 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20), - AE_KEY_F21 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21), - AE_KEY_F22 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22), - AE_KEY_F23 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23), - AE_KEY_F24 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24), - AE_KEY_EXECUTE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE), - AE_KEY_HELP = SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP), - AE_KEY_MENU = SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU), - AE_KEY_SELECT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT), - AE_KEY_STOP = SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP), - AE_KEY_AGAIN = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN), - AE_KEY_UNDO = SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO), - AE_KEY_CUT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT), - AE_KEY_COPY = SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY), - AE_KEY_PASTE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE), - AE_KEY_FIND = SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND), - AE_KEY_MUTE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE), - AE_KEY_VOLUMEUP = SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP), - AE_KEY_VOLUMEDOWN = SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN), - AE_KEY_KEYPAD_COMMA = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA), - AE_KEY_KEYPAD_EQUALSAS400 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400), + KeyApplication = SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION), + KeyPower = SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER), + KeyKeypadEquals = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS), + KeyF13 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13), + KeyF14 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14), + KeyF15 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15), + KeyF16 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16), + KeyF17 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17), + KeyF18 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18), + KeyF19 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19), + KeyF20 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20), + KeyF21 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21), + KeyF22 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22), + KeyF23 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23), + KeyF24 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24), + KeyExecute = SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE), + KeyHelp = SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP), + KeyMenu = SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU), + KeySelect = SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT), + KeyStop = SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP), + KeyAgain = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN), + KeyUndo = SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO), + KeyCut = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT), + KeyCopy = SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY), + KeyPaste = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE), + KeyFind = SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND), + KeyMute = SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE), + KeyVolumeUp = SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP), + KeyVolumeDown = SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN), + KeyKeypadComma = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA), + KeyKeypadEQUALSAS400 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400), - AE_KEY_ALTERASE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE), - AE_KEY_SYSREQ = SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ), - AE_KEY_CANCEL = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL), - AE_KEY_CLEAR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR), - AE_KEY_PRIOR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR), - AE_KEY_RETURN2 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2), - AE_KEY_SEPARATOR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR), - AE_KEY_OUT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT), - AE_KEY_OPER = SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER), - AE_KEY_CLEARAGAIN = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN), - AE_KEY_CRSEL = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL), - AE_KEY_EXSEL = SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL), + KeyAltErase = SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE), + KeySysReq = SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ), + KeyCancel = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL), + KeyClear = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR), + KeyPrior = SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR), + KeyReturn2 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2), + KeySeparator = SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR), + KeyOut = SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT), + KeyOper = SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER), + KeyClearAgain = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN), + KeyCrsel = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL), + KeyExsel = SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL), - AE_KEY_KEYPAD_00 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00), - AE_KEY_KEYPAD_000 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000), - AE_KEY_THOUSANDSSEPARATOR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR), - AE_KEY_DECIMALSEPARATOR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR), - AE_KEY_CURRENCYUNIT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT), - AE_KEY_CURRENCYSUBUNIT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT), - AE_KEY_KEYPAD_LEFTPAREN = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN), - AE_KEY_KEYPAD_RIGHTPAREN = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN), - AE_KEY_KEYPAD_LEFTBRACE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE), - AE_KEY_KEYPAD_RIGHTBRACE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE), - AE_KEY_KEYPAD_TAB = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB), - AE_KEY_KEYPAD_BACKSPACE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE), - AE_KEY_KEYPAD_A = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A), - AE_KEY_KEYPAD_B = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B), - AE_KEY_KEYPAD_C = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C), - AE_KEY_KEYPAD_D = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D), - AE_KEY_KEYPAD_E = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E), - AE_KEY_KEYPAD_F = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F), - AE_KEY_KEYPAD_XOR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR), - AE_KEY_KEYPAD_POWER = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER), - AE_KEY_KEYPAD_PERCENT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT), - AE_KEY_KEYPAD_LESS = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS), - AE_KEY_KEYPAD_GREATER = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER), - AE_KEY_KEYPAD_AMPERSAND = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND), - AE_KEY_KEYPAD_DBLAMPERSAND = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND), - AE_KEY_KEYPAD_VERTICALBAR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR), - AE_KEY_KEYPAD_DBLVERTICALBAR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR), - AE_KEY_KEYPAD_COLON = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON), - AE_KEY_KEYPAD_HASH = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH), - AE_KEY_KEYPAD_SPACE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE), - AE_KEY_KEYPAD_AT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT), - AE_KEY_KEYPAD_EXCLAM = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM), - AE_KEY_KEYPAD_MEMSTORE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE), - AE_KEY_KEYPAD_MEMRECALL = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL), - AE_KEY_KEYPAD_MEMCLEAR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR), - AE_KEY_KEYPAD_MEMADD = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD), - AE_KEY_KEYPAD_MEMSUBTRACT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT), - AE_KEY_KEYPAD_MEMMULTIPLY = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY), - AE_KEY_KEYPAD_MEMDIVIDE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE), - AE_KEY_KEYPAD_PLUSMINUS = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS), - AE_KEY_KEYPAD_CLEAR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR), - AE_KEY_KEYPAD_CLEARENTRY = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY), - AE_KEY_KEYPAD_BINARY = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY), - AE_KEY_KEYPAD_OCTAL = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL), - AE_KEY_KEYPAD_DECIMAL = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL), - AE_KEY_KEYPAD_HEXADECIMAL = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL), + KeyKeypad00 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00), + KeyKeypad000 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000), + KeyThousandsSeparator = SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR), + KeyDecimalSeparator = SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR), + KeyCurrencyUnit = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT), + KeyCurrencySubUnit = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT), + KeyKeypadLeftParen = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN), + KeyKeypadRightParen = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN), + KeyKeypadLeftBrace = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE), + KeyKeypadRightBrace = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE), + KeyKeypadTab = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB), + KeyKeypadBackspace = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE), + KeyKeypadA = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A), + KeyKeypadB = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B), + KeyKeypadC = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C), + KeyKeypadD = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D), + KeyKeypadE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E), + KeyKeypadF = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F), + KeyKeypadXor = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR), + KeyKeypadPower = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER), + KeyKeypadPercent = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT), + KeyKeypadLess = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS), + KeyKeypadGreater = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER), + KeyKeypadAMPERSAND = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND), + KeyKeypadDBLAMPERSAND = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND), + KeyKeypadVERTICALBAR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR), + KeyKeypadDBLVERTICALBAR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR), + KeyKeypadColon = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON), + KeyKeypadHash = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH), + KeyKeypadSpace = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE), + KeyKeypadAt = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT), + KeyKeypadExclam = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM), + KeyKeypadMemStore = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE), + KeyKeypadMemRecall = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL), + KeyKeypadMemClear = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR), + KeyKeypadMemAdd = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD), + KeyKeypadMemSubstract = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT), + KeyKeypadMemMultiply = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY), + KeyKeypadMemDivide = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE), + KeyKeypadPlusMinus = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS), + KeyKeypadClear = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR), + KeyKeypadClearEntry = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY), + KeyKeypadBinary = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY), + KeyKeypadOctal = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL), + KeyKeypadDecimal = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL), + KeyKeypadHexadecimal = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL), - AE_KEY_LCTRL = SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL), - AE_KEY_LSHIFT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT), - AE_KEY_LALT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT), - AE_KEY_LGUI = SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI), - AE_KEY_RCTRL = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL), - AE_KEY_RSHIFT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT), - AE_KEY_RALT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT), - AE_KEY_RGUI = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI), + KeyLeftControl = SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL), + KeyLeftShift = SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT), + KeyLeftAlt = SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT), + KeyLeftGui = SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI), + KeyRightControl = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL), + KeyRightShift = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT), + KeyRightAlt = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT), + KeyRightGui = SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI), - AE_KEY_MODE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE), + KeyMode = SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE), - AE_KEY_AUDIONEXT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT), - AE_KEY_AUDIOPREV = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV), - AE_KEY_AUDIOSTOP = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP), - AE_KEY_AUDIOPLAY = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY), - AE_KEY_AUDIOMUTE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE), - AE_KEY_MEDIASELECT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT), - AE_KEY_WWW = SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW), - AE_KEY_MAIL = SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL), - AE_KEY_CALCULATOR = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR), - AE_KEY_COMPUTER = SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER), - AE_KEY_AC_SEARCH = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH), - AE_KEY_AC_HOME = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME), - AE_KEY_AC_BACK = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK), - AE_KEY_AC_FORWARD = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD), - AE_KEY_AC_STOP = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP), - AE_KEY_AC_REFRESH = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH), - AE_KEY_AC_BOOKMARKS = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS), + KeyAudioNext = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT), + KeyAudioPrev = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV), + KeyAudioStop = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP), + KeyAudioPlay = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY), + KeyAudioMute = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE), + KeyMediaSelect = SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT), + KeyWWW = SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW), + KeyMail = SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL), + KeyCalculator = SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR), + KeyComputer = SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER), + KeyAppControlSearch = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH), + KeyAppControlHhome = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME), + KeyAppControlBack = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK), + KeyAppControlForward = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD), + KeyAppControlStop = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP), + KeyAppControlRefresh = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH), + KeyAppControlBookmarks = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS), - AE_KEY_BRIGHTNESSDOWN = SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN), - AE_KEY_BRIGHTNESSUP = SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP), - AE_KEY_DISPLAYSWITCH = SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH), - AE_KEY_KBDILLUMTOGGLE = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE), - AE_KEY_KBDILLUMDOWN = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN), - AE_KEY_KBDILLUMUP = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP), - AE_KEY_EJECT = SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT), - AE_KEY_SLEEP = SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP), - AE_KEY_APP1 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_APP1), - AE_KEY_APP2 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_APP2), + KeyBrightnessDown = SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN), + KeyBrightnesUp = SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP), + KeyDisplaySwitch = SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH), + KeyKeyboardIllumToggle = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE), + KeyKeyboardIllumDown = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN), + KeyKeyboardIllumUp = SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP), + KeyEject = SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT), + KeySleep = SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP), + KeyApp1 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_APP1), + KeyApp2 = SCANCODE_TO_KEYCODE(SDL_SCANCODE_APP2), - AE_KEY_AUDIOREWIND = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOREWIND), - AE_KEY_AUDIOFASTFORWARD = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOFASTFORWARD) + KeyAudioRewind = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOREWIND), + KeyAudioFastForward = SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOFASTFORWARD) }; \ No newline at end of file diff --git a/src/engine/graphics/CommandList.cpp b/src/engine/graphics/CommandList.cpp index b078d9485..0543713b2 100644 --- a/src/engine/graphics/CommandList.cpp +++ b/src/engine/graphics/CommandList.cpp @@ -2,13 +2,14 @@ #include "GraphicsDevice.h" #include +#include namespace Atlas { namespace Graphics { CommandList::CommandList(GraphicsDevice* device, QueueType queueType, uint32_t queueFamilyIndex, - const std::vector& queues, bool frameIndependent) : memoryManager(device->memoryManager), + std::vector>& queues, bool frameIndependent) : memoryManager(device->memoryManager), device(device->device), frameIndependent(frameIndependent), queueType(queueType), queueFamilyIndex(queueFamilyIndex) { VkCommandPoolCreateInfo poolCreateInfo = Initializers::InitCommandPoolCreateInfo(queueFamilyIndex); @@ -20,13 +21,17 @@ namespace Atlas { VkFenceCreateInfo fenceInfo = Initializers::InitFenceCreateInfo(); VK_CHECK(vkCreateFence(device->device, &fenceInfo, nullptr, &fence)) - for (auto queue : queues) { + auto threadId = std::this_thread::get_id(); + + for (auto& queue : queues) { Semaphore semaphore{ - .queue = queue + .queue = queue->queue }; + QueueRef ref(queue, threadId, true); VkSemaphoreCreateInfo semaphoreInfo = Initializers::InitSemaphoreCreateInfo(); - VK_CHECK(vkCreateSemaphore(device->device, &semaphoreInfo, nullptr, &semaphore.semaphore)) + VK_CHECK(vkCreateSemaphore(device->device, &semaphoreInfo, nullptr, &semaphore.semaphore)); + ref.Unlock(); semaphores.push_back(semaphore); } @@ -106,14 +111,14 @@ namespace Atlas { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, 0, 0, nullptr, 0, nullptr, 1, &barrier); swapChain->imageLayouts[imageIdx] = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; } - if (swapChain->depthImageLayout == VK_IMAGE_LAYOUT_UNDEFINED) { - auto barrier = Initializers::InitImageMemoryBarrier(swapChain->depthImageAllocation.image, + if (swapChain->depthImageLayouts[imageIdx] == VK_IMAGE_LAYOUT_UNDEFINED) { + auto barrier = Initializers::InitImageMemoryBarrier(swapChain->depthImageAllocations[imageIdx].image, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, VK_ACCESS_MEMORY_READ_BIT, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, VK_IMAGE_ASPECT_DEPTH_BIT); vkCmdPipelineBarrier(commandBuffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT, 0, 0, nullptr, 0, nullptr, 1, &barrier); - swapChain->depthImageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + swapChain->depthImageLayouts[imageIdx] = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; } vkCmdBeginRenderPass(commandBuffer, &rpInfo, VK_SUBPASS_CONTENTS_INLINE); @@ -206,15 +211,15 @@ namespace Atlas { } if (renderPassInUse) { for (uint32_t i = 0; i < MAX_COLOR_ATTACHMENTS; i++) { - auto& rpAttachment = renderPassInUse->colorAttachments[i]; - auto& fbAttachment = frameBufferInUse->colorAttachments[i]; + const auto& rpAttachment = renderPassInUse->colorAttachments[i]; + const auto& fbAttachment = frameBufferInUse->colorAttachments[i]; if (!fbAttachment.isValid) continue; fbAttachment.image->layout = rpAttachment.outputLayout; fbAttachment.image->accessMask = VK_ACCESS_SHADER_READ_BIT; } if (frameBufferInUse->depthAttachment.isValid) { - auto& rpAttachment = renderPassInUse->depthAttachment; - auto& fbAttachment = frameBufferInUse->depthAttachment; + const auto& rpAttachment = renderPassInUse->depthAttachment; + const auto& fbAttachment = frameBufferInUse->depthAttachment; fbAttachment.image->layout = rpAttachment.outputLayout; fbAttachment.image->accessMask = VK_ACCESS_SHADER_READ_BIT; } @@ -392,7 +397,7 @@ namespace Atlas { } - void CommandList::PushConstants(const std::string& pushConstantRangeName, void *data) { + void CommandList::PushConstants(const std::string& pushConstantRangeName, void *data, uint32_t size) { AE_ASSERT(pipelineInUse && "No pipeline is bound"); if (!pipelineInUse) return; @@ -400,8 +405,9 @@ namespace Atlas { auto pushConstantRange = pipelineInUse->shader->GetPushConstantRange(pushConstantRangeName); if (!pushConstantRange) return; + size = size != 0 ? size : pushConstantRange->range.size; vkCmdPushConstants(commandBuffer, pipelineInUse->layout, pushConstantRange->range.stageFlags, - pushConstantRange->range.offset, pushConstantRange->range.size, data); + pushConstantRange->range.offset, size, data); } @@ -432,16 +438,20 @@ namespace Atlas { AE_ASSERT(pipelineInUse && "No pipeline is bound"); if (!pipelineInUse) return; - std::vector offsets; - std::vector bindBuffers; - for (const auto& buffer : buffers) { + AE_ASSERT(buffers.size() < MAX_VERTEX_BUFFER_BINDINGS); + + VkDeviceSize offset[MAX_VERTEX_BUFFER_BINDINGS]; + VkBuffer bindBuffers[MAX_VERTEX_BUFFER_BINDINGS]; + + for (size_t i = 0; i < buffers.size(); i++) { + const auto& buffer = buffers[i]; if (!buffer->buffer) return; AE_ASSERT(buffer->size > 0 && "Invalid buffer size"); - bindBuffers.push_back(buffer->buffer); - offsets.push_back(0); + bindBuffers[i] = buffer->buffer; + offset[i] = 0; } - vkCmdBindVertexBuffers(commandBuffer, bindingOffset, bindingCount, bindBuffers.data(), offsets.data()); + vkCmdBindVertexBuffers(commandBuffer, bindingOffset, bindingCount, bindBuffers, offset); } @@ -580,7 +590,7 @@ namespace Atlas { if (!images.size()) return; std::vector imagesPtr; - for (auto& image : images) imagesPtr.push_back(image.get()); + for (const auto& image : images) imagesPtr.push_back(image.get()); descriptorBindingData.ResetBinding(set, binding); @@ -1281,7 +1291,7 @@ namespace Atlas { const VkSemaphore CommandList::GetSemaphore(VkQueue queue) { - for (auto& semaphore : semaphores) { + for (const auto& semaphore : semaphores) { if (semaphore.queue == queue) return semaphore.semaphore; } @@ -1332,4 +1342,4 @@ namespace Atlas { } -} \ No newline at end of file +} diff --git a/src/engine/graphics/CommandList.h b/src/engine/graphics/CommandList.h index 06d09fe3c..131a032b1 100644 --- a/src/engine/graphics/CommandList.h +++ b/src/engine/graphics/CommandList.h @@ -36,7 +36,7 @@ namespace Atlas { public: CommandList(GraphicsDevice* device, QueueType queueType, uint32_t queueFamilyIndex, - const std::vector& queues, bool frameIndependent = false); + std::vector>& queues, bool frameIndependent = false); CommandList(const CommandList& that) = delete; @@ -77,7 +77,7 @@ namespace Atlas { void ClearAttachments(); - void PushConstants(const std::string& pushConstantRangeName, void* data); + void PushConstants(const std::string& pushConstantRangeName, void* data, uint32_t size = 0); void BindIndexBuffer(const Ref& buffer, VkIndexType type); @@ -306,4 +306,4 @@ namespace Atlas { } -} \ No newline at end of file +} diff --git a/src/engine/graphics/Common.h b/src/engine/graphics/Common.h index 91654528c..8c2610060 100644 --- a/src/engine/graphics/Common.h +++ b/src/engine/graphics/Common.h @@ -14,6 +14,7 @@ #define DESCRIPTOR_SET_COUNT 4 #define BINDINGS_PER_DESCRIPTOR_SET 32 #define MAX_COLOR_ATTACHMENTS 8 +#define MAX_VERTEX_BUFFER_BINDINGS 16 #define VK_CHECK(x) { \ VkResult err = x; \ diff --git a/src/engine/graphics/GraphicsDevice.cpp b/src/engine/graphics/GraphicsDevice.cpp index 35372d103..c20dbd353 100644 --- a/src/engine/graphics/GraphicsDevice.cpp +++ b/src/engine/graphics/GraphicsDevice.cpp @@ -191,7 +191,7 @@ namespace Atlas { windowWidth, windowHeight, preferredColorSpace, presentMode, VK_NULL_HANDLE); // Acquire first index since normally these are acquired at completion of frame - auto frame = GetFrameData(); + auto frame = GetFrameData(frameIndex); VkSemaphoreCreateInfo semaphoreInfo = Initializers::InitSemaphoreCreateInfo(); vkDestroySemaphore(device, frame->semaphore, nullptr); @@ -369,7 +369,7 @@ namespace Atlas { return commandList; } else { - auto currentFrameData = GetFrameData(); + auto currentFrameData = GetFrameData(frameIndex); auto commandList = GetOrCreateCommandList(queueType, currentFrameData->commandListsMutex, currentFrameData->commandLists, false); @@ -390,7 +390,9 @@ namespace Atlas { AE_ASSERT(swapChain->isComplete && "Swap chain should be complete." && " The swap chain might have an invalid size due to a window resize"); - auto frame = GetFrameData(); + AE_ASSERT(!cmd->isSubmitted && "Command list was probably submitted before"); + + auto frame = GetFrameData(frameIndex); cmd->executionOrder = order; @@ -410,6 +412,8 @@ namespace Atlas { void GraphicsDevice::FlushCommandList(CommandList *cmd) { + std::shared_lock lock(queueMutex); + AE_ASSERT(cmd->frameIndependent && "Flushed command list is not frame independent." && "Please use the submit method instead"); @@ -437,11 +441,38 @@ namespace Atlas { } + bool GraphicsDevice::IsPreviousFrameComplete() { + + return frameComplete; + + } + + void GraphicsDevice::WaitForPreviousFrameCompletion() { + + if (completeFrameFuture.valid()) + completeFrameFuture.get(); + + } + + void GraphicsDevice::CompleteFrameAsync() { + + frameComplete = false; + + if (completeFrameFuture.valid()) + completeFrameFuture.get(); + + // Recreate a swapchain on with MoltenVK seems to not work (just never returns) + // Refrain from using complete frame async for now + completeFrameFuture = std::async(std::launch::async, + [this] () { CompleteFrame(); }); + + } + void GraphicsDevice::CompleteFrame() { bool recreateSwapChain = false; - auto frame = GetFrameData(); + auto frame = GetFrameData(frameIndex); bool wasSwapChainAccessed = false; for (auto commandList : frame->submittedCommandLists) { @@ -459,7 +490,7 @@ namespace Atlas { } // Lock mutex such that submissions can't happen anymore - std::lock_guard lock(frame->submissionMutex); + std::lock_guard frameSubmissionLock(frame->submissionMutex); bool allListSubmitted = true; for (auto commandList : frame->commandLists) { @@ -469,39 +500,51 @@ namespace Atlas { AE_ASSERT(allListSubmitted && "Not all command list were submitted before frame completion." && "Consider using a frame independent command lists for longer executions."); - auto presenterQueue = SubmitAllCommandLists(); + // Wait, reset and start with new semaphores + auto nextFrame = GetFrameData(frameIndex + 1); + nextFrame->WaitAndReset(device); - if (swapChain->isComplete && frame->submittedCommandLists.size()) { + { + // Lock the queue in shared mode such that flush can happen simultaneously, but waiting for idle is not possible + // Not locking has caused some trouble, with WaitForIdle seeming to access queues if not guarded properly + std::shared_lock queueLock(queueMutex); + auto presenterQueue = SubmitAllCommandLists(); + + if (swapChain->isComplete && frame->submittedCommandLists.size()) { + + std::vector semaphores; + // For now, we will only use sequential execution of queue submits, + // which means only the latest submit can signal its semaphore here + //for (auto cmd : frameData->submittedCommandLists) + // semaphores.push_back(cmd->semaphore); + if (frame->submittedCommandLists.size()) { + semaphores.push_back(frame->submittedCommandLists.back()->GetSemaphore(presenterQueue.queue)); + } + else { + semaphores.push_back(frame->semaphore); + } - std::vector semaphores; - // For now, we will only use sequential execution of queue submits, - // which means only the latest submit can signal its semaphore here - //for (auto cmd : frameData->submittedCommandLists) - // semaphores.push_back(cmd->semaphore); - if (frame->submittedCommandLists.size()) { - semaphores.push_back(frame->submittedCommandLists.back()->GetSemaphore(presenterQueue.queue)); - } - else { - semaphores.push_back(frame->semaphore); - } + // Since there needs to be at least one semaphore, we can use it like this + frame->submitSemaphore = semaphores.back(); - VkPresentInfoKHR presentInfo = {}; - presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; - presentInfo.pNext = nullptr; - presentInfo.pSwapchains = &swapChain->swapChain; - presentInfo.swapchainCount = 1; - presentInfo.pWaitSemaphores = semaphores.data(); - presentInfo.waitSemaphoreCount = uint32_t(semaphores.size()); - presentInfo.pImageIndices = &swapChain->aquiredImageIndex; + VkPresentInfoKHR presentInfo = {}; + presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; + presentInfo.pNext = nullptr; + presentInfo.pSwapchains = &swapChain->swapChain; + presentInfo.swapchainCount = 1; + presentInfo.pWaitSemaphores = semaphores.data(); + presentInfo.waitSemaphoreCount = uint32_t(semaphores.size()); + presentInfo.pImageIndices = &swapChain->aquiredImageIndex; - auto result = vkQueuePresentKHR(presenterQueue.queue, &presentInfo); - presenterQueue.Unlock(); + auto result = vkQueuePresentKHR(presenterQueue.queue, &presentInfo); + presenterQueue.Unlock(); - if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR) { - recreateSwapChain = true; - } - else { - VK_CHECK(result) + if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR) { + recreateSwapChain = true; + } + else { + VK_CHECK(result) + } } } @@ -522,10 +565,6 @@ namespace Atlas { } } - // Wait, reset and start with new semaphores - auto nextFrame = GetFrameData(); - nextFrame->WaitAndReset(device); - if (swapChain->AcquireImageIndex(nextFrame->semaphore)) { recreateSwapChain = true; } @@ -534,6 +573,9 @@ namespace Atlas { // A new image index is automatically acquired CreateSwapChain(swapChain->presentMode, swapChain->colorSpace); } + + frameComplete = true; + } bool GraphicsDevice::CheckFormatSupport(VkFormat format, VkFormatFeatureFlags featureFlags) { @@ -550,7 +592,11 @@ namespace Atlas { } - void GraphicsDevice::WaitForIdle() const { + void GraphicsDevice::WaitForIdle() { + + WaitForPreviousFrameCompletion(); + + std::unique_lock lock(queueMutex); vkDeviceWaitIdle(device); @@ -567,12 +613,15 @@ namespace Atlas { QueueRef GraphicsDevice::SubmitAllCommandLists() { - auto frame = GetFrameData(); + auto frame = GetFrameData(frameIndex); + auto previousFrame = frameIndex != 0 ? GetFrameData(frameIndex - 1) : nullptr; // Assume all submission are in order QueueRef nextQueue; QueueRef queue; VkSemaphore previousSemaphore = frame->semaphore; + VkSemaphore previousFrameSemaphore = previousFrame != nullptr ? + previousFrame->submitSemaphore : VK_NULL_HANDLE; for (size_t i = 0; i < frame->submissions.size(); i++) { auto submission = &frame->submissions[i]; auto nextSubmission = i + 1 < frame->submissions.size() ? &frame->submissions[i + 1] : nullptr; @@ -592,7 +641,7 @@ namespace Atlas { nextQueue = FindAndLockQueue(QueueType::PresentationQueue); } - SubmitCommandList(submission, previousSemaphore, queue, nextQueue); + SubmitCommandList(submission, previousSemaphore, previousFrameSemaphore, queue, nextQueue); previousSemaphore = submission->cmd->GetSemaphore(nextQueue.queue); if (nextQueue.ref != queue.ref) { @@ -600,6 +649,8 @@ namespace Atlas { } queue = nextQueue; + // Only use this once + previousFrameSemaphore = VK_NULL_HANDLE; } // Make sure to return the presentation queue @@ -611,7 +662,7 @@ namespace Atlas { } void GraphicsDevice::SubmitCommandList(CommandListSubmission* submission, VkSemaphore previousSemaphore, - const QueueRef& queue, const QueueRef& nextQueue) { + VkSemaphore previousFrameSemaphore, const QueueRef& queue, const QueueRef& nextQueue) { // After the submission of a command list, we don't unlock it anymore // for further use in this frame. Instead, we will unlock it again @@ -625,6 +676,8 @@ namespace Atlas { // Leave out any dependencies if the swap chain isn't complete if (swapChain->isComplete) { waitSemaphores = { previousSemaphore }; + //if (previousFrameSemaphore != VK_NULL_HANDLE) + // waitSemaphores.push_back(previousFrameSemaphore); } VkSubmitInfo submit = {}; @@ -1074,9 +1127,9 @@ namespace Atlas { } - FrameData *GraphicsDevice::GetFrameData() { + FrameData *GraphicsDevice::GetFrameData(int32_t frameIdx) { - return &frameData[frameIndex % FRAME_DATA_COUNT]; + return &frameData[frameIdx % FRAME_DATA_COUNT]; } @@ -1122,10 +1175,10 @@ namespace Atlas { if (it == cmdLists.end()) { auto queueFamilyIndex = queueFamilyIndices.queueFamilies[queueType]; - std::vector queues; + std::vector> queues; for (auto& queueFamily : queueFamilyIndices.families) { for (auto& queue : queueFamily.queues) { - queues.push_back(queue->queue); + queues.push_back(queue); } } diff --git a/src/engine/graphics/GraphicsDevice.h b/src/engine/graphics/GraphicsDevice.h index f142f7964..ec9b29b0e 100644 --- a/src/engine/graphics/GraphicsDevice.h +++ b/src/engine/graphics/GraphicsDevice.h @@ -24,6 +24,8 @@ #include #include #include +#include +#include namespace Atlas { @@ -51,6 +53,7 @@ namespace Atlas { public: VkSemaphore semaphore = VK_NULL_HANDLE; VkFence fence = VK_NULL_HANDLE; + VkSemaphore submitSemaphore = VK_NULL_HANDLE; std::mutex commandListsMutex; std::vector commandLists; @@ -139,13 +142,19 @@ namespace Atlas { void FlushCommandList(CommandList* cmd); + bool IsPreviousFrameComplete(); + + void WaitForPreviousFrameCompletion(); + + void CompleteFrameAsync(); + void CompleteFrame(); bool CheckFormatSupport(VkFormat format, VkFormatFeatureFlags featureFlags); QueueRef GetAndLockQueue(QueueType queueType); - void WaitForIdle() const; + void WaitForIdle(); void ForceMemoryCleanup(); @@ -226,7 +235,7 @@ namespace Atlas { QueueRef SubmitAllCommandLists(); void SubmitCommandList(CommandListSubmission* submission, VkSemaphore previousSemaphore, - const QueueRef& queue, const QueueRef& nextQueue); + VkSemaphore previousFrameSemaphore, const QueueRef& queue, const QueueRef& nextQueue); bool SelectPhysicalDevice(VkInstance instance, VkSurfaceKHR surface, const std::vector& requiredExtensions, std::vector& optionalExtensions); @@ -257,7 +266,7 @@ namespace Atlas { void DestroyFrameData(); - FrameData* GetFrameData(); + FrameData* GetFrameData(int32_t frameIdx); void DestroyUnusedGraphicObjects(); @@ -295,6 +304,11 @@ namespace Atlas { int32_t windowWidth = 0; int32_t windowHeight = 0; + std::shared_mutex queueMutex; + + std::atomic_bool frameComplete = true; + std::future completeFrameFuture; + }; } diff --git a/src/engine/graphics/Image.cpp b/src/engine/graphics/Image.cpp index 2cf7ca525..7fa06117c 100644 --- a/src/engine/graphics/Image.cpp +++ b/src/engine/graphics/Image.cpp @@ -143,4 +143,4 @@ namespace Atlas { } -} \ No newline at end of file +} diff --git a/src/engine/graphics/MemoryTransferManager.cpp b/src/engine/graphics/MemoryTransferManager.cpp index 5ed7d3653..0091c59ab 100644 --- a/src/engine/graphics/MemoryTransferManager.cpp +++ b/src/engine/graphics/MemoryTransferManager.cpp @@ -90,7 +90,7 @@ namespace Atlas { imageBarrier.srcAccessMask = 0; imageBarrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - vkCmdPipelineBarrier(commandList->commandBuffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, + vkCmdPipelineBarrier(commandList->commandBuffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, &imageBarrier); } @@ -174,7 +174,7 @@ namespace Atlas { imageBarrier.srcAccessMask = 0; imageBarrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - vkCmdPipelineBarrier(commandList->commandBuffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, + vkCmdPipelineBarrier(commandList->commandBuffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, &imageBarrier); } diff --git a/src/engine/graphics/Profiler.cpp b/src/engine/graphics/Profiler.cpp index d1e823a12..6f6b16673 100644 --- a/src/engine/graphics/Profiler.cpp +++ b/src/engine/graphics/Profiler.cpp @@ -19,7 +19,7 @@ namespace Atlas { bool Profiler::supportsDebugMarkers = false; -#ifndef AE_OS_MACOS +#if !defined(AE_OS_MACOS) && !defined(AE_BUILDTYPE_RELEASE) std::atomic_bool Profiler::enable = true; #else std::atomic_bool Profiler::enable = false; diff --git a/src/engine/graphics/Queue.cpp b/src/engine/graphics/Queue.cpp new file mode 100644 index 000000000..93964acc3 --- /dev/null +++ b/src/engine/graphics/Queue.cpp @@ -0,0 +1,60 @@ +#include "Queue.h" + +namespace Atlas::Graphics { + + bool Queue::IsTypeSupported(QueueType queueType) const { + switch (queueType) { + case GraphicsQueue: return supportsGraphics; + case PresentationQueue: return supportsPresentation; + case TransferQueue: return supportsTransfer; + default: return false; + } + } + + QueueRef::~QueueRef() { + + + + } + + QueueRef::QueueRef(Ref& queue, std::thread::id threadId, bool forceLock) : ref(queue) { + this->queue = ref->queue; + this->familyIndex = ref->familyIndex; + + if (threadId == queue->threadId && queue->counter > 0) { + this->counter = queue->counter; + valid = true; + return; + } + + if (forceLock) { + queue->mutex.lock(); + queue->threadId = threadId; + this->counter = queue->counter; + valid = true; + } + else { + if (queue->mutex.try_lock()) { + queue->threadId = threadId; + this->counter = queue->counter; + valid = true; + } + } + } + + void QueueRef::Unlock() { + + // Don't unlock the same queue twice, could cause issues + if (!valid) + return; + + if (counter.use_count() == 2) { + counter.reset(); + ref->threadId = std::thread::id(); + ref->mutex.unlock(); + } + valid = false; + + } + +} \ No newline at end of file diff --git a/src/engine/graphics/Queue.h b/src/engine/graphics/Queue.h index 205fa8d28..fa67156bd 100644 --- a/src/engine/graphics/Queue.h +++ b/src/engine/graphics/Queue.h @@ -15,18 +15,12 @@ namespace Atlas { }; class GraphicsDevice; + class CommandList; class Queue { public: - bool IsTypeSupported(QueueType queueType) const { - switch (queueType) { - case GraphicsQueue: return supportsGraphics; - case PresentationQueue: return supportsPresentation; - case TransferQueue: return supportsTransfer; - default: return false; - } - } + bool IsTypeSupported(QueueType queueType) const; VkQueue queue; @@ -51,22 +45,14 @@ namespace Atlas { class QueueRef { friend class GraphicsDevice; + friend class CommandList; public: QueueRef() = default; - ~QueueRef() { - Unlock(); - } + ~QueueRef(); - void Unlock() { - if (counter.use_count() == 2) { - counter.reset(); - ref->threadId = std::thread::id(); - ref->mutex.unlock(); - } - valid = false; - } + void Unlock(); VkQueue queue; uint32_t familyIndex; @@ -77,30 +63,7 @@ namespace Atlas { Ref counter; - QueueRef(Ref& queue, std::thread::id threadId, bool forceLock) : ref(queue) { - this->queue = ref->queue; - this->familyIndex = ref->familyIndex; - - if (threadId == queue->threadId && queue->counter > 0) { - this->counter = queue->counter; - valid = true; - return; - } - - if (forceLock) { - queue->mutex.lock(); - queue->threadId = threadId; - this->counter = queue->counter; - valid = true; - } - else { - if (queue->mutex.try_lock()) { - queue->threadId = threadId; - this->counter = queue->counter; - valid = true; - } - } - } + QueueRef(Ref& queue, std::thread::id threadId, bool forceLock); }; diff --git a/src/engine/graphics/SwapChain.cpp b/src/engine/graphics/SwapChain.cpp index 90565b78b..2e6d9f8ad 100644 --- a/src/engine/graphics/SwapChain.cpp +++ b/src/engine/graphics/SwapChain.cpp @@ -85,13 +85,6 @@ namespace Atlas { allocationCreateInfo.usage = VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE; allocationCreateInfo.requiredFlags = VkMemoryPropertyFlags(VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); - vmaCreateImage(device->memoryManager->allocator, &imageCreateInfo, &allocationCreateInfo, - &depthImageAllocation.image, &depthImageAllocation.allocation, nullptr); - - VkImageViewCreateInfo depthImageViewCreateInfo = Initializers::InitImageViewCreateInfo(depthFormat, - depthImageAllocation.image, VK_IMAGE_ASPECT_DEPTH_BIT); - VK_CHECK(vkCreateImageView(device->device, &depthImageViewCreateInfo, nullptr, &depthImageView)); - VkAttachmentDescription2 colorAttachmentDescription = Initializers::InitAttachmentDescription( surfaceFormat.format, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, VK_ATTACHMENT_LOAD_OP_LOAD); @@ -142,6 +135,10 @@ namespace Atlas { imageLayouts.resize(imageCount); imageViews.resize(imageCount); frameBuffers.resize(imageCount); + + depthImageAllocations.resize(imageCount); + depthImageViews.resize(imageCount); + depthImageLayouts.resize(imageCount); for(size_t i = 0; i < images.size(); i++) { VkImageViewCreateInfo imageViewCreateInfo{}; imageViewCreateInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; @@ -160,8 +157,15 @@ namespace Atlas { VK_CHECK(vkCreateImageView(device->device, &imageViewCreateInfo, nullptr, &imageViews[i])) + vmaCreateImage(device->memoryManager->allocator, &imageCreateInfo, &allocationCreateInfo, + &depthImageAllocations[i].image, &depthImageAllocations[i].allocation, nullptr); + + VkImageViewCreateInfo depthImageViewCreateInfo = Initializers::InitImageViewCreateInfo(depthFormat, + depthImageAllocations[i].image, VK_IMAGE_ASPECT_DEPTH_BIT); + VK_CHECK(vkCreateImageView(device->device, &depthImageViewCreateInfo, nullptr, &depthImageViews[i])); + // We can use a single depth texture for all frame buffers - VkImageView attachments[] = { imageViews[i], depthImageView }; + VkImageView attachments[] = { imageViews[i], depthImageViews[i] }; VkFramebufferCreateInfo frameBufferInfo = {}; frameBufferInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; frameBufferInfo.renderPass = renderPass; @@ -173,10 +177,9 @@ namespace Atlas { VK_CHECK(vkCreateFramebuffer(device->device, &frameBufferInfo, nullptr, &frameBuffers[i])); imageLayouts[i] = VK_IMAGE_LAYOUT_UNDEFINED; + depthImageLayouts[i] = VK_IMAGE_LAYOUT_UNDEFINED; } - depthImageLayout = VK_IMAGE_LAYOUT_UNDEFINED; - isComplete = true; } @@ -193,9 +196,14 @@ namespace Atlas { vkDestroyImageView(device->device, imageView, nullptr); } - vkDestroyImageView(device->device, depthImageView, nullptr); - vmaDestroyImage(device->memoryManager->allocator, - depthImageAllocation.image, depthImageAllocation.allocation); + for (auto& depthImageView : depthImageViews) { + vkDestroyImageView(device->device, depthImageView, nullptr); + } + + for (auto& depthImageAllocation : depthImageAllocations) { + vmaDestroyImage(device->memoryManager->allocator, + depthImageAllocation.image, depthImageAllocation.allocation); + } vkDestroyRenderPass(device->device, renderPass, nullptr); vkDestroySwapchainKHR(device->device, swapChain, nullptr); diff --git a/src/engine/graphics/SwapChain.h b/src/engine/graphics/SwapChain.h index 9f6176b70..02cf2cfdb 100644 --- a/src/engine/graphics/SwapChain.h +++ b/src/engine/graphics/SwapChain.h @@ -68,9 +68,9 @@ namespace Atlas { std::vector imageViews; std::vector frameBuffers; - ImageAllocation depthImageAllocation; - VkImageLayout depthImageLayout; - VkImageView depthImageView; + std::vector depthImageAllocations; + std::vector depthImageLayouts; + std::vector depthImageViews; VkRenderPass renderPass; diff --git a/src/engine/graphics/TLAS.cpp b/src/engine/graphics/TLAS.cpp index aca292aed..3ff676609 100644 --- a/src/engine/graphics/TLAS.cpp +++ b/src/engine/graphics/TLAS.cpp @@ -26,7 +26,10 @@ namespace Atlas { TLAS::~TLAS() { - vkDestroyAccelerationStructureKHR(device->device, accelerationStructure, nullptr); + AE_ASSERT(isComplete); + + if (isComplete) + vkDestroyAccelerationStructureKHR(device->device, accelerationStructure, nullptr); } @@ -69,7 +72,9 @@ namespace Atlas { createInfo.size = sizesInfo.accelerationStructureSize; createInfo.buffer = buffer->buffer; - VK_CHECK(vkCreateAccelerationStructureKHR(device->device, &createInfo, nullptr, &accelerationStructure)) + VK_CHECK(vkCreateAccelerationStructureKHR(device->device, &createInfo, nullptr, &accelerationStructure)); + + isComplete = true; } diff --git a/src/engine/graphics/TLAS.h b/src/engine/graphics/TLAS.h index 1411ebc35..35e4a13a4 100644 --- a/src/engine/graphics/TLAS.h +++ b/src/engine/graphics/TLAS.h @@ -30,6 +30,8 @@ namespace Atlas { Ref buffer; VkAccelerationStructureKHR accelerationStructure; + bool isComplete = false; + private: GraphicsDevice* device; diff --git a/src/engine/input/Keyboard.cpp b/src/engine/input/Keyboard.cpp index 6c851244b..6bf12ac72 100644 --- a/src/engine/input/Keyboard.cpp +++ b/src/engine/input/Keyboard.cpp @@ -97,77 +97,77 @@ namespace Atlas { void KeyboardHandler::KeyboardEventHandler(Events::KeyboardEvent event) { - if (event.keyCode == AE_KEY_W && event.state == AE_BUTTON_PRESSED && !event.repeat) { + if (event.keyCode == Keycode::KeyW && event.state == AE_BUTTON_PRESSED && !event.repeat) { movement.x += 1.0f; } - if (event.keyCode == AE_KEY_W && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyW && event.state == AE_BUTTON_RELEASED) { movement.x -= 1.0f; } - if (event.keyCode == AE_KEY_S && event.state == AE_BUTTON_PRESSED && !event.repeat) { + if (event.keyCode == Keycode::KeyS && event.state == AE_BUTTON_PRESSED && !event.repeat) { movement.x -= 1.0f; } - if (event.keyCode == AE_KEY_S && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyS && event.state == AE_BUTTON_RELEASED) { movement.x += 1.0f; } - if (event.keyCode == AE_KEY_D && event.state == AE_BUTTON_PRESSED && !event.repeat) { + if (event.keyCode == Keycode::KeyD && event.state == AE_BUTTON_PRESSED && !event.repeat) { movement.y += 1.0f; } - if (event.keyCode == AE_KEY_D && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyD && event.state == AE_BUTTON_RELEASED) { movement.y -= 1.0f; } - if (event.keyCode == AE_KEY_A && event.state == AE_BUTTON_PRESSED && !event.repeat) { + if (event.keyCode == Keycode::KeyA && event.state == AE_BUTTON_PRESSED && !event.repeat) { movement.y -= 1.0f; } - if (event.keyCode == AE_KEY_A && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyA && event.state == AE_BUTTON_RELEASED) { movement.y += 1.0f; } - if (event.keyCode == AE_KEY_E && event.state == AE_BUTTON_PRESSED && !event.repeat) { + if (event.keyCode == Keycode::KeyE && event.state == AE_BUTTON_PRESSED && !event.repeat) { movement.z += 1.0f; } - if (event.keyCode == AE_KEY_E && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyE && event.state == AE_BUTTON_RELEASED) { movement.z -= 1.0f; } - if (event.keyCode == AE_KEY_Q && event.state == AE_BUTTON_PRESSED && !event.repeat) { + if (event.keyCode == Keycode::KeyQ && event.state == AE_BUTTON_PRESSED && !event.repeat) { movement.z -= 1.0f; } - if (event.keyCode == AE_KEY_Q && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyQ && event.state == AE_BUTTON_RELEASED) { movement.z += 1.0f; } - if (event.keyCode == AE_KEY_SPACE && event.state == AE_BUTTON_PRESSED) { + if (event.keyCode == Keycode::KeySpace && event.state == AE_BUTTON_PRESSED) { jump = true; } - if (event.keyCode == AE_KEY_SPACE && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeySpace && event.state == AE_BUTTON_RELEASED) { jump = false; } - if (event.keyCode == AE_KEY_LSHIFT && event.state == AE_BUTTON_PRESSED) { + if (event.keyCode == Keycode::KeyLeftShift && event.state == AE_BUTTON_PRESSED) { fast = true; } - if (event.keyCode == AE_KEY_LSHIFT && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyLeftShift && event.state == AE_BUTTON_RELEASED) { fast = false; } - if (event.keyCode == AE_KEY_LCTRL && event.state == AE_BUTTON_PRESSED) { + if (event.keyCode == Keycode::KeyLeftControl && event.state == AE_BUTTON_PRESSED) { slide = true; } - if (event.keyCode == AE_KEY_LCTRL && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyLeftControl && event.state == AE_BUTTON_RELEASED) { slide = false; } diff --git a/src/engine/input/KeyboardMap.cpp b/src/engine/input/KeyboardMap.cpp new file mode 100644 index 000000000..300ed284b --- /dev/null +++ b/src/engine/input/KeyboardMap.cpp @@ -0,0 +1,52 @@ +#include "KeyboardMap.h" + +namespace Atlas::Input { + + std::unordered_map KeyboardMap::keyMap; + + void KeyboardMap::Init() { + + Events::EventManager::KeyboardEventDelegate.Subscribe(&HandleKeyboardEvent); + + } + + void KeyboardMap::Shutdown() { + + + + } + + uint8_t KeyboardMap::GetKeyState(Keycode code) { + + if (keyMap.contains(code)) { + return keyMap[code].state; + } + else { + return AE_BUTTON_RELEASED; + } + + } + + bool KeyboardMap::IsKeyPressed(Keycode code, bool repeat) { + + if (keyMap.contains(code)) { + const auto& state = keyMap[code]; + return state.state == AE_BUTTON_PRESSED && (repeat || !state.repeat); + } + else { + return false; + } + + } + + void KeyboardMap::HandleKeyboardEvent(const Events::KeyboardEvent& event) { + + keyMap[event.keyCode] = KeyState { + .state = event.state, + .repeat = event.repeat, + .down = event.down + }; + + } + +} \ No newline at end of file diff --git a/src/engine/input/KeyboardMap.h b/src/engine/input/KeyboardMap.h new file mode 100644 index 000000000..263d7c25f --- /dev/null +++ b/src/engine/input/KeyboardMap.h @@ -0,0 +1,34 @@ +#include "../System.h" + +#include "../events/EventManager.h" + +#include + +namespace Atlas::Input { + + class KeyboardMap { + + public: + static void Init(); + + static void Shutdown(); + + static uint8_t GetKeyState(Keycode keyCode); + + static bool IsKeyPressed(Keycode keyCode, bool repeat = true); + + private: + struct KeyState { + uint8_t state; + + bool repeat; + bool down; + }; + + static void HandleKeyboardEvent(const Events::KeyboardEvent& event); + + static std::unordered_map keyMap; + + }; + +} \ No newline at end of file diff --git a/src/engine/lighting/LightingSerializer.cpp b/src/engine/lighting/LightingSerializer.cpp index fb7ecce97..f26d0dc47 100644 --- a/src/engine/lighting/LightingSerializer.cpp +++ b/src/engine/lighting/LightingSerializer.cpp @@ -176,6 +176,7 @@ namespace Atlas::Lighting { {"longRangeDistance", p.longRangeDistance}, {"bias", p.bias}, {"splitCorrection", p.splitCorrection}, + {"edgeSoftness", p.edgeSoftness}, {"cascadeBlendDistance", p.cascadeBlendDistance}, {"resolution", p.resolution}, {"views", p.views}, @@ -195,6 +196,7 @@ namespace Atlas::Lighting { j.at("longRangeDistance").get_to(p.longRangeDistance); j.at("bias").get_to(p.bias); j.at("splitCorrection").get_to(p.splitCorrection); + j.at("edgeSoftness").get_to(p.edgeSoftness); j.at("cascadeBlendDistance").get_to(p.cascadeBlendDistance); j.at("resolution").get_to(p.resolution); j.at("views").get_to(p.views); diff --git a/src/engine/lighting/Shadow.cpp b/src/engine/lighting/Shadow.cpp index 6914744f2..3d5ac61a4 100644 --- a/src/engine/lighting/Shadow.cpp +++ b/src/engine/lighting/Shadow.cpp @@ -4,8 +4,8 @@ namespace Atlas { namespace Lighting { - Shadow::Shadow(float distance, float bias, int32_t resolution, int32_t cascadeCount, float splitCorrection) : - distance(distance), bias(bias), resolution(resolution) { + Shadow::Shadow(float distance, float bias, int32_t resolution, float edgeSoftness, int32_t cascadeCount, + float splitCorrection) : distance(distance), bias(bias), resolution(resolution), edgeSoftness(edgeSoftness) { splitCorrection = glm::clamp(splitCorrection, 0.0f, 1.0f); viewCount = cascadeCount; @@ -23,10 +23,9 @@ namespace Atlas { } - Shadow::Shadow(float distance, float bias, int32_t resolution, bool useCubemap) : - distance(distance), bias(bias), resolution(resolution), useCubemap(useCubemap) { + Shadow::Shadow(float distance, float bias, int32_t resolution, float edgeSoftness, bool useCubemap) : + distance(distance), bias(bias), resolution(resolution), useCubemap(useCubemap), edgeSoftness(edgeSoftness) { - splitCorrection = 0.0f; isCascaded = false; if (useCubemap) { diff --git a/src/engine/lighting/Shadow.h b/src/engine/lighting/Shadow.h index 3c7d963e4..89cc9aab3 100644 --- a/src/engine/lighting/Shadow.h +++ b/src/engine/lighting/Shadow.h @@ -31,9 +31,9 @@ namespace Atlas { public: Shadow() = default; - Shadow(float distance, float bias, int32_t resolution, int32_t numCascades, float splitCorrection); + Shadow(float distance, float bias, int32_t resolution, float edgeSoftness, int32_t numCascades, float splitCorrection); - Shadow(float distance, float bias, int32_t resolution, bool useCubemap = false); + Shadow(float distance, float bias, int32_t resolution, float edgeSoftness, bool useCubemap = false); void SetResolution(int32_t resolution); @@ -44,7 +44,9 @@ namespace Atlas { float distance = 300.0f; float longRangeDistance = 1024.0f; float bias = 0.001f; - float splitCorrection = 0.95f; + float splitCorrection = 0.9f; + + float edgeSoftness = 0.025f; float cascadeBlendDistance = 2.5f; diff --git a/src/engine/loader/ModelLoader.cpp b/src/engine/loader/ModelLoader.cpp index 46c1abd56..ab3b09d33 100644 --- a/src/engine/loader/ModelLoader.cpp +++ b/src/engine/loader/ModelLoader.cpp @@ -157,35 +157,31 @@ namespace Atlas { VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT); std::atomic_int32_t counter = 0; - std::vector materialImages(scene->mNumMaterials); + MaterialImages materialImages; auto loadImagesLambda = [&]() { auto i = counter++; - while (i < int32_t(materialImages.size())) { + while (i < int32_t(scene->mNumMaterials)) { - auto& images = materialImages[i]; - - LoadMaterialImages(scene->mMaterials[i], images, directoryPath, - isObj, hasTangents, maxTextureResolution, rgbSupport); + LoadMaterialImages(scene->mMaterials[i], materialImages, directoryPath, + isObj, true, maxTextureResolution, false); i = counter++; } - }; + }; auto threadCount = std::thread::hardware_concurrency(); - std::vector threads; + std::vector> threads; for (uint32_t i = 0; i < threadCount; i++) { - threads.emplace_back(std::thread{ loadImagesLambda }); + threads.emplace_back(std::async(std::launch::async, loadImagesLambda)); } for (uint32_t i = 0; i < threadCount; i++) { - threads[i].join(); + threads[i].get(); } - for (auto& images : materialImages) { - ImagesToTexture(images); - } + ImagesToTexture(materialImages); meshData.subData = std::vector(scene->mNumMaterials); @@ -195,10 +191,9 @@ namespace Atlas { auto material = CreateRef(); meshData.materials.push_back(material); - auto& images = materialImages[i]; auto& subData = meshData.subData[i]; - LoadMaterial(scene->mMaterials[i], images, *material); + LoadMaterial(scene->mMaterials[i], materialImages, *material, directoryPath, isObj, hasTangents, hasTexCoords); material->vertexColors = hasVertexColors; @@ -278,8 +273,6 @@ namespace Atlas { importer.FreeScene(); - materialImages.clear(); - meshData.aabb = Volume::AABB(min, max); meshData.radius = radius; @@ -292,7 +285,8 @@ namespace Atlas { } - Ref ModelLoader::LoadScene(const std::string& filename, + Ref ModelLoader::LoadScene(const std::string& filename, vec3 min, vec3 max, + int32_t depth, bool combineMeshes, bool makeMeshesStatic, bool forceTangents, int32_t maxTextureResolution) { auto directoryPath = GetDirectoryPath(filename); @@ -305,19 +299,22 @@ namespace Atlas { Assimp::Importer importer; importer.SetPropertyInteger(AI_CONFIG_PP_LBW_MAX_WEIGHTS, 4); + auto flags = aiProcess_CalcTangentSpace | + aiProcess_JoinIdenticalVertices | + aiProcess_Triangulate | + aiProcess_GenNormals | + aiProcess_LimitBoneWeights | + aiProcess_OptimizeGraph | + aiProcess_RemoveRedundantMaterials | + aiProcess_ImproveCacheLocality; + + if (combineMeshes) + flags |= aiProcess_OptimizeMeshes; + // Use aiProcess_GenSmoothNormals in case model lacks normals and smooth normals are needed // Use aiProcess_GenNormals in case model lacks normals and flat normals are needed // Right now we just use flat normals everytime normals are missing. - const aiScene* assimpScene = importer.ReadFile(AssetLoader::GetFullPath(filename), - aiProcess_CalcTangentSpace | - aiProcess_JoinIdenticalVertices | - aiProcess_Triangulate | - aiProcess_OptimizeGraph | - aiProcess_OptimizeMeshes | - aiProcess_RemoveRedundantMaterials | - aiProcess_GenNormals | - aiProcess_LimitBoneWeights | - aiProcess_ImproveCacheLocality); + const aiScene* assimpScene = importer.ReadFile(AssetLoader::GetFullPath(filename), flags); if (!assimpScene) { throw ResourceLoadException(filename, "Error processing model " @@ -325,15 +322,13 @@ namespace Atlas { } std::atomic_int32_t counter = 0; - std::vector materialImages(assimpScene->mNumMaterials); + MaterialImages materialImages; auto loadImagesLambda = [&]() { auto i = counter++; - while (i < int32_t(materialImages.size())) { + while (i < int32_t(assimpScene->mNumMaterials)) { - auto& images = materialImages[i]; - - LoadMaterialImages(assimpScene->mMaterials[i], images, directoryPath, + LoadMaterialImages(assimpScene->mMaterials[i], materialImages, directoryPath, isObj, true, maxTextureResolution, false); i = counter++; @@ -342,18 +337,16 @@ namespace Atlas { }; auto threadCount = std::thread::hardware_concurrency(); - std::vector threads; + std::vector> threads; for (uint32_t i = 0; i < threadCount; i++) { - threads.emplace_back(std::thread{ loadImagesLambda }); + threads.emplace_back(std::async(std::launch::async, loadImagesLambda)); } for (uint32_t i = 0; i < threadCount; i++) { - threads[i].join(); + threads[i].get(); } - for (auto& images : materialImages) { - ImagesToTexture(images); - } + ImagesToTexture(materialImages); std::map> meshMap; @@ -412,9 +405,7 @@ namespace Atlas { auto min = vec3(std::numeric_limits::max()); auto max = vec3(-std::numeric_limits::max()); - auto& images = materialImages[materialIdx]; - - LoadMaterial(assimpMaterial, images, *material); + LoadMaterial(assimpMaterial, materialImages, *material, directoryPath, isObj, hasTangents, hasTexCoords); material->vertexColors = hasVertexColors; @@ -487,40 +478,56 @@ namespace Atlas { mesh->name = meshData.filename; mesh->UpdateData(); - auto handle = ResourceManager::AddResource(filename + "_" + mesh->name, mesh); + auto handle = ResourceManager::AddResource(filename + "_" + mesh->name + "_" + std::to_string(i), mesh); meshMap[assimpMesh] = handle; } - auto scene = CreateRef(filename, glm::vec3(-2048.0f), glm::vec3(2048.0f)); + auto scene = CreateRef(filename, min, max, depth); - scene->name = filename; + auto rootEntity = scene->CreateEntity(); + rootEntity.AddComponent("Root"); + auto& rootHierarchy = rootEntity.AddComponent(); + rootHierarchy.root = true; int32_t triangleCount = 0; - std::function traverseNodeTree; - traverseNodeTree = [&](aiNode* node, mat4 accTransform) { - accTransform = accTransform * glm::transpose(glm::make_mat4(&node->mTransformation.a1)); + std::function traverseNodeTree; + traverseNodeTree = [&](aiNode* node, Scene::Entity parentEntity) { + auto nodeTransform = glm::transpose(glm::make_mat4(&node->mTransformation.a1)); + for (uint32_t i = 0; i < node->mNumMeshes; i++) { auto meshId = node->mMeshes[i]; auto mesh = assimpScene->mMeshes[meshId]; triangleCount += mesh->mNumFaces; - scene->CreatePrefab(meshMap[mesh], accTransform); + auto entity = scene->CreatePrefab( + meshMap[mesh], nodeTransform, makeMeshesStatic); + + auto name = std::string(mesh->mName.C_Str()) + "_" + std::to_string(entity); + entity.AddComponent(name); + + parentEntity.GetComponent().AddChild(entity); } for (uint32_t i = 0; i < node->mNumChildren; i++) { - traverseNodeTree(node->mChildren[i], accTransform); + auto nodeEntity = scene->CreatePrefab(node->mChildren[i]->mName.C_Str(), nodeTransform); + auto const& hierarchy = nodeEntity.GetComponent(); + + parentEntity.GetComponent().AddChild(nodeEntity); + + traverseNodeTree(node->mChildren[i], nodeEntity); } }; - traverseNodeTree(assimpScene->mRootNode, mat4(1.0f)); + traverseNodeTree(assimpScene->mRootNode, rootEntity); return scene; } - void ModelLoader::LoadMaterial(aiMaterial* assimpMaterial, MaterialImages& images, Material& material) { + void ModelLoader::LoadMaterial(aiMaterial* assimpMaterial, MaterialImages& images, Material& material, + const std::string& directory, bool isObj, bool hasTangents, bool hasTexCoords) { bool roughnessMetalnessTexture = false; @@ -559,11 +566,11 @@ namespace Atlas { // Avoid NaN specularHardness = glm::max(1.0f, specularHardness); - material.roughness = glm::clamp(powf(1.0f / (0.5f * specularHardness + 1.0f), 0.25f), 0.0f, 1.0f); + material.roughness = powf(1.0f / (0.5f * specularHardness + 1.0f), 0.25f); material.ao = 1.0f; metalness = metalness == 0.0f ? glm::max(specular.r, glm::max(specular.g, specular.b)) : metalness; - material.metalness = glm::clamp(metalness, 0.0f, 1.0f); + material.metalness = metalness; material.twoSided = twoSided; @@ -572,29 +579,87 @@ namespace Atlas { assimpMaterial->Get(AI_MATKEY_ROUGHNESS_FACTOR, material.roughness); } - if (images.baseColorImage && images.baseColorImage->HasData()) { - material.baseColorMap = images.baseColorTexture; - material.baseColorMapPath = images.baseColorImage->fileName; + material.roughness = glm::clamp(material.roughness, 0.0f, 1.0f); + material.metalness = glm::clamp(material.metalness, 0.0f, 1.0f); + + if (!hasTexCoords) + return; + + if (assimpMaterial->GetTextureCount(aiTextureType_BASE_COLOR) > 0 || + assimpMaterial->GetTextureCount(aiTextureType_DIFFUSE) > 0) { + aiString aiPath; + if (assimpMaterial->GetTextureCount(aiTextureType_BASE_COLOR) > 0) + assimpMaterial->GetTexture(aiTextureType_BASE_COLOR, 0, &aiPath); + else + assimpMaterial->GetTexture(aiTextureType_DIFFUSE, 0, &aiPath); + auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); + if (images.baseColorTextures.contains(path)) { + material.baseColorMap = images.baseColorTextures[path]; + material.baseColorMapPath = images.baseColorImages[path]->fileName; + } + if (images.opacityTextures.contains(path)) { + material.opacityMap = images.opacityTextures[path]; + material.opacityMapPath = images.opacityImages[path]->fileName; + } } - if (images.opacityImage && images.opacityImage->HasData()) { - material.opacityMap = images.opacityTexture; - material.opacityMapPath = images.opacityImage->fileName; + if (assimpMaterial->GetTextureCount(aiTextureType_OPACITY) > 0) { + aiString aiPath; + assimpMaterial->GetTexture(aiTextureType_OPACITY, 0, &aiPath); + auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); + if (images.opacityTextures.contains(path)) { + material.opacityMap = images.opacityTextures[path]; + material.opacityMapPath = images.opacityImages[path]->fileName; + } } - if (images.roughnessImage && images.roughnessImage->HasData()) { - material.roughnessMap = images.roughnessTexture; - material.roughnessMapPath = images.roughnessImage->fileName; + if ((assimpMaterial->GetTextureCount(aiTextureType_NORMALS) > 0 || + (assimpMaterial->GetTextureCount(aiTextureType_HEIGHT) > 0 && isObj)) + && hasTangents) { + aiString aiPath; + if (isObj) + assimpMaterial->GetTexture(aiTextureType_HEIGHT, 0, &aiPath); + else + assimpMaterial->GetTexture(aiTextureType_NORMALS, 0, &aiPath); + auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); + if (images.normalTextures.contains(path)) { + material.normalMap = images.normalTextures[path]; + material.normalMapPath = images.normalImages[path]->fileName; + } } - if (images.metallicImage && images.metallicImage->HasData()) { - material.metalnessMap = images.metallicTexture; - material.metalnessMapPath = images.metallicImage->fileName; + if (assimpMaterial->GetTextureCount(aiTextureType_DIFFUSE_ROUGHNESS) > 0) { + aiString aiPath; + assimpMaterial->GetTexture(aiTextureType_DIFFUSE_ROUGHNESS, 0, &aiPath); + auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); + if (images.roughnessTextures.contains(path)) { + material.roughnessMap = images.roughnessTextures[path]; + material.roughnessMapPath = images.roughnessImages[path]->fileName; + } } - if (images.normalImage && images.normalImage->HasData()) { - material.normalMap = images.normalTexture; - material.normalMapPath = images.normalImage->fileName; + if (assimpMaterial->GetTextureCount(aiTextureType_METALNESS) > 0) { + aiString aiPath; + assimpMaterial->GetTexture(aiTextureType_METALNESS, 0, &aiPath); + auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); + if (images.metallicTextures.contains(path)) { + material.metalnessMap = images.metallicTextures[path]; + material.metalnessMapPath = images.metallicImages[path]->fileName; + } } - if (images.displacementImage && images.displacementImage->HasData()) { - material.displacementMap = images.displacementTexture; - material.displacementMapPath = images.displacementImage->fileName; + if (assimpMaterial->GetTextureCount(aiTextureType_SPECULAR) > 0) { + aiString aiPath; + assimpMaterial->GetTexture(aiTextureType_SPECULAR, 0, &aiPath); + auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); + if (images.metallicTextures.contains(path) && !material.HasMetalnessMap()) { + material.metalnessMap = images.metallicTextures[path]; + material.metalnessMapPath = images.metallicImages[path]->fileName; + } + } + if (assimpMaterial->GetTextureCount(aiTextureType_HEIGHT) > 0 && !isObj && hasTangents) { + aiString aiPath; + assimpMaterial->GetTexture(aiTextureType_HEIGHT, 0, &aiPath); + auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); + if (images.displacementTextures.contains(path)) { + material.displacementMap = images.displacementTextures[path]; + material.displacementMapPath = images.displacementImages[path]->fileName; + } } // Probably foliage @@ -607,6 +672,8 @@ namespace Atlas { void ModelLoader::LoadMaterialImages(aiMaterial* material, MaterialImages& images, const std::string& directory, bool isObj, bool hasTangents, int32_t maxTextureResolution, bool rgbSupport) { + + if (material->GetTextureCount(aiTextureType_BASE_COLOR) > 0 || material->GetTextureCount(aiTextureType_DIFFUSE) > 0) { aiString aiPath; @@ -615,36 +682,44 @@ namespace Atlas { else material->GetTexture(aiTextureType_DIFFUSE, 0, &aiPath); auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); - images.baseColorImage = ImageLoader::LoadImage(path, true, 0, maxTextureResolution); - - if (images.baseColorImage->channels == 1) { - auto imageData = images.baseColorImage->GetData(); - std::vector data(images.baseColorImage->width * images.baseColorImage->height * 3); - for (size_t i = 0; i < data.size(); i += 3) { - data[i + 0] = imageData[i / 3]; - data[i + 1] = imageData[i / 3]; - data[i + 2] = imageData[i / 3]; + + if (!images.Contains(MaterialImageType::BaseColor, path)) { + Ref> opacityImage = nullptr; + auto image = ImageLoader::LoadImage(path, true, 0, maxTextureResolution); + + if (image->channels == 1) { + auto imageData = image->GetData(); + std::vector data(image->width * image->height * 3); + for (size_t i = 0; i < data.size(); i += 3) { + data[i + 0] = imageData[i / 3]; + data[i + 1] = imageData[i / 3]; + data[i + 2] = imageData[i / 3]; + } + image = CreateRef>(image->width, image->height, 3); + image->SetData(data); + } + else if (image->channels == 4) { + opacityImage = image->GetChannelImage(3, 1); + image = image->GetChannelImage(0, 3); } - images.baseColorImage = CreateRef>(images.baseColorImage->width, - images.baseColorImage->height, 3); - images.baseColorImage->SetData(data); - } - else if (images.baseColorImage->channels == 4) { - images.opacityImage = images.baseColorImage->GetChannelImage(3, 1); - images.baseColorImage = images.baseColorImage->GetChannelImage(0, 3); - } - // Some device e.g. Mac M1 don't support the necessary format - if (!rgbSupport) { - images.baseColorImage->ExpandToChannelCount(4, 255); + // Some device e.g. Mac M1 don't support the necessary format + if (!rgbSupport) { + image->ExpandToChannelCount(4, 255); + } + + images.Add(MaterialImageType::BaseColor, path, image); + if (!images.Contains(MaterialImageType::Opacity, path) && opacityImage != nullptr) + images.Add(MaterialImageType::Opacity, path, opacityImage); } } if (material->GetTextureCount(aiTextureType_OPACITY) > 0) { aiString aiPath; material->GetTexture(aiTextureType_OPACITY, 0, &aiPath); auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); - if (path != images.baseColorImage->fileName) { - images.opacityImage = ImageLoader::LoadImage(path, false, 1, maxTextureResolution); + if (!images.Contains(MaterialImageType::Opacity, path)) { + auto image = ImageLoader::LoadImage(path, false, 1, maxTextureResolution); + images.Add(MaterialImageType::Opacity, path, image); } } if ((material->GetTextureCount(aiTextureType_NORMALS) > 0 || @@ -656,72 +731,96 @@ namespace Atlas { else material->GetTexture(aiTextureType_NORMALS, 0, &aiPath); auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); - images.normalImage = ImageLoader::LoadImage(path, false, 0, maxTextureResolution); - // Might still be a traditional displacement map - if (images.normalImage->channels == 1 && isObj) { - images.displacementImage = images.normalImage; - images.normalImage = ApplySobelFilter(images.normalImage); - } - if (images.normalImage->channels == 4) { - images.normalImage = images.normalImage->GetChannelImage(0, 3); - } - // Some device e.g. Mac M1 don't support the necessary format - if (!rgbSupport) { - images.normalImage->ExpandToChannelCount(4, 255); + if (!images.Contains(MaterialImageType::Normal, path)) { + Ref> displacementImage = nullptr; + auto image = ImageLoader::LoadImage(path, false, 0, maxTextureResolution); + // Might still be a traditional displacement map + if (image->channels == 1 && isObj) { + displacementImage = image; + image = ApplySobelFilter(image); + } + if (image->channels == 4) { + image = image->GetChannelImage(0, 3); + } + + // Some device e.g. Mac M1 don't support the necessary format + if (!rgbSupport) { + image->ExpandToChannelCount(4, 255); + } + + images.Add(MaterialImageType::Normal, path, image); + if (!images.Contains(MaterialImageType::Displacement, path) && displacementImage != nullptr) + images.Add(MaterialImageType::Displacement, path, displacementImage); } } if (material->GetTextureCount(aiTextureType_DIFFUSE_ROUGHNESS) > 0) { aiString aiPath; material->GetTexture(aiTextureType_DIFFUSE_ROUGHNESS, 0, &aiPath); auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); - images.roughnessImage = ImageLoader::LoadImage(path, false, 0, maxTextureResolution); - if (images.roughnessImage->channels > 1) { - images.metallicImage = images.roughnessImage->GetChannelImage(2, 1); - images.roughnessImage = images.roughnessImage->GetChannelImage(1, 1); - } + if (!images.Contains(MaterialImageType::Roughness, path)) { + Ref> metallicImage = nullptr; + auto image = ImageLoader::LoadImage(path, false, 0, maxTextureResolution); + + // It's common in GLTF that these are stored in one texture + if (image->channels > 1) { + metallicImage = image->GetChannelImage(2, 1); + image = image->GetChannelImage(1, 1); + } + + images.Add(MaterialImageType::Roughness, path, image); + if (!images.Contains(MaterialImageType::Metallic, path) && metallicImage != nullptr) + images.Add(MaterialImageType::Metallic, path, metallicImage); + } } - if (material->GetTextureCount(aiTextureType_METALNESS) > 0 && - images.metallicImage && !images.metallicImage->HasData()) { + if (material->GetTextureCount(aiTextureType_METALNESS) > 0) { aiString aiPath; material->GetTexture(aiTextureType_METALNESS, 0, &aiPath); auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); - images.metallicImage = ImageLoader::LoadImage(path, false, 1, maxTextureResolution); + if (!images.Contains(MaterialImageType::Metallic, path)) { + auto image = ImageLoader::LoadImage(path, false, 1, maxTextureResolution); + images.Add(MaterialImageType::Metallic, path, image); + } } - if (material->GetTextureCount(aiTextureType_SPECULAR) > 0 && - images.metallicImage && !images.metallicImage->HasData()) { + if (material->GetTextureCount(aiTextureType_SPECULAR) > 0) { aiString aiPath; material->GetTexture(aiTextureType_SPECULAR, 0, &aiPath); auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); - images.metallicImage = ImageLoader::LoadImage(path, false, 1, maxTextureResolution); + if (!images.Contains(MaterialImageType::Metallic, path)) { + auto image = ImageLoader::LoadImage(path, false, 1, maxTextureResolution); + images.Add(MaterialImageType::Metallic, path, image); + } } if (material->GetTextureCount(aiTextureType_HEIGHT) > 0 && !isObj && hasTangents) { aiString aiPath; material->GetTexture(aiTextureType_HEIGHT, 0, &aiPath); auto path = Common::Path::Normalize(directory + std::string(aiPath.C_Str())); - images.displacementImage = ImageLoader::LoadImage(path, false, 1, maxTextureResolution); + if (!images.Contains(MaterialImageType::Displacement, path)) { + auto image = ImageLoader::LoadImage(path, false, 1, maxTextureResolution); + images.Add(MaterialImageType::Displacement, path, image); + } } } void ModelLoader::ImagesToTexture(MaterialImages& images) { - if (images.baseColorImage && images.baseColorImage->HasData()) { - images.baseColorTexture = std::make_shared(images.baseColorImage);; + for (const auto& [path, image] : images.baseColorImages) { + images.baseColorTextures[path] = std::make_shared(image); } - if (images.opacityImage && images.opacityImage->HasData()) { - images.opacityTexture = std::make_shared(images.opacityImage); + for (const auto& [path, image] : images.opacityImages) { + images.opacityTextures[path] = std::make_shared(image); } - if (images.roughnessImage && images.roughnessImage->HasData()) { - images.roughnessTexture = std::make_shared(images.roughnessImage); + for (const auto& [path, image] : images.normalImages) { + images.normalTextures[path] = std::make_shared(image); } - if (images.metallicImage && images.metallicImage->HasData()) { - images.metallicTexture = std::make_shared(images.metallicImage); + for (const auto& [path, image] : images.roughnessImages) { + images.roughnessTextures[path] = std::make_shared(image); } - if (images.normalImage && images.normalImage->HasData()) { - images.normalTexture = std::make_shared(images.normalImage); + for (const auto& [path, image] : images.metallicImages) { + images.metallicTextures[path] = std::make_shared(image); } - if (images.displacementImage && images.displacementImage->HasData()) { - images.displacementTexture = std::make_shared(images.displacementImage); + for (const auto& [path, image] : images.displacementImages) { + images.displacementTextures[path] = std::make_shared(image); } } diff --git a/src/engine/loader/ModelLoader.h b/src/engine/loader/ModelLoader.h index 19b0f9f7f..b53ac3ecb 100644 --- a/src/engine/loader/ModelLoader.h +++ b/src/engine/loader/ModelLoader.h @@ -9,6 +9,9 @@ #include #include +#include +#include + namespace Atlas { namespace Loader { @@ -23,27 +26,88 @@ namespace Atlas { Mesh::MeshMobility mobility, bool forceTangents = false, int32_t maxTextureResolution = 4096); - static Ref LoadScene(const std::string& filename, + static Ref LoadScene(const std::string& filename, vec3 min, vec3 max, + int32_t depth, bool combineMeshes = true, bool makeMeshesStatic = false, bool forceTangents = false, int32_t maxTextureResolution = 4096); private: + enum class MaterialImageType { + BaseColor = 0, + Opacity, + Roughness, + Metallic, + Normal, + Displacement, + }; + struct MaterialImages { - Ref> baseColorImage; - Ref> opacityImage; - Ref> roughnessImage; - Ref> metallicImage; - Ref> normalImage; - Ref> displacementImage; - - Ref baseColorTexture; - Ref opacityTexture; - Ref roughnessTexture; - Ref metallicTexture; - Ref normalTexture; - Ref displacementTexture; + std::map>> baseColorImages; + std::map>> opacityImages; + std::map>> roughnessImages; + std::map>> metallicImages; + std::map>> normalImages; + std::map>> displacementImages; + + std::map> baseColorTextures; + std::map> opacityTextures; + std::map> roughnessTextures; + std::map> metallicTextures; + std::map> normalTextures; + std::map> displacementTextures; + + std::mutex mutexes[6]; + + void Add(MaterialImageType type, const std::string& path, const Ref>& image) { + std::scoped_lock lock(mutexes[static_cast(type)]); + + switch (type) { + case MaterialImageType::BaseColor: + baseColorImages[path] = image; + break; + case MaterialImageType::Opacity: + opacityImages[path] = image; + break; + case MaterialImageType::Roughness: + roughnessImages[path] = image; + break; + case MaterialImageType::Metallic: + metallicImages[path] = image; + break; + case MaterialImageType::Normal: + normalImages[path] = image; + break; + case MaterialImageType::Displacement: + displacementImages[path] = image; + break; + default: + break; + } + } + + bool Contains(MaterialImageType type, const std::string& path) { + std::scoped_lock lock(mutexes[static_cast(type)]); + + switch (type) { + case MaterialImageType::BaseColor: + return baseColorImages.contains(path); + case MaterialImageType::Opacity: + return opacityImages.contains(path); + case MaterialImageType::Roughness: + return roughnessImages.contains(path); + case MaterialImageType::Metallic: + return metallicImages.contains(path); + case MaterialImageType::Normal: + return normalImages.contains(path); + case MaterialImageType::Displacement: + return displacementImages.contains(path); + default: + return true; + } + } }; - static void LoadMaterial(aiMaterial* assimpMaterial, MaterialImages& images, Material& material); + static void LoadMaterial(aiMaterial* assimpMaterial, MaterialImages& images, Material& material, + const std::string& directory, bool isObj, bool hasTangents, bool hasTexCoords); static void LoadMaterialImages(aiMaterial* material, MaterialImages& images, const std::string& directory, bool isObj, bool hasTangents, diff --git a/src/engine/mesh/Mesh.cpp b/src/engine/mesh/Mesh.cpp index a3ddf12e8..9e742cbb5 100644 --- a/src/engine/mesh/Mesh.cpp +++ b/src/engine/mesh/Mesh.cpp @@ -132,7 +132,6 @@ namespace Atlas { triangleOffsetBuffer.SetSize(triangleOffsets.size(), triangleOffsets.data()); needsBvhRefresh = true; - } isBvhBuilt = true; diff --git a/src/engine/mesh/Mesh.h b/src/engine/mesh/Mesh.h index 58644fe00..d8cf9026e 100644 --- a/src/engine/mesh/Mesh.h +++ b/src/engine/mesh/Mesh.h @@ -31,8 +31,6 @@ namespace Atlas { HostAccessBit = (1 << 1), } MeshUsageBits; - - class Mesh { friend RayTracing::RayTracingWorld; diff --git a/src/engine/physics/Body.cpp b/src/engine/physics/Body.cpp index 9886b9c9c..88dfeb087 100644 --- a/src/engine/physics/Body.cpp +++ b/src/engine/physics/Body.cpp @@ -45,6 +45,20 @@ namespace Atlas::Physics { } + void Body::SetAngularVelocity(glm::vec3 velocity) { + + AE_ASSERT(world != nullptr && "Physics world is invalid"); + world->SetAngularVelocity(bodyId, velocity); + + } + + vec3 Body::GetAngularVelocity() { + + AE_ASSERT(world != nullptr && "Physics world is invalid"); + return world->GetAngularVelocity(bodyId); + + } + void Body::SetRestitution(float restitution) { AE_ASSERT(world != nullptr && "Physics world is invalid"); diff --git a/src/engine/physics/Body.h b/src/engine/physics/Body.h index edf254001..c9b5e055a 100644 --- a/src/engine/physics/Body.h +++ b/src/engine/physics/Body.h @@ -27,6 +27,10 @@ namespace Atlas::Physics { vec3 GetLinearVelocity(); + void SetAngularVelocity(vec3 velocity); + + vec3 GetAngularVelocity(); + void SetRestitution(float restitution); float GetRestitution(); diff --git a/src/engine/physics/PhysicsWorld.cpp b/src/engine/physics/PhysicsWorld.cpp index bf2f93cdd..d7124ce61 100644 --- a/src/engine/physics/PhysicsWorld.cpp +++ b/src/engine/physics/PhysicsWorld.cpp @@ -133,7 +133,7 @@ namespace Atlas { } - void PhysicsWorld::SetLinearVelocity(BodyID bodyId, glm::vec3 velocity) { + void PhysicsWorld::SetLinearVelocity(BodyID bodyId, vec3 velocity) { auto& bodyInterface = system->GetBodyInterface(); bodyInterface.SetLinearVelocity(bodyId, VecToJPHVec(velocity)); @@ -147,6 +147,20 @@ namespace Atlas { } + void PhysicsWorld::SetAngularVelocity(BodyID bodyId, vec3 velocity) { + + auto& bodyInterface = system->GetBodyInterface(); + bodyInterface.SetAngularVelocity(bodyId, VecToJPHVec(velocity)); + + } + + vec3 PhysicsWorld::GetAngularVelocity(BodyID bodyId) { + + auto& bodyInterface = system->GetBodyInterface(); + return JPHVecToVec(bodyInterface.GetAngularVelocity(bodyId)); + + } + void PhysicsWorld::SetRestitution(BodyID bodyId, float restitution) { auto& bodyInterface = system->GetBodyInterface(); @@ -226,11 +240,10 @@ namespace Atlas { Volume::RayResult PhysicsWorld::CastRay(Volume::Ray& ray) { - const float farDist = 10e9f; - JPH::RayCastResult hit; // Actually direction is not really a direction but one endpoint - JPH::RRayCast rayCast{ VecToJPHVec(ray.origin), VecToJPHVec(ray.direction * farDist) }; + JPH::RRayCast rayCast{ VecToJPHVec(ray.origin + ray.direction * ray.tMin), + VecToJPHVec(ray.direction * ray.tMax) }; Volume::RayResult result; @@ -250,7 +263,7 @@ namespace Atlas { } result.valid = true; - result.hitDistance = hit.mFraction * farDist; + result.hitDistance = (ray.tMax - ray.tMin) * hit.mFraction; result.data = { hit.mBodyID, this }; } diff --git a/src/engine/physics/PhysicsWorld.h b/src/engine/physics/PhysicsWorld.h index af56b9ee0..538d86379 100644 --- a/src/engine/physics/PhysicsWorld.h +++ b/src/engine/physics/PhysicsWorld.h @@ -54,6 +54,10 @@ namespace Atlas { vec3 GetLinearVelocity(BodyID bodyId); + void SetAngularVelocity(BodyID bodyId, vec3 velocity); + + vec3 GetAngularVelocity(BodyID bodyId); + void SetRestitution(BodyID bodyId, float restitution); float GetRestitution(BodyID bodyId); diff --git a/src/engine/physics/Player.cpp b/src/engine/physics/Player.cpp index a938d436c..997eda871 100644 --- a/src/engine/physics/Player.cpp +++ b/src/engine/physics/Player.cpp @@ -35,7 +35,28 @@ namespace Atlas::Physics { void Player::SetPosition(vec3 position) { AE_ASSERT(world != nullptr && "Physics world is invalid"); - character->SetPosition(Physics::VecToJPHVec(position)); + character->SetPosition(VecToJPHVec(position)); + + } + + vec3 Player::GetPosition() const { + + AE_ASSERT(world != nullptr && "Physics world is invalid"); + return JPHVecToVec(character->GetPosition()); + + } + + void Player::SetRotation(quat rotation) { + + AE_ASSERT(world != nullptr && "Physics world is invalid"); + character->SetRotation(QuatToJPHQuat(rotation)); + + } + + quat Player::GetRotation() const { + + AE_ASSERT(world != nullptr && "Physics world is invalid"); + return JPHQuatToQuat(character->GetRotation()); } @@ -90,22 +111,6 @@ namespace Atlas::Physics { } - void Player::StickToGround(vec3 distVector) { - - AE_ASSERT(world != nullptr && "Physics world is invalid"); - - auto system = world->system; - - const auto& physicsSettings = system->GetPhysicsSettings(); - const auto& broadPhaseLayerFilter = system->GetDefaultBroadPhaseLayerFilter(Layers::MOVABLE); - const auto& defaultLayerFilter = system->GetDefaultLayerFilter(Physics::Layers::MOVABLE); - const auto& tempAllocator = Physics::PhysicsManager::tempAllocator; - - character->StickToFloor(VecToJPHVec(distVector), broadPhaseLayerFilter, defaultLayerFilter, - {}, {}, *tempAllocator); - - } - void Player::SetShape(const Ref& shape) { AE_ASSERT(world != nullptr && "Physics world is invalid"); @@ -135,8 +140,13 @@ namespace Atlas::Physics { auto gravityVector = -GetUp() * glm::length(world->GetGravity()); - character->Update(deltaTime, VecToJPHVec(gravityVector), broadPhaseLayerFilter, - defaultLayerFilter, {}, {}, *tempAllocator); + JPH::CharacterVirtual::ExtendedUpdateSettings settings; + + settings.mStickToFloorStepDown = VecToJPHVec(stickToGroundDist); + settings.mWalkStairsStepUp = VecToJPHVec(walkStairsStepUpDist); + + character->ExtendedUpdate(deltaTime, VecToJPHVec(gravityVector), settings, + broadPhaseLayerFilter, defaultLayerFilter, {}, {}, *tempAllocator); } diff --git a/src/engine/physics/Player.h b/src/engine/physics/Player.h index 8868f0a55..b36346a4e 100644 --- a/src/engine/physics/Player.h +++ b/src/engine/physics/Player.h @@ -58,14 +58,15 @@ namespace Atlas::Physics { vec3 GetUp() const; - void StickToGround(vec3 distVector); - void SetShape(const Ref& shape); virtual void Update(float deltaTime); Ref creationSettings = nullptr; + vec3 stickToGroundDist = vec3(0.0f); + vec3 walkStairsStepUpDist = vec3(0.0f); + protected: void Init(PhysicsWorld* world, vec3 initialPosition, quat initialRotation); diff --git a/src/engine/physics/ShapesManager.cpp b/src/engine/physics/ShapesManager.cpp index 91b55dece..8a03bdeb6 100644 --- a/src/engine/physics/ShapesManager.cpp +++ b/src/engine/physics/ShapesManager.cpp @@ -9,10 +9,17 @@ #include #include +#include + namespace Atlas { namespace Physics { + std::unordered_map> ShapesManager::meshShapeCache; + std::mutex ShapesManager::meshShapeCacheMutex; + + const float ShapesManager::epsilon = 0.00001f; + bool ShapesManager::TryCreateShapeFromMesh(Shape* shape, const MeshShapeSettings& settings) { if (!settings.mesh.IsLoaded()) @@ -21,33 +28,45 @@ namespace Atlas { auto& mesh = settings.mesh; const auto& scale = settings.scale; - JPH::VertexList vertexList; - JPH::IndexedTriangleList triangleList; + // This all assumes right now that mesh data doesn't change in the objects lifetime + if (!meshShapeCache.contains(mesh.GetID())) { - for (auto& vertex : mesh->data.vertices) { + JPH::VertexList vertexList; + JPH::IndexedTriangleList triangleList; - vertexList.push_back(JPH::Float3(vertex.x, vertex.y, vertex.z)); + for (auto& vertex : mesh->data.vertices) { - } + vertexList.push_back(JPH::Float3(vertex.x, vertex.y, vertex.z)); - for (size_t i = 0; i < mesh->data.indices.GetElementCount(); i+=3) { + } - auto idx0 = mesh->data.indices[i]; - auto idx1 = mesh->data.indices[i + 1]; - auto idx2 = mesh->data.indices[i + 2]; + for (size_t i = 0; i < mesh->data.indices.GetElementCount(); i+=3) { - JPH::IndexedTriangle triangle(idx0, idx1, idx2); + auto idx0 = mesh->data.indices[i]; + auto idx1 = mesh->data.indices[i + 1]; + auto idx2 = mesh->data.indices[i + 2]; - triangleList.push_back(triangle); - } + JPH::IndexedTriangle triangle(idx0, idx1, idx2); - JPH::MeshShapeSettings meshShapeSettings(vertexList, triangleList); - auto result = meshShapeSettings.Create(); + triangleList.push_back(triangle); + } - if (!result.IsValid()) - return false; + JPH::MeshShapeSettings meshShapeSettings(vertexList, triangleList); + auto result = meshShapeSettings.Create(); - shape->ref = result.Get(); + if (!result.IsValid()) + return false; + + shape->ref = result.Get(); + + meshShapeCache[mesh.GetID()] = { mesh.Get(), shape->ref }; + + } + else { + + shape->ref = meshShapeCache[mesh.GetID()].ref; + + } if (scale.x != 1.0f || scale.y != 1.0f || scale.z != 1.0f) { return shape->Scale(scale); @@ -65,7 +84,10 @@ namespace Atlas { auto halfSize = aabb.GetSize() / 2.0f; - JPH::BoxShapeSettings boxShapeSettings(VecToJPHVec(halfSize)); + // 0.05f is the default convex radius of Jolt + auto convexRadius = glm::min(glm::compMin(halfSize) - epsilon, 0.05f); + + JPH::BoxShapeSettings boxShapeSettings(VecToJPHVec(halfSize), convexRadius); boxShapeSettings.SetDensity(density); auto boxShapeResult = boxShapeSettings.Create(); @@ -172,6 +194,12 @@ namespace Atlas { } + void ShapesManager::Update() { + + std::erase_if(meshShapeCache, [](auto& item) { return item.second.resource.expired(); } ); + + } + } } \ No newline at end of file diff --git a/src/engine/physics/ShapesManager.h b/src/engine/physics/ShapesManager.h index b1c8013c3..5f5bfb85b 100644 --- a/src/engine/physics/ShapesManager.h +++ b/src/engine/physics/ShapesManager.h @@ -20,13 +20,26 @@ namespace Atlas::Physics { template static T GetShapeSettings(ShapeRef shapeRef); + static void Update(); + private: + template + struct CacheItem { + Weak resource; + ShapeRef ref; + }; + static bool TryCreateShapeFromMesh(Shape* shape, const MeshShapeSettings& settings); static bool TryCreateShapeFromAABB(Shape* shape, const BoundingBoxShapeSettings& settings); static bool TryCreateShapeFromSphere(Shape* shape, const SphereShapeSettings& settings); static bool TryCreateShapeFromCapsule(Shape* shape, const CapsuleShapeSettings& settings); static bool TryCreateShapeFromHeightField(Shape* shape, const HeightFieldShapeSettings& settings); + static std::unordered_map> meshShapeCache; + static std::mutex meshShapeCacheMutex; + + static const float epsilon; + friend Shape; }; diff --git a/src/engine/postprocessing/PostProcessing.h b/src/engine/postprocessing/PostProcessing.h index c3c8c68e3..d12cd9ef9 100644 --- a/src/engine/postprocessing/PostProcessing.h +++ b/src/engine/postprocessing/PostProcessing.h @@ -17,6 +17,7 @@ namespace Atlas { public: float saturation = 1.0f; float contrast = 1.0f; + vec3 tint = vec3(1.0f); float screenMaxLuminance = 1000.0f; float paperWhiteLuminance = 150.0f; diff --git a/src/engine/postprocessing/PostProcessingSerializer.cpp b/src/engine/postprocessing/PostProcessingSerializer.cpp index f3bb22e09..3239151d2 100644 --- a/src/engine/postprocessing/PostProcessingSerializer.cpp +++ b/src/engine/postprocessing/PostProcessingSerializer.cpp @@ -72,6 +72,7 @@ namespace Atlas::PostProcessing { void to_json(json& j, const PostProcessing& p) { j = json { + {"tint", p.tint}, {"saturation", p.saturation}, {"contrast", p.contrast}, {"paperWhiteLuminance", p.paperWhiteLuminance}, @@ -87,6 +88,7 @@ namespace Atlas::PostProcessing { } void from_json(const json& j, PostProcessing& p) { + j.at("tint").get_to(p.tint); j.at("saturation").get_to(p.saturation); j.at("contrast").get_to(p.contrast); j.at("paperWhiteLuminance").get_to(p.paperWhiteLuminance); diff --git a/src/engine/postprocessing/Sharpen.h b/src/engine/postprocessing/Sharpen.h index 70c1b87a8..4de6ca357 100644 --- a/src/engine/postprocessing/Sharpen.h +++ b/src/engine/postprocessing/Sharpen.h @@ -14,7 +14,7 @@ namespace Atlas { Sharpen(float factor) : enable(true), factor(factor) {} bool enable = false; - float factor = 0.25f; + float factor = 0.5f; }; diff --git a/src/engine/raytracing/RayTracingWorld.cpp b/src/engine/raytracing/RayTracingWorld.cpp index 1ccdb731c..42e9831be 100644 --- a/src/engine/raytracing/RayTracingWorld.cpp +++ b/src/engine/raytracing/RayTracingWorld.cpp @@ -38,10 +38,13 @@ namespace Atlas { auto subset = scene->GetSubset(); if (!subset.Any()) return; + blases.clear(); + auto meshes = scene->GetMeshes(); + int32_t meshCount = 0; for (auto& mesh : meshes) { - if (!mesh.IsLoaded() || !mesh->IsBVHBuilt() || - !scene->meshIdToBindlessIdx.contains(mesh.GetID())) + // Only need to check for this, since that means that the BVH was built and the mesh is loaded + if (!scene->meshIdToBindlessIdx.contains(mesh.GetID())) continue; if (!meshInfos.contains(mesh.GetID())) { @@ -51,24 +54,41 @@ namespace Atlas { auto &meshInfo = meshInfos[mesh.GetID()]; meshInfo.offset = int32_t(scene->meshIdToBindlessIdx[mesh.GetID()]); + + // Some extra path for hardware raytracing, don't want to do work twice + if (hardwareRayTracing) { + if (mesh->needsBvhRefresh) { + blases.push_back(mesh->blas); + mesh->needsBvhRefresh = false; + } + + meshInfo.blas = mesh->blas; + meshInfo.idx = meshCount++; + } } - std::vector gpuBvhInstances; - std::vector actorAABBs; - std::vector lastMatrices; + if (hardwareRayTracing) { + Graphics::ASBuilder asBuilder; + if (!blases.empty()) + asBuilder.BuildBLAS(blases); + } for (auto& [_, meshInfo] : meshInfos) { meshInfo.instanceIndices.clear(); meshInfo.matrices.clear(); } + hardwareInstances.clear(); + gpuBvhInstances.clear(); + actorAABBs.clear(); + lastMatrices.clear(); + UpdateMaterials(); for (auto entity : subset) { - const auto& [meshComponent, transformComponent] = subset.Get(entity); - if (!meshInfos.contains(meshComponent.mesh.GetID())) + if (!scene->meshIdToBindlessIdx.contains(meshComponent.mesh.GetID())) continue; actorAABBs.push_back(meshComponent.aabb); @@ -85,14 +105,33 @@ namespace Atlas { meshInfo.matrices.emplace_back(transformComponent.globalMatrix); meshInfo.instanceIndices.push_back(uint32_t(gpuBvhInstances.size())); gpuBvhInstances.push_back(gpuBvhInstance); - lastMatrices.emplace_back(glm::transpose(transformComponent.lastGlobalMatrix)); + + if (includeObjectHistory) + lastMatrices.emplace_back(glm::transpose(transformComponent.lastGlobalMatrix)); + + // Some extra path for hardware raytracing, don't want to do work twice + if (hardwareRayTracing) { + VkAccelerationStructureInstanceKHR inst = {}; + VkTransformMatrixKHR transform; + + auto transposed = glm::transpose(transformComponent.globalMatrix); + std::memcpy(&transform, &transposed, sizeof(VkTransformMatrixKHR)); + + inst.transform = transform; + inst.instanceCustomIndex = meshInfo.offset; + inst.accelerationStructureReference = meshInfo.blas->bufferDeviceAddress; + inst.flags = VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR; + inst.mask = 0xFF; + inst.instanceShaderBindingTableRecordOffset = 0; + hardwareInstances.push_back(inst); + } } if (gpuBvhInstances.empty()) return; if (hardwareRayTracing) { - UpdateForHardwareRayTracing(subset); + UpdateForHardwareRayTracing(subset, gpuBvhInstances.size()); } else { UpdateForSoftwareRayTracing(gpuBvhInstances, lastMatrices, actorAABBs); @@ -103,11 +142,15 @@ namespace Atlas { if (bvhInstanceBuffer.GetElementCount() < gpuBvhInstances.size()) { bvhInstanceBuffer.SetSize(gpuBvhInstances.size()); - lastMatricesBuffer.SetSize(lastMatrices.size()); } + + if (lastMatricesBuffer.GetElementCount() < lastMatrices.size() && includeObjectHistory) + lastMatricesBuffer.SetSize(lastMatrices.size()); bvhInstanceBuffer.SetData(gpuBvhInstances.data(), 0, gpuBvhInstances.size()); - lastMatricesBuffer.SetData(lastMatrices.data(), 0, lastMatrices.size()); + + if (includeObjectHistory) + lastMatricesBuffer.SetData(lastMatrices.data(), 0, lastMatrices.size()); } @@ -235,7 +278,8 @@ namespace Atlas { std::vector orderedLastMatrices(bvh.refs.size()); for (size_t i = 0; i < bvh.refs.size(); i++) { const auto& ref = bvh.refs[i]; - orderedLastMatrices[i] = lastMatrices[bvh.refs[i].idx]; + if (includeObjectHistory) + orderedLastMatrices[i] = lastMatrices[bvh.refs[i].idx]; orderedGpuBvhInstances[i] = gpuBvhInstances[bvh.refs[i].idx]; orderedGpuBvhInstances[i].nextInstance = ref.endOfNode ? -1 : int32_t(i) + 1; } @@ -247,69 +291,21 @@ namespace Atlas { tlasNodeBuffer.SetData(gpuBvhNodes.data(), 0, gpuBvhNodes.size()); gpuBvhInstances = orderedGpuBvhInstances; - lastMatrices = orderedLastMatrices; + if (includeObjectHistory) + lastMatrices = orderedLastMatrices; } void RayTracingWorld::UpdateForHardwareRayTracing(Scene::Subset& entitySubset) { + TransformComponent>& entitySubset, size_t instanceCount) { auto device = Graphics::GraphicsDevice::DefaultDevice; Graphics::ASBuilder asBuilder; - - auto meshes = scene->GetMeshes(); - - blases.clear(); - - int32_t meshCount = 0; - for (auto& mesh : meshes) { - if (!meshInfos.contains(mesh.GetID())) - continue; - - if (mesh->needsBvhRefresh) { - blases.push_back(mesh->blas); - mesh->needsBvhRefresh = false; - } - - auto& meshInfo = meshInfos[mesh.GetID()]; - meshInfo.blas = mesh->blas; - meshInfo.idx = meshCount++; - } - - if (!blases.empty()) - asBuilder.BuildBLAS(blases); - - std::vector instances; - - for (auto entity : entitySubset) { - const auto& [meshComponent, transformComponent] = entitySubset.Get(entity); - - if (!meshInfos.contains(meshComponent.mesh.GetID())) - continue; - - const auto& meshInfo = meshInfos[meshComponent.mesh.GetID()]; - - VkAccelerationStructureInstanceKHR inst = {}; - VkTransformMatrixKHR transform; - - auto transposed = glm::transpose(transformComponent.globalMatrix); - std::memcpy(&transform, &transposed, sizeof(VkTransformMatrixKHR)); - - inst.transform = transform; - inst.instanceCustomIndex = meshInfo.offset; - inst.accelerationStructureReference = meshInfo.blas->bufferDeviceAddress; - inst.flags = VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR; - inst.mask = 0xFF; - inst.instanceShaderBindingTableRecordOffset = 0; - instances.push_back(inst); - } - auto tlasDesc = Graphics::TLASDesc(); tlas = device->CreateTLAS(tlasDesc); - asBuilder.BuildTLAS(tlas, instances); + asBuilder.BuildTLAS(tlas, hardwareInstances); } diff --git a/src/engine/raytracing/RayTracingWorld.h b/src/engine/raytracing/RayTracingWorld.h index 9f6f04cf5..62e216558 100644 --- a/src/engine/raytracing/RayTracingWorld.h +++ b/src/engine/raytracing/RayTracingWorld.h @@ -44,6 +44,8 @@ namespace Atlas { void Clear(); + bool includeObjectHistory = false; + private: struct MeshInfo { Ref blas = nullptr; @@ -64,7 +66,7 @@ namespace Atlas { std::vector& lastMatrices, std::vector& actorAABBs); void UpdateForHardwareRayTracing(Scene::Subset& entitySubset); + TransformComponent>& entitySubset, size_t instanceCount); void BuildTriangleLightsForMesh(ResourceHandle& mesh); @@ -80,6 +82,11 @@ namespace Atlas { Buffer::Buffer tlasNodeBuffer; Buffer::Buffer lastMatricesBuffer; + std::vector hardwareInstances; + std::vector gpuBvhInstances; + std::vector actorAABBs; + std::vector lastMatrices; + std::vector triangleLights; std::unordered_map meshInfos; diff --git a/src/engine/renderer/AORenderer.cpp b/src/engine/renderer/AORenderer.cpp index d5a0e8654..a4bbec31b 100644 --- a/src/engine/renderer/AORenderer.cpp +++ b/src/engine/renderer/AORenderer.cpp @@ -243,7 +243,7 @@ namespace Atlas { commandList->PipelineBarrier(imageBarriers, bufferBarriers); commandList->BindPipeline(horizontalBlurPipeline); - commandList->PushConstants("constants", &kernelSize); + commandList->PushConstants("constants", &kernelSize, sizeof(int32_t)); commandList->BindImage(target->swapAoTexture.image, 3, 0); commandList->BindImage(target->aoTexture.image, target->aoTexture.sampler, 3, 1); @@ -260,7 +260,7 @@ namespace Atlas { commandList->PipelineBarrier(imageBarriers, bufferBarriers); commandList->BindPipeline(verticalBlurPipeline); - commandList->PushConstants("constants", &kernelSize); + commandList->PushConstants("constants", &kernelSize, sizeof(int32_t)); commandList->BindImage(target->aoTexture.image, 3, 0); commandList->BindImage(target->swapAoTexture.image, target->swapAoTexture.sampler, 3, 1); diff --git a/src/engine/renderer/DDGIRenderer.cpp b/src/engine/renderer/DDGIRenderer.cpp index 536c5bea9..f920db539 100644 --- a/src/engine/renderer/DDGIRenderer.cpp +++ b/src/engine/renderer/DDGIRenderer.cpp @@ -27,6 +27,11 @@ namespace Atlas { irradianceCopyEdgePipelineConfig = PipelineConfig("ddgi/copyEdge.csh", {"IRRADIANCE"}); momentsCopyEdgePipelineConfig = PipelineConfig("ddgi/copyEdge.csh"); + probeDebugMaterial = CreateRef(); + probeDebugActiveMaterial = CreateRef(); + probeDebugInactiveMaterial = CreateRef(); + probeDebugOffsetMaterial = CreateRef(); + auto samplerDesc = Graphics::SamplerDesc { .filter = VK_FILTER_NEAREST, .mode = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, @@ -128,6 +133,7 @@ namespace Atlas { auto &shadowUniform = uniforms.shadow; shadowUniform.distance = !shadow->longRange ? shadow->distance : shadow->longRangeDistance; shadowUniform.bias = shadow->bias; + shadowUniform.edgeSoftness = shadow->edgeSoftness; shadowUniform.cascadeBlendDistance = shadow->cascadeBlendDistance; shadowUniform.cascadeCount = shadow->viewCount; shadowUniform.resolution = vec2(shadow->resolution); @@ -226,7 +232,7 @@ namespace Atlas { groupCount.x += ((groupCount.x * 8 == res.x) ? 0 : 1); groupCount.y += ((groupCount.y * 8 == res.y) ? 0 : 1); - commandList->PushConstants("constants", &probeRes); + commandList->PushConstants("constants", &probeRes, sizeof(int32_t)); commandList->BindImage(irradianceArray.image, 3, 0); commandList->Dispatch(groupCount.x, groupCount.y, probeCount.z); @@ -244,7 +250,7 @@ namespace Atlas { groupCount.x += ((groupCount.x * 8 == res.x) ? 0 : 1); groupCount.y += ((groupCount.y * 8 == res.y) ? 0 : 1); - commandList->PushConstants("constants", &probeRes); + commandList->PushConstants("constants", &probeRes, sizeof(int32_t)); commandList->BindImage(momentsArray.image, 3, 0); commandList->Dispatch(groupCount.x, groupCount.y, probeCount.z); @@ -274,6 +280,19 @@ namespace Atlas { if (!volume || !volume->enable || !volume->update || !volume->debug) return; + // Need additional barrier, since in the normal case DDGI is made to be sampled just in compute shader + auto& internalVolume = volume->internal; + auto [irradianceArray, momentsArray] = internalVolume.GetCurrentProbes(); + + commandList->ImageMemoryBarrier(irradianceArray.image, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, + VK_ACCESS_SHADER_READ_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); + commandList->ImageMemoryBarrier(momentsArray.image, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, + VK_ACCESS_SHADER_READ_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); + + // Need to rebind after barrier + commandList->BindImage(irradianceArray.image, irradianceArray.sampler, 2, 24); + commandList->BindImage(momentsArray.image, momentsArray.sampler, 2, 25); + auto shaderConfig = ShaderConfig { {"ddgi/probeDebug.vsh", VK_SHADER_STAGE_VERTEX_BIT}, {"ddgi/probeDebug.fsh", VK_SHADER_STAGE_FRAGMENT_BIT}, @@ -288,17 +307,17 @@ namespace Atlas { auto pipeline = PipelineManager::GetPipeline(pipelineConfig); commandList->BindPipeline(pipeline); - probeDebugActiveMaterial.emissiveColor = vec3(0.0f, 1.0f, 0.0f); - probeDebugInactiveMaterial.emissiveColor = vec3(1.0f, 0.0f, 0.0f); - probeDebugOffsetMaterial.emissiveColor = vec3(0.0f, 0.0f, 1.0f); + probeDebugActiveMaterial->emissiveColor = vec3(0.0f, 1.0f, 0.0f); + probeDebugInactiveMaterial->emissiveColor = vec3(1.0f, 0.0f, 0.0f); + probeDebugOffsetMaterial->emissiveColor = vec3(0.0f, 0.0f, 1.0f); sphereArray.Bind(commandList); ProbeDebugConstants constants = { - .probeMaterialIdx = uint32_t(materialMap[&probeDebugMaterial]), - .probeActiveMaterialIdx = uint32_t(materialMap[&probeDebugActiveMaterial]), - .probeInactiveMaterialIdx = uint32_t(materialMap[&probeDebugInactiveMaterial]), - .probeOffsetMaterialIdx = uint32_t(materialMap[&probeDebugOffsetMaterial]) + .probeMaterialIdx = uint32_t(materialMap[probeDebugMaterial.get()]), + .probeActiveMaterialIdx = uint32_t(materialMap[probeDebugActiveMaterial.get()]), + .probeInactiveMaterialIdx = uint32_t(materialMap[probeDebugInactiveMaterial.get()]), + .probeOffsetMaterialIdx = uint32_t(materialMap[probeDebugOffsetMaterial.get()]) }; commandList->PushConstants("constants", &constants); diff --git a/src/engine/renderer/DDGIRenderer.h b/src/engine/renderer/DDGIRenderer.h index 407c2c9f2..65f9bb360 100644 --- a/src/engine/renderer/DDGIRenderer.h +++ b/src/engine/renderer/DDGIRenderer.h @@ -24,10 +24,10 @@ namespace Atlas { std::unordered_map& materialMap); // Used for debugging - Material probeDebugMaterial; - Material probeDebugActiveMaterial; - Material probeDebugInactiveMaterial; - Material probeDebugOffsetMaterial; + Ref probeDebugMaterial; + Ref probeDebugActiveMaterial; + Ref probeDebugInactiveMaterial; + Ref probeDebugOffsetMaterial; private: struct alignas(16) RayGenUniforms { diff --git a/src/engine/renderer/DirectLightRenderer.cpp b/src/engine/renderer/DirectLightRenderer.cpp index 695babab6..3c99ed226 100644 --- a/src/engine/renderer/DirectLightRenderer.cpp +++ b/src/engine/renderer/DirectLightRenderer.cpp @@ -57,6 +57,7 @@ namespace Atlas { auto& shadowUniform = lightUniform.shadow; shadowUniform.distance = !shadow->longRange ? shadow->distance : shadow->longRangeDistance; shadowUniform.bias = shadow->bias; + shadowUniform.edgeSoftness = shadow->edgeSoftness; shadowUniform.cascadeBlendDistance = shadow->cascadeBlendDistance; shadowUniform.cascadeCount = shadow->viewCount; shadowUniform.resolution = vec2(shadow->resolution); diff --git a/src/engine/renderer/ExampleRenderer.h b/src/engine/renderer/ExampleRenderer.h index 332bbdb6c..2f872fb02 100644 --- a/src/engine/renderer/ExampleRenderer.h +++ b/src/engine/renderer/ExampleRenderer.h @@ -33,7 +33,7 @@ namespace Atlas { ResourceHandle mesh; - struct PushConstants { + struct alignas(16) PushConstants { mat4 vMatrix; mat4 pMatrix; }; @@ -43,7 +43,7 @@ namespace Atlas { mat4 pMatrix; }; - struct ComputeConstants { + struct alignas(16) ComputeConstants { float randomSeed; float time; }; @@ -52,4 +52,4 @@ namespace Atlas { } -} \ No newline at end of file +} diff --git a/src/engine/renderer/FSR2Renderer.cpp b/src/engine/renderer/FSR2Renderer.cpp index 40030924e..42df386de 100644 --- a/src/engine/renderer/FSR2Renderer.cpp +++ b/src/engine/renderer/FSR2Renderer.cpp @@ -512,7 +512,9 @@ namespace Atlas::Renderer { auto binding = job->computeJobDescriptor.pipeline.uavResourceBindings[uav].slotIndex; auto mipLevel = job->computeJobDescriptor.uavMip[uav]; - commandList->BindImage(image, 1, binding, image->mipMapViews.empty() ? -1 : mipLevel); + + int32_t selectedMipLevel = std::min(int32_t(mipLevel), int32_t(image->mipMapViews.size()) - 1); + commandList->BindImage(image, 1, binding, selectedMipLevel); } for (uint32_t srv = 0; srv < job->computeJobDescriptor.pipeline.srvCount; ++srv) { @@ -843,8 +845,8 @@ namespace Atlas::Renderer { //dispatchParameters.transparencyAndComposition = GetTextureResource(&context, nullptr, nullptr, 1, 1, VK_FORMAT_UNDEFINED, L"FSR2_EmptyTransparencyAndCompositionMap", FFX_RESOURCE_STATE_COMPUTE_READ); dispatchParameters.output = GetResource(outputImage, L"FSR2_OutputUpscaledColor", FFX_RESOURCE_STATE_UNORDERED_ACCESS); - dispatchParameters.jitterOffset.x = camera.GetJitter().x * float(target->GetScaledWidth()) * taa.jitterRange; - dispatchParameters.jitterOffset.y = camera.GetJitter().y * float(target->GetScaledHeight()) * taa.jitterRange; + dispatchParameters.jitterOffset.x = camera.GetJitter().x * float(target->GetScaledWidth()) * 0.5f; + dispatchParameters.jitterOffset.y = camera.GetJitter().y * float(target->GetScaledHeight()) * 0.5f; dispatchParameters.motionVectorScale.x = float(target->GetScaledWidth()); dispatchParameters.motionVectorScale.y = float(target->GetScaledHeight()); dispatchParameters.reset = false; @@ -862,7 +864,8 @@ namespace Atlas::Renderer { AE_ASSERT(errorCode == FFX_OK); commandList->ImageMemoryBarrier(outputImage, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, - VK_ACCESS_SHADER_READ_BIT); + VK_ACCESS_SHADER_READ_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, + VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT); Graphics::Profiler::EndQuery(); @@ -943,4 +946,4 @@ namespace Atlas::Renderer { } -} \ No newline at end of file +} diff --git a/src/engine/renderer/GIRenderer.cpp b/src/engine/renderer/GIRenderer.cpp index 9078f1873..f2685b04e 100644 --- a/src/engine/renderer/GIRenderer.cpp +++ b/src/engine/renderer/GIRenderer.cpp @@ -255,7 +255,7 @@ namespace Atlas { commandList->PipelineBarrier(imageBarriers, bufferBarriers); commandList->BindPipeline(horizontalBlurPipeline); - commandList->PushConstants("constants", &kernelSize); + commandList->PushConstants("constants", &kernelSize, sizeof(int32_t)); commandList->BindImage(target->swapGiTexture.image, 3, 0); commandList->BindImage(target->giTexture.image, target->giTexture.sampler, 3, 1); @@ -272,7 +272,7 @@ namespace Atlas { commandList->PipelineBarrier(imageBarriers, bufferBarriers); commandList->BindPipeline(verticalBlurPipeline); - commandList->PushConstants("constants", &kernelSize); + commandList->PushConstants("constants", &kernelSize, sizeof(int32_t)); commandList->BindImage(target->giTexture.image, 3, 0); commandList->BindImage(target->swapGiTexture.image, target->swapGiTexture.sampler, 3, 1); diff --git a/src/engine/renderer/MainRenderer.cpp b/src/engine/renderer/MainRenderer.cpp index 4296ad930..35dd1a03d 100644 --- a/src/engine/renderer/MainRenderer.cpp +++ b/src/engine/renderer/MainRenderer.cpp @@ -76,7 +76,7 @@ namespace Atlas { void MainRenderer::RenderScene(Ref viewport, Ref target, Ref scene, Ref primitiveBatch, Texture::Texture2D* texture) { - if (!device->swapChain->isComplete || !scene->HasMainCamera()) + if (!device->swapChain->isComplete || !scene->HasMainCamera()) return; auto& camera = scene->GetMainCamera(); @@ -107,16 +107,23 @@ namespace Atlas { Graphics::Profiler::BeginThread("Main renderer", commandList); Graphics::Profiler::BeginQuery("Render scene"); - FillRenderList(scene, camera); + auto fillRenderListFuture = std::async(std::launch::async, [&]() { FillRenderList(scene, camera); }); std::vector materials; std::unordered_map materialMap; - - PrepareMaterials(scene, materials, materialMap); + auto prepareMaterialsFuture = std::async(std::launch::async,[&]() { PrepareMaterials(scene, materials, materialMap); }); std::vector> images; std::vector> blasBuffers, triangleBuffers, bvhTriangleBuffers, triangleOffsetBuffers; - PrepareBindlessData(scene, images, blasBuffers, triangleBuffers, bvhTriangleBuffers, triangleOffsetBuffers); + auto prepareBindlessFuture = std::async(std::launch::async,[&]() { + PrepareBindlessData(scene, images, blasBuffers, triangleBuffers, bvhTriangleBuffers, triangleOffsetBuffers); + }); + + if (scene->rayTracingWorldUpdateFuture.valid()) + scene->rayTracingWorldUpdateFuture.get(); + fillRenderListFuture.get(); + prepareMaterialsFuture.get(); + prepareBindlessFuture.get(); SetUniforms(target, scene, camera); @@ -336,11 +343,28 @@ namespace Atlas { // This was needed after the ocean renderer, if we ever want to have alpha transparency we need it again // downscaleRenderer.Downscale(target, commandList); - commandList->BeginRenderPass(target->afterLightingRenderPass, target->afterLightingFrameBuffer); + { + commandList->BeginRenderPass(target->afterLightingRenderPass, target->afterLightingFrameBuffer); + + textRenderer.Render(target, scene, commandList); + + commandList->EndRenderPass(); + + auto rtData = target->GetHistoryData(FULL_RES); + + VkImageLayout layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + VkAccessFlags access = VK_ACCESS_SHADER_READ_BIT; - textRenderer.Render(target, scene, commandList); + std::vector bufferBarriers; + std::vector imageBarriers = { + {target->lightingTexture.image, layout, access}, + {rtData->depthTexture->image, layout, access}, + {rtData->velocityTexture->image, layout, access}, + }; + + commandList->PipelineBarrier(imageBarriers, bufferBarriers, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT); - commandList->EndRenderPass(); + } { volumetricCloudRenderer.Render(target, scene, commandList); @@ -425,7 +449,13 @@ namespace Atlas { std::vector> images; std::vector> blasBuffers, triangleBuffers, bvhTriangleBuffers, triangleOffsetBuffers; - PrepareBindlessData(scene, images, blasBuffers, triangleBuffers, bvhTriangleBuffers, triangleOffsetBuffers); + auto prepareBindlessFuture = std::async(std::launch::async, [&]() { + PrepareBindlessData(scene, images, blasBuffers, triangleBuffers, bvhTriangleBuffers, triangleOffsetBuffers); + }); + + if (scene->rayTracingWorldUpdateFuture.valid()) + scene->rayTracingWorldUpdateFuture.get(); + prepareBindlessFuture.get(); commandList->BindBuffer(pathTraceGlobalUniformBuffer, 1, 31); commandList->BindImage(dfgPreintegrationTexture.image, dfgPreintegrationTexture.sampler, 1, 12); @@ -491,6 +521,21 @@ namespace Atlas { batch->TransferData(); + auto rtData = target->GetData(FULL_RES); + + VkImageLayout layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + VkAccessFlags access = VK_ACCESS_SHADER_READ_BIT; + + std::vector bufferBarriers; + std::vector imageBarriers = { + {target->lightingTexture.image, layout, access}, + {rtData->depthTexture->image, layout, access}, + {rtData->velocityTexture->image, layout, access}, + }; + + commandList->PipelineBarrier(imageBarriers, bufferBarriers, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, + VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); + commandList->BeginRenderPass(target->afterLightingRenderPass, target->afterLightingFrameBuffer); if (batch->GetLineCount()) { @@ -527,6 +572,14 @@ namespace Atlas { commandList->EndRenderPass(); + imageBarriers = { + {target->lightingTexture.image, layout, access}, + {rtData->depthTexture->image, layout, access}, + {rtData->velocityTexture->image, layout, access}, + }; + commandList->PipelineBarrier(imageBarriers, bufferBarriers, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, + VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT); + if (localCommandList) { commandList->EndCommands(); @@ -768,7 +821,7 @@ namespace Atlas { pipelineConfig = PipelineConfig("brdf/filterProbe.csh", { "FILTER_SPECULAR" }); pipeline = PipelineManager::GetPipeline(pipelineConfig); - struct PushConstants { + struct alignas(16) PushConstants { int cubeMapMipLevels; float roughness; uint32_t mipLevel; @@ -956,10 +1009,10 @@ namespace Atlas { // For debugging purpose if (scene->irradianceVolume && scene->irradianceVolume->debug) { - sceneMaterials.push_back(CreateRef(ddgiRenderer.probeDebugMaterial)); - sceneMaterials.push_back(CreateRef(ddgiRenderer.probeDebugActiveMaterial)); - sceneMaterials.push_back(CreateRef(ddgiRenderer.probeDebugInactiveMaterial)); - sceneMaterials.push_back(CreateRef(ddgiRenderer.probeDebugOffsetMaterial)); + sceneMaterials.push_back(ddgiRenderer.probeDebugMaterial); + sceneMaterials.push_back(ddgiRenderer.probeDebugActiveMaterial); + sceneMaterials.push_back(ddgiRenderer.probeDebugInactiveMaterial); + sceneMaterials.push_back(ddgiRenderer.probeDebugOffsetMaterial); } uint16_t idx = 0; @@ -1101,10 +1154,13 @@ namespace Atlas { void MainRenderer::FillRenderList(Ref scene, const CameraComponent& camera) { renderList.NewFrame(scene); - renderList.NewMainPass(); - scene->GetRenderList(camera.frustum, renderList); - renderList.Update(camera.GetLocation()); + auto mainPass = renderList.GetMainPass(); + if (mainPass == nullptr) + mainPass = renderList.NewMainPass(); + + scene->GetRenderList(camera.frustum, renderList, mainPass); + renderList.Update(mainPass, camera.GetLocation()); auto lightSubset = scene->GetSubset(); @@ -1123,9 +1179,11 @@ namespace Atlas { auto component = &shadow->views[i]; auto frustum = Volume::Frustum(component->frustumMatrix); - renderList.NewShadowPass(lightEntity, i); - scene->GetRenderList(frustum, renderList); - renderList.Update(camera.GetLocation()); + auto shadowPass = renderList.GetShadowPass(lightEntity, i); + if (shadowPass == nullptr) + shadowPass = renderList.NewShadowPass(lightEntity, i); + scene->GetRenderList(frustum, renderList, shadowPass); + renderList.Update(shadowPass, camera.GetLocation()); } } diff --git a/src/engine/renderer/OceanRenderer.cpp b/src/engine/renderer/OceanRenderer.cpp index de22b7f74..1ac1c1e79 100644 --- a/src/engine/renderer/OceanRenderer.cpp +++ b/src/engine/renderer/OceanRenderer.cpp @@ -76,6 +76,7 @@ namespace Atlas { auto& shadowUniform = lightUniform.shadow; shadowUniform.distance = distance; shadowUniform.bias = shadow->bias; + shadowUniform.edgeSoftness = shadow->edgeSoftness; shadowUniform.cascadeCount = shadow->viewCount; shadowUniform.cascadeBlendDistance = shadow->cascadeBlendDistance; shadowUniform.resolution = vec2(shadow->resolution); @@ -153,7 +154,7 @@ namespace Atlas { commandList->ImageMemoryBarrier(lightingImage, VK_IMAGE_LAYOUT_GENERAL, VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT); - commandList->PushConstants("constants", &ocean->translation.y); + commandList->PushConstants("constants", &ocean->translation.y, sizeof(float)); commandList->Dispatch(groupCount.x, groupCount.y, 1); } diff --git a/src/engine/renderer/OpaqueRenderer.cpp b/src/engine/renderer/OpaqueRenderer.cpp index 296462c53..a380427fb 100644 --- a/src/engine/renderer/OpaqueRenderer.cpp +++ b/src/engine/renderer/OpaqueRenderer.cpp @@ -48,10 +48,13 @@ namespace Atlas { subData1.first->material->mainConfig.variantHash; }); - size_t prevHash = 0; + Hash prevMesh = 0; + Hash prevHash = 0; Ref currentPipeline; - ResourceHandle prevMesh; for (auto [subData, mesh] : subDatas) { + auto& instance = mainPass->meshToInstancesMap[mesh.GetID()]; + if (!instance.count) continue; + auto material = subData->material; if (material->mainConfig.variantHash != prevHash) { currentPipeline = PipelineManager::GetPipeline(material->mainConfig); @@ -59,14 +62,11 @@ namespace Atlas { prevHash = material->mainConfig.variantHash; } - if (mesh.GetID() != prevMesh.GetID()) { + if (mesh.GetID() != prevMesh) { mesh->vertexArray.Bind(commandList); - prevMesh = mesh; + prevMesh = mesh.GetID(); } - auto& instance = mainPass->meshToInstancesMap[mesh.GetID()]; - if(!instance.count) continue; - if (material->HasBaseColorMap()) material->baseColorMap->Bind(commandList, 3, 0); if (material->HasOpacityMap()) diff --git a/src/engine/renderer/OpaqueRenderer.h b/src/engine/renderer/OpaqueRenderer.h index 99ec14769..3bbe3ddf0 100644 --- a/src/engine/renderer/OpaqueRenderer.h +++ b/src/engine/renderer/OpaqueRenderer.h @@ -25,7 +25,7 @@ namespace Atlas { PipelineConfig GetPipelineConfigForSubData(Mesh::MeshSubData* subData, const ResourceHandle& mesh, Ref target); - struct PushConstants { + struct alignas(16) PushConstants { uint32_t vegetation; uint32_t invertUVs; uint32_t twoSided; @@ -44,4 +44,4 @@ namespace Atlas { } -} \ No newline at end of file +} diff --git a/src/engine/renderer/PathTracingRenderer.cpp b/src/engine/renderer/PathTracingRenderer.cpp index ee3482247..f90f21612 100644 --- a/src/engine/renderer/PathTracingRenderer.cpp +++ b/src/engine/renderer/PathTracingRenderer.cpp @@ -282,6 +282,8 @@ namespace Atlas { commandList->ImageTransition(renderTarget->texture.image, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_ACCESS_SHADER_READ_BIT); + commandList->ImageTransition(renderTarget->radianceTexture.image, + VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_ACCESS_SHADER_READ_BIT); helper.InvalidateRayBuffer(commandList); diff --git a/src/engine/renderer/PathTracingRenderer.h b/src/engine/renderer/PathTracingRenderer.h index 84afecdbe..6f47f2de1 100644 --- a/src/engine/renderer/PathTracingRenderer.h +++ b/src/engine/renderer/PathTracingRenderer.h @@ -38,7 +38,7 @@ namespace Atlas { int32_t realTimeSamplesPerFrame = 4; int32_t historyLengthMax = 32; - float historyClipMax = 0.1f; + float historyClipMax = 0.6f; float currentClipFactor = 2.0f; float maxRadiance = 65535.0f; diff --git a/src/engine/renderer/PostProcessRenderer.cpp b/src/engine/renderer/PostProcessRenderer.cpp index 80c70dff7..cc18d4098 100644 --- a/src/engine/renderer/PostProcessRenderer.cpp +++ b/src/engine/renderer/PostProcessRenderer.cpp @@ -73,7 +73,7 @@ namespace Atlas { commandList->BindPipeline(pipeline); - auto& image = writeTexture->image; + const auto& image = writeTexture->image; commandList->ImageMemoryBarrier(image, VK_IMAGE_LAYOUT_GENERAL, VK_ACCESS_SHADER_WRITE_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT); @@ -101,7 +101,7 @@ namespace Atlas { commandList->BindPipeline(pipeline); - auto& image = writeTexture->image; + const auto& image = writeTexture->image; commandList->ImageMemoryBarrier(image, VK_IMAGE_LAYOUT_GENERAL, VK_ACCESS_SHADER_WRITE_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT); @@ -109,7 +109,9 @@ namespace Atlas { commandList->BindImage(image, 3, 0); readTexture->Bind(commandList, 3, 1); - commandList->PushConstants("constants", &sharpen.factor); + // Reduce the sharpening to bring it more in line with FSR2 sharpening + float sharpenFactor = sharpen.factor * 0.5f; + commandList->PushConstants("constants", &sharpenFactor, sizeof(float)); commandList->Dispatch(groupCount.x, groupCount.y, 1); @@ -194,7 +196,7 @@ namespace Atlas { groupCount.x += ((groupCount.x * 8 == resolution.x) ? 0 : 1); groupCount.y += ((groupCount.y * 8 == resolution.y) ? 0 : 1); - auto& image = target->historyPostProcessTexture.image; + const auto& image = target->historyPostProcessTexture.image; commandList->ImageMemoryBarrier(image, VK_IMAGE_LAYOUT_GENERAL, VK_ACCESS_SHADER_WRITE_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, @@ -209,7 +211,9 @@ namespace Atlas { target->radianceTexture.Bind(commandList, 3, 1); } - commandList->PushConstants("constants", &sharpen.factor); + // Reduce the sharpening to bring it more in line with FSR2 sharpening + float sharpenFactor = sharpen.factor * 0.5f; + commandList->PushConstants("constants", &sharpenFactor, sizeof(float)); commandList->Dispatch(groupCount.x, groupCount.y, 1); @@ -315,7 +319,8 @@ namespace Atlas { .paperWhiteLuminance = postProcessing.paperWhiteLuminance, .maxScreenLuminance = postProcessing.screenMaxLuminance, .saturation = postProcessing.saturation, - .contrast = postProcessing.contrast + .contrast = postProcessing.contrast, + .tintColor = vec4(postProcessing.tint, 1.0f) }; if (chromaticAberration.enable) { @@ -330,7 +335,7 @@ namespace Atlas { uniforms.vignetteOffset = vignette.offset; uniforms.vignettePower = vignette.power; uniforms.vignetteStrength = vignette.strength; - uniforms.vignetteColor = vec4(Common::ColorConverter::ConvertSRGBToLinear(vignette.color), 0.0f); + uniforms.vignetteColor = vec4(vignette.color, 0.0f); } if (filmGrain.enable) { diff --git a/src/engine/renderer/PostProcessRenderer.h b/src/engine/renderer/PostProcessRenderer.h index 761b5c0ac..9af21337f 100644 --- a/src/engine/renderer/PostProcessRenderer.h +++ b/src/engine/renderer/PostProcessRenderer.h @@ -36,6 +36,7 @@ namespace Atlas { float vignettePower; float vignetteStrength; vec4 vignetteColor; + vec4 tintColor; }; void CopyToTexture(Texture::Texture2D* sourceTexture, Texture::Texture2D* texture, diff --git a/src/engine/renderer/RTReflectionRenderer.cpp b/src/engine/renderer/RTReflectionRenderer.cpp index 49b2c759f..0849ad22b 100644 --- a/src/engine/renderer/RTReflectionRenderer.cpp +++ b/src/engine/renderer/RTReflectionRenderer.cpp @@ -113,6 +113,7 @@ namespace Atlas { auto& shadowUniform = uniforms.shadow; shadowUniform.distance = !shadow->longRange ? shadow->distance : shadow->longRangeDistance; shadowUniform.bias = shadow->bias; + shadowUniform.edgeSoftness = shadow->edgeSoftness; shadowUniform.cascadeBlendDistance = shadow->cascadeBlendDistance; shadowUniform.cascadeCount = shadow->viewCount; shadowUniform.resolution = vec2(shadow->resolution); diff --git a/src/engine/renderer/ShadowRenderer.cpp b/src/engine/renderer/ShadowRenderer.cpp index 83a72ce37..c1285b137 100644 --- a/src/engine/renderer/ShadowRenderer.cpp +++ b/src/engine/renderer/ShadowRenderer.cpp @@ -74,7 +74,6 @@ namespace Atlas { // Retrieve all possible materials std::vector>> subDatas; for (auto& [meshId, _] : shadowPass->meshToInstancesMap) { - auto mesh = shadowPass->meshIdToMeshMap[meshId]; for (auto& subData : mesh->data.subData) { subDatas.push_back({ &subData, mesh }); @@ -98,8 +97,11 @@ namespace Atlas { size_t prevHash = 0; Ref currentPipeline = nullptr; - ResourceHandle prevMesh; - for (auto [subData, mesh] : subDatas) { + Hash prevMesh = 0; + for (auto& [subData, mesh] : subDatas) { + auto& instance = shadowPass->meshToInstancesMap[mesh.GetID()]; + if (!instance.count) continue; + auto material = subData->material; if (material->shadowConfig.variantHash != prevHash) { currentPipeline = PipelineManager::GetPipeline(material->shadowConfig); @@ -107,12 +109,10 @@ namespace Atlas { prevHash = material->shadowConfig.variantHash; } - if (mesh.GetID() != prevMesh.GetID()) { + if (mesh.GetID() != prevMesh) { mesh->vertexArray.Bind(commandList); - prevMesh = mesh; - } - - auto& instance = shadowPass->meshToInstancesMap[mesh.GetID()]; + prevMesh = mesh.GetID(); + } if (material->HasOpacityMap()) commandList->BindImage(material->opacityMap->image, material->opacityMap->sampler, 3, 0); @@ -129,14 +129,13 @@ namespace Atlas { }; commandList->PushConstants("constants", &pushConstants); - if(!instance.count) continue; commandList->DrawIndexed(subData->indicesCount, instance.count, subData->indicesOffset, 0, instance.offset); } impostorRenderer.Render(frameBuffer, renderList, commandList, - shadowPass, component->viewMatrix, component->projectionMatrix, lightLocation); + shadowPass.get(), component->viewMatrix, component->projectionMatrix, lightLocation); commandList->EndRenderPass(); diff --git a/src/engine/renderer/ShadowRenderer.h b/src/engine/renderer/ShadowRenderer.h index 1934cc94f..e959c338c 100644 --- a/src/engine/renderer/ShadowRenderer.h +++ b/src/engine/renderer/ShadowRenderer.h @@ -29,7 +29,7 @@ namespace Atlas { using LightMap = std::map>; - struct PushConstants { + struct alignas(16) PushConstants { mat4 lightSpaceMatrix; uint32_t vegetation; uint32_t invertUVs; @@ -46,4 +46,4 @@ namespace Atlas { } -} \ No newline at end of file +} diff --git a/src/engine/renderer/TemporalAARenderer.h b/src/engine/renderer/TemporalAARenderer.h index e0fa0f930..9c93d25a4 100644 --- a/src/engine/renderer/TemporalAARenderer.h +++ b/src/engine/renderer/TemporalAARenderer.h @@ -20,7 +20,7 @@ namespace Atlas { void Render(Ref target, Ref scene, Graphics::CommandList* commandList); private: - struct PushConstants { + struct alignas(16) PushConstants { vec2 resolution; vec2 invResolution; vec2 jitter; @@ -36,4 +36,4 @@ namespace Atlas { } -} \ No newline at end of file +} diff --git a/src/engine/renderer/VegetationRenderer.cpp b/src/engine/renderer/VegetationRenderer.cpp index 804e51d63..19bbc4865 100644 --- a/src/engine/renderer/VegetationRenderer.cpp +++ b/src/engine/renderer/VegetationRenderer.cpp @@ -20,7 +20,7 @@ namespace Atlas { void VegetationRenderer::Render(Ref target, Ref scene, Graphics::CommandList* commandList, std::unordered_map materialMap) { - struct PushConstants { + struct alignas(16) PushConstants { uint32_t invertUVs; uint32_t twoSided; uint32_t materialIdx; @@ -202,4 +202,4 @@ namespace Atlas { } -} \ No newline at end of file +} diff --git a/src/engine/renderer/VolumetricCloudRenderer.cpp b/src/engine/renderer/VolumetricCloudRenderer.cpp index 15621f441..47d8a8177 100644 --- a/src/engine/renderer/VolumetricCloudRenderer.cpp +++ b/src/engine/renderer/VolumetricCloudRenderer.cpp @@ -246,7 +246,7 @@ namespace Atlas { commandList->BindPipeline(pipeline); auto randomFloat = Common::Random::SampleUniformFloat() * 10.0f; - commandList->PushConstants("constants", &randomFloat); + commandList->PushConstants("constants", &randomFloat, sizeof(float)); commandList->ImageMemoryBarrier(texture->image, VK_IMAGE_LAYOUT_GENERAL, VK_ACCESS_SHADER_WRITE_BIT); @@ -274,7 +274,7 @@ namespace Atlas { commandList->BindPipeline(pipeline); auto randomFloat = Common::Random::SampleUniformFloat() * 10.0f; - commandList->PushConstants("constants", &randomFloat); + commandList->PushConstants("constants", &randomFloat, sizeof(float)); commandList->ImageMemoryBarrier(texture->image, VK_IMAGE_LAYOUT_GENERAL, VK_ACCESS_SHADER_WRITE_BIT); diff --git a/src/engine/renderer/VolumetricRenderer.cpp b/src/engine/renderer/VolumetricRenderer.cpp index f07dd1dc3..9024baa03 100644 --- a/src/engine/renderer/VolumetricRenderer.cpp +++ b/src/engine/renderer/VolumetricRenderer.cpp @@ -86,6 +86,7 @@ namespace Atlas { if (light.shadow) { uniforms.light.shadow.cascadeCount = shadow->viewCount; + uniforms.light.shadow.edgeSoftness = shadow->edgeSoftness; commandList->BindImage(shadow->maps.image, shadowSampler, 3, 2); @@ -210,7 +211,7 @@ namespace Atlas { commandList->PipelineBarrier(imageBarriers, bufferBarriers); commandList->BindPipeline(horizontalBlurPipeline); - commandList->PushConstants("constants", &kernelSize); + commandList->PushConstants("constants", &kernelSize, sizeof(int32_t)); commandList->BindImage(target->swapVolumetricTexture.image, 3, 0); commandList->BindImage(target->volumetricTexture.image, target->volumetricTexture.sampler, 3, 1); @@ -227,7 +228,7 @@ namespace Atlas { commandList->PipelineBarrier(imageBarriers, bufferBarriers); commandList->BindPipeline(verticalBlurPipeline); - commandList->PushConstants("constants", &kernelSize); + commandList->PushConstants("constants", &kernelSize, sizeof(int32_t)); commandList->BindImage(target->volumetricTexture.image, 3, 0); commandList->BindImage(target->swapVolumetricTexture.image, target->swapVolumetricTexture.sampler, 3, 1); diff --git a/src/engine/renderer/helper/CommonStructures.h b/src/engine/renderer/helper/CommonStructures.h index 610740cf9..30def4a6f 100644 --- a/src/engine/renderer/helper/CommonStructures.h +++ b/src/engine/renderer/helper/CommonStructures.h @@ -18,11 +18,11 @@ namespace Atlas { float distance; float bias; + float edgeSoftness; float cascadeBlendDistance; int cascadeCount; - float aligment0; float aligment1; vec2 resolution; diff --git a/src/engine/renderer/helper/RayTracingHelper.cpp b/src/engine/renderer/helper/RayTracingHelper.cpp index 40178fd76..e6ea9fc25 100644 --- a/src/engine/renderer/helper/RayTracingHelper.cpp +++ b/src/engine/renderer/helper/RayTracingHelper.cpp @@ -117,7 +117,8 @@ namespace Atlas { rtData->materialBuffer.Bind(commandList, 2, 7); rtData->bvhInstanceBuffer.Bind(commandList, 2, 21); - rtData->lastMatricesBuffer.Bind(commandList, 2, 27); + if (rtData->includeObjectHistory) + rtData->lastMatricesBuffer.Bind(commandList, 2, 27); lightBuffer.Bind(commandList, 2, 11); if (rtData->hardwareRayTracing) { @@ -238,7 +239,8 @@ namespace Atlas { rtData->materialBuffer.Bind(commandList, 2, 7); rtData->bvhInstanceBuffer.Bind(commandList, 2, 21); - rtData->lastMatricesBuffer.Bind(commandList, 2, 27); + if (rtData->includeObjectHistory) + rtData->lastMatricesBuffer.Bind(commandList, 2, 27); lightBuffer.Bind(commandList, 2, 11); if (rtData->hardwareRayTracing) { diff --git a/src/engine/renderer/helper/VegetationHelper.cpp b/src/engine/renderer/helper/VegetationHelper.cpp index 762bab57c..3de59d36a 100644 --- a/src/engine/renderer/helper/VegetationHelper.cpp +++ b/src/engine/renderer/helper/VegetationHelper.cpp @@ -34,7 +34,7 @@ namespace Atlas { void VegetationHelper::PrepareInstanceBuffer(Scene::Clutter& vegetation, const CameraComponent& camera, Graphics::CommandList* commandList) { - struct PushConstants { + struct alignas(16) PushConstants { int32_t instanceCount; int32_t meshIdx; uint32_t binCount; @@ -169,7 +169,7 @@ namespace Atlas { commandList->BindPipeline(pipeline); int32_t drawCallCount = int32_t(indirectDrawCallBuffer.GetElementCount()); - commandList->PushConstants("constants", &drawCallCount); + commandList->PushConstants("constants", &drawCallCount, sizeof(int32_t)); auto groupSize = 64; auto groupCount = glm::max(drawCallCount / groupSize, 1); @@ -300,4 +300,4 @@ namespace Atlas { } -} \ No newline at end of file +} diff --git a/src/engine/resource/Resource.h b/src/engine/resource/Resource.h index e977d6332..d8f0bacfc 100644 --- a/src/engine/resource/Resource.h +++ b/src/engine/resource/Resource.h @@ -4,6 +4,7 @@ #include "ResourceLoadException.h" #include "../common/Hash.h" #include "../common/Path.h" +#include "../loader/AssetLoader.h" #include #include @@ -86,12 +87,31 @@ namespace Atlas { } + bool WasModified() const { + + std::filesystem::file_time_type lastModified = std::filesystem::file_time_type::min(); + lastModified = Loader::AssetLoader::GetFileLastModifiedTime(path, lastModified); + + return loadModifiedTime < lastModified; + + } + + void UpdateModifiedTime() { + + loadModifiedTime = Loader::AssetLoader::GetFileLastModifiedTime(path, loadModifiedTime); + + } + void Unload() { isLoaded = false; errorOnLoad = false; data = nullptr; } + void Swap(Ref& newData) { + data.swap(newData); + } + std::string GetFileName() const { return Common::Path::GetFileName(path); @@ -108,6 +128,8 @@ namespace Atlas { bool errorOnLoad = false; std::exception exceptionOnLoad; + std::filesystem::file_time_type loadModifiedTime; + private: Ref data; @@ -168,10 +190,6 @@ namespace Atlas { resource = nullptr; } - inline T& operator*() { - return resource->data.operator*(); - } - inline T* operator->() const { return resource->data.operator->(); } diff --git a/src/engine/scene/Entity.cpp b/src/engine/scene/Entity.cpp index 1fecd9d93..c20d9c546 100644 --- a/src/engine/scene/Entity.cpp +++ b/src/engine/scene/Entity.cpp @@ -1,11 +1,28 @@ #include "Entity.h" #include "Scene.h" +#include "SceneSerializer.h" -namespace Atlas { +namespace Atlas::Scene { - namespace Scene { + std::vector Entity::Backup(const Ref& scene, const Entity& entity) { + json j; + std::set insertedEntities; + EntityToJson(j, entity, scene.get(), insertedEntities); + return json::to_bjdata(j); + + } + + Entity Entity::Restore(const Ref& scene, const std::vector& serialized) { + + json j = json::from_bjdata(serialized); + + auto entity = scene->CreateEntity(); + + EntityFromJson(j, entity, scene.get()); + + return entity; } diff --git a/src/engine/scene/Entity.h b/src/engine/scene/Entity.h index ffe7accd2..326fde01c 100644 --- a/src/engine/scene/Entity.h +++ b/src/engine/scene/Entity.h @@ -88,6 +88,10 @@ namespace Atlas { operator ECS::Entity() const { return entity; } + static std::vector Backup(const Ref& scene, const Entity& entity); + + static Entity Restore(const Ref& scene, const std::vector& serialized); + private: ECS::Entity entity = ECS::EntityConfig::InvalidEntity; ECS::EntityManager* entityManager = nullptr; diff --git a/src/engine/scene/EntitySerializer.cpp b/src/engine/scene/EntitySerializer.cpp deleted file mode 100644 index d2d1d9c50..000000000 --- a/src/engine/scene/EntitySerializer.cpp +++ /dev/null @@ -1,122 +0,0 @@ -#include "EntitySerializer.h" - -namespace Atlas::Scene { - - void EntityToJson(json& j, const Entity& p, Ref& scene, - std::set& insertedEntites) { - - AE_ASSERT(!insertedEntites.contains(p) && "Entity should only be present once in the hierarchy"); - - if (!insertedEntites.contains(p)) - insertedEntites.insert(p); - - j["id"] = size_t(p); - - if (p.HasComponent()) { - j["name"] = p.GetComponent(); - } - if (p.HasComponent()) { - // Create a copy and update local matrix (physics always just update global matrices) - auto transformComponent = p.GetComponent(); - transformComponent.ReconstructLocalMatrix(scene); - j["transform"] = transformComponent; - } - if (p.HasComponent()) { - j["mesh"] = p.GetComponent(); - } - if (p.HasComponent()) { - j["light"] = p.GetComponent(); - } - if (p.HasComponent()) { - j["camera"] = p.GetComponent(); - } - if (p.HasComponent()) { - j["audio"] = p.GetComponent(); - } - if (p.HasComponent()) { - j["audioVolume"] = p.GetComponent(); - } - if (p.HasComponent()) { - j["rigidBody"] = p.GetComponent(); - } - if (p.HasComponent()) { - j["player"] = p.GetComponent(); - } - if (p.HasComponent()) { - j["text"] = p.GetComponent(); - } - if (p.HasComponent()) { - // Need to check how to get this to work - auto& hierarchyComponent = p.GetComponent(); - std::vector entities; - for (auto entity : hierarchyComponent.GetChildren()) { - entities.emplace_back(); - EntityToJson(entities.back(), entity, scene, insertedEntites); - } - j["entities"] = entities; - j["root"] = hierarchyComponent.root; - } - } - - void EntityFromJson(const json& j, Entity& p, Ref& scene) { - if (j.contains("name")) { - NameComponent comp = j["name"]; - p.AddComponent(comp); - } - if (j.contains("transform")) { - TransformComponent comp = j["transform"]; - p.AddComponent(comp); - } - if (j.contains("mesh")) { - MeshComponent comp = j["mesh"]; - p.AddComponent(std::move(comp)); - } - if (j.contains("light")) { - LightComponent comp = j["light"]; - p.AddComponent(comp); - } - if (j.contains("camera")) { - CameraComponent comp = j["camera"]; - p.AddComponent(comp); - } - if (j.contains("audio")) { - AudioComponent comp = j["audio"]; - p.AddComponent(comp); - } - if (j.contains("audioVolume")) { - AudioVolumeComponent comp = j["audioVolume"]; - p.AddComponent(comp); - } - if (j.contains("rigidBody")) { - RigidBodyComponent comp = j["rigidBody"]; - p.AddComponent(comp); - } - if (j.contains("player")) { - PlayerComponent comp = j["player"]; - p.AddComponent(comp); - } - if (j.contains("text")) { - TextComponent comp = j["text"]; - p.AddComponent(comp); - } - if (j.contains("entities")) { - // We need to first push back to a temporary vector to not invalidate - // component references (i.e. when directly getting the hierarchy component). - // That way all children will have components created before the parent creates its own - std::vector jEntities = j["entities"]; - std::vector entities; - for (auto jEntity : jEntities) { - auto entity = scene->CreateEntity(); - EntityFromJson(jEntity, entity, scene); - entities.push_back(entity); - } - - auto& comp = p.AddComponent(); - comp.root = j["root"]; - for (auto entity : entities) { - comp.AddChild(entity); - } - } - } - -} \ No newline at end of file diff --git a/src/engine/scene/EntitySerializer.h b/src/engine/scene/EntitySerializer.h deleted file mode 100644 index 1ee5ee47c..000000000 --- a/src/engine/scene/EntitySerializer.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "components/ComponentSerializer.h" -#include "scene/Scene.h" - -#include - -namespace Atlas::Scene { - - void EntityToJson(json& j, const Entity& p, Ref& scene, - std::set& insertedEntites); - - void EntityFromJson(const json& j, Entity& p, Ref& scene); -} \ No newline at end of file diff --git a/src/engine/scene/Scene.cpp b/src/engine/scene/Scene.cpp index 49c97c50c..927d0279b 100644 --- a/src/engine/scene/Scene.cpp +++ b/src/engine/scene/Scene.cpp @@ -1,5 +1,6 @@ #include "Scene.h" #include "Entity.h" +#include "SceneSerializer.h" #include "components/Components.h" namespace Atlas { @@ -59,7 +60,7 @@ namespace Atlas { } - Entity Scene::GetEntityByName(const std::string &name) { + Entity Scene::GetEntityByName(const std::string& name) { auto nameSubset = entityManager.GetSubset(); for (auto entity : nameSubset) { @@ -85,24 +86,6 @@ namespace Atlas { } - std::string NumberToString(auto number) { - - auto str = std::to_string(number); - auto pos = str.find("."); - if (pos != std::string::npos) - return str.substr(0, pos + 4); - return str; - - } - - std::string VecToString(auto vector) { - - return NumberToString(vector.x) + ", " - + NumberToString(vector.y) + ", " - + NumberToString(vector.z); - - } - void Scene::Timestep(float deltaTime) { this->deltaTime = deltaTime; @@ -110,6 +93,13 @@ namespace Atlas { // Do cleanup first such that we work with valid data CleanupUnusedResources(); + // Update scripting components + auto luaScriptComponentSubset = entityManager.GetSubset(); + for (auto entity : luaScriptComponentSubset) { + auto& luaScriptComponent = luaScriptComponentSubset.Get(entity); + luaScriptComponent.Update(luaScriptManager, deltaTime); + } + TransformComponent rootTransform = {}; auto hierarchyTransformSubset = entityManager.GetSubset(); @@ -149,6 +139,8 @@ namespace Atlas { // Wait for transform updates to finish if (physicsWorld != nullptr) { + + // This part (updating physics transforms) is required regardless of the simulation running auto playerSubset = entityManager.GetSubset(); for (auto entity : playerSubset) { const auto& [playerComponent, transformComponent] = playerSubset.Get(entity); @@ -160,7 +152,10 @@ namespace Atlas { // Apply update here (transform overwrite everything else in physics simulation for now) if (transformComponent.changed && playerComponent.IsValid()) { - playerComponent.SetPosition(transformComponent.Decompose().translation); + auto& globalPlayerMatrix = transformComponent.globalMatrix; + auto decomposition = Common::MatrixDecomposition(globalPlayerMatrix); + // In theory we have to apply the rotation here as well + playerComponent.SetPosition(decomposition.translation); } playerComponent.Update(deltaTime); @@ -182,49 +177,52 @@ namespace Atlas { } } - physicsWorld->Update(deltaTime); + // This part only needs to be executed if the simulation is running + if (!physicsWorld->pauseSimulation) { + physicsWorld->Update(deltaTime); - for (auto entity : rigidBodySubset) { - const auto& [rigidBodyComponent, transformComponent] = rigidBodySubset.Get(entity); + for (auto entity : rigidBodySubset) { + const auto& [rigidBodyComponent, transformComponent] = rigidBodySubset.Get(entity); - if (!rigidBodyComponent.IsValid() || transformComponent.isStatic || - rigidBodyComponent.layer == Physics::Layers::STATIC) - continue; + if (!rigidBodyComponent.IsValid() || transformComponent.isStatic || + rigidBodyComponent.layer == Physics::Layers::STATIC) + continue; - // This happens if no change was triggered by the user, then we still need - // to update the last global matrix, since it might have changed due to physics simulation - if (!transformComponent.changed) - transformComponent.lastGlobalMatrix = transformComponent.globalMatrix; + // This happens if no change was triggered by the user, then we still need + // to update the last global matrix, since it might have changed due to physics simulation + if (!transformComponent.changed) + transformComponent.lastGlobalMatrix = transformComponent.globalMatrix; - // Need to set changed to true such that the space partitioning is updated - transformComponent.changed = true; - transformComponent.updated = true; + // Need to set changed to true such that the space partitioning is updated + transformComponent.changed = true; + transformComponent.updated = true; - // Physics are updated in global space, so we don't need the parent transform - transformComponent.globalMatrix = rigidBodyComponent.GetMatrix(); - transformComponent.inverseGlobalMatrix = glm::inverse(transformComponent.globalMatrix); - } + // Physics are updated in global space, so we don't need the parent transform + transformComponent.globalMatrix = rigidBodyComponent.GetMatrix(); + transformComponent.inverseGlobalMatrix = glm::inverse(transformComponent.globalMatrix); + } - // Player update needs to be performed after normal rigid bodies, such that - // player can override rigid body behaviour - for (auto entity : playerSubset) { - const auto& [playerComponent, transformComponent] = playerSubset.Get(entity); + // Player update needs to be performed after normal rigid bodies, such that + // player can override rigid body behaviour + for (auto entity : playerSubset) { + const auto& [playerComponent, transformComponent] = playerSubset.Get(entity); - if (!playerComponent.IsValid()) - continue; + if (!playerComponent.IsValid()) + continue; - // This happens if no change was triggered by the user, then we still need - // to update the last global matrix, since it might have changed due to physics simulation - if (!transformComponent.changed) - transformComponent.lastGlobalMatrix = transformComponent.globalMatrix; + // This happens if no change was triggered by the user, then we still need + // to update the last global matrix, since it might have changed due to physics simulation + if (!transformComponent.changed) + transformComponent.lastGlobalMatrix = transformComponent.globalMatrix; - // Need to set changed to true such that the space partitioning is updated - transformComponent.changed = true; - transformComponent.updated = true; + // Need to set changed to true such that the space partitioning is updated + transformComponent.changed = true; + transformComponent.updated = true; - // Physics are updated in global space, so we don't need the parent transform - transformComponent.globalMatrix = playerComponent.GetMatrix(); - transformComponent.inverseGlobalMatrix = glm::inverse(transformComponent.globalMatrix); + // Physics are updated in global space, so we don't need the parent transform + transformComponent.globalMatrix = playerComponent.GetMatrix(); + transformComponent.inverseGlobalMatrix = glm::inverse(transformComponent.globalMatrix); + } } } @@ -261,6 +259,31 @@ namespace Atlas { } } + auto lightSubset = entityManager.GetSubset(); + for (auto entity : lightSubset) { + auto& lightComponent = lightSubset.Get(entity); + + auto transformComponent = entityManager.TryGet(entity); + + lightComponent.Update(transformComponent); + } + +#ifdef AE_BINDLESS + UpdateBindlessIndexMaps(); + + // Make sure this is changed just once at the start of a frame + rayTracingWorldUpdateFuture = std::async(std::launch::async, [&]() { + // Need to wait before updating graphic resources + Graphics::GraphicsDevice::DefaultDevice->WaitForPreviousFrameCompletion(); + if (rayTracingWorld) { + rayTracingWorld->scene = this; + rayTracingWorld->Update(true); + } + rtDataValid = rayTracingWorld != nullptr && rayTracingWorld->IsValid(); + }); + +#endif + // We also need to reset the hierarchy components as well auto hierarchySubset = entityManager.GetSubset(); for (auto entity : hierarchySubset) { @@ -285,26 +308,6 @@ namespace Atlas { textComponent.Update(transformComponent); } - auto lightSubset = entityManager.GetSubset(); - for (auto entity : lightSubset) { - auto& lightComponent = lightSubset.Get(entity); - - auto transformComponent = entityManager.TryGet(entity); - - lightComponent.Update(transformComponent); - } - -#ifdef AE_BINDLESS - UpdateBindlessIndexMaps(); - - // Make sure this is changed just once at the start of a frame - if (rayTracingWorld) { - rayTracingWorld->scene = this; - rayTracingWorld->Update(true); - } - rtDataValid = rayTracingWorld != nullptr && rayTracingWorld->IsValid(); -#endif - } void Scene::Update() { @@ -416,7 +419,7 @@ namespace Atlas { } - CameraComponent& Scene::GetMainCamera() { + CameraComponent& Scene::GetMainCamera() { return mainCameraEntity.GetComponent(); @@ -431,6 +434,7 @@ namespace Atlas { Volume::RayResult Scene::CastRay(Volume::Ray& ray, SceneQueryComponents queryComponents) { Volume::RayResult result; + result.hitDistance = ray.tMax; // Most accurate method if it works if (physicsWorld && (queryComponents & SceneQueryComponentBits::RigidBodyComponentBit)) { @@ -454,7 +458,8 @@ namespace Atlas { const auto& meshComp = meshSubset.Get(entity); auto dist = 0.0f; - if (ray.Intersects(meshComp.aabb, 0.0f, result.hitDistance, dist)) { + ray.tMax = result.hitDistance; + if (ray.Intersects(meshComp.aabb, dist)) { auto rigidBody = entityManager.TryGet(entity); // This means we already found a more accurate hit if (result.valid && entityManager.Contains(entity)) @@ -466,7 +471,7 @@ namespace Atlas { result.data = { entity, &entityManager }; result.hitDistance = dist; } - + // Only accept zero hits (i.e we're inside their volume) if there wasn't anything before if (!result.valid) { result.valid = true; @@ -483,12 +488,13 @@ namespace Atlas { const auto& textComp = textSubset.Get(entity); auto dist = 0.0f; - if (ray.Intersects(textComp.GetRectangle(), 0.0f, result.hitDistance, dist)) { + ray.tMax = result.hitDistance; + if (ray.Intersects(textComp.GetRectangle(), dist)) { result.valid = true; result.data = { entity, &entityManager }; result.hitDistance = dist; - + } } } @@ -497,7 +503,7 @@ namespace Atlas { } - void Scene::GetRenderList(Volume::Frustum frustum, Atlas::RenderList &renderList) { + void Scene::GetRenderList(Volume::Frustum frustum, Atlas::RenderList& renderList, const Ref& pass) { // This is much quicker presumably due to cache coherency (need better hierarchical data structure) auto subset = entityManager.GetSubset(); @@ -505,7 +511,7 @@ namespace Atlas { auto& comp = subset.Get(entity); if (comp.dontCull || comp.visible && frustum.Intersects(comp.aabb)) - renderList.Add(entity, comp); + renderList.Add(pass, entity, comp); } } @@ -528,6 +534,13 @@ namespace Atlas { } + void Scene::WaitForAsyncWorkCompletion() { + + if (rayTracingWorldUpdateFuture.valid()) + rayTracingWorldUpdateFuture.get(); + + } + bool Scene::IsFullyLoaded() { bool loaded = true; @@ -647,12 +660,12 @@ namespace Atlas { // Each resource type needs to count references entityManager.SubscribeToTopic(ECS::Topic::ComponentEmplace, - [this](const ECS::Entity entity, const MeshComponent& meshComponent) { + [this](const ECS::Entity entity, const MeshComponent& meshComponent) { RegisterResource(registeredMeshes, meshComponent.mesh); }); entityManager.SubscribeToTopic(ECS::Topic::ComponentErase, - [this](const ECS::Entity entity, const MeshComponent& meshComponent) { + [this](const ECS::Entity entity, const MeshComponent& meshComponent) { UnregisterResource(registeredMeshes, meshComponent.mesh); if (meshComponent.inserted) { @@ -662,7 +675,7 @@ namespace Atlas { // Need insert/remove physics components into physics world entityManager.SubscribeToTopic(ECS::Topic::ComponentEmplace, - [this](const ECS::Entity entity, RigidBodyComponent& rigidBodyComponent) { + [this](const ECS::Entity entity, RigidBodyComponent& rigidBodyComponent) { auto transformComp = entityManager.TryGet(entity); if (!transformComp) return; @@ -671,13 +684,13 @@ namespace Atlas { }); entityManager.SubscribeToTopic(ECS::Topic::ComponentErase, - [this](const ECS::Entity entity, RigidBodyComponent& rigidBodyComponent) { + [this](const ECS::Entity entity, RigidBodyComponent& rigidBodyComponent) { if (physicsWorld != nullptr) rigidBodyComponent.RemoveFromPhysicsWorld(); }); entityManager.SubscribeToTopic(ECS::Topic::ComponentEmplace, - [this](const ECS::Entity entity, PlayerComponent& rigidBodyComponent) { + [this](const ECS::Entity entity, PlayerComponent& rigidBodyComponent) { auto transformComp = entityManager.TryGet(entity); if (!transformComp) return; @@ -686,7 +699,7 @@ namespace Atlas { }); entityManager.SubscribeToTopic(ECS::Topic::ComponentErase, - [this](const ECS::Entity entity, PlayerComponent& rigidBodyComponent) { + [this](const ECS::Entity entity, PlayerComponent& rigidBodyComponent) { if (physicsWorld != nullptr) rigidBodyComponent.RemoveFromPhysicsWorld(); }); @@ -698,7 +711,7 @@ namespace Atlas { std::unordered_map entityToEntityMap; // We need all entities before we can start to attach components - for(auto entity : *other) { + for (auto entity : *other) { auto newEntity = CreateEntity(); entityToEntityMap[entity] = newEntity; @@ -754,7 +767,7 @@ namespace Atlas { // NOTE: The reason we copy entities instead of taking a reference is simply because otherwise we might // get dereferenced due to new components being added, which could lead to crashes - + // Normal components without resources which are not a hierarchy that needs special treatment if (srcEntity.HasComponent()) { const auto& otherComp = srcEntity.GetComponent(); @@ -782,7 +795,7 @@ namespace Atlas { auto otherComp = srcEntity.GetComponent(); auto creationSettings = otherComp.GetBodyCreationSettings(); const auto otherShape = creationSettings.shape; - // Need to have a copy of the shape (otherwise they are all linked, e.g. when changing scale) + // Need to have a copy of the shape (otherwise they are all linked, e.g. when changing scale) creationSettings.shape = CreateRef(); *creationSettings.shape = *otherShape; dstEntity.AddComponent(creationSettings); @@ -811,6 +824,11 @@ namespace Atlas { auto otherComp = srcEntity.GetComponent(); dstEntity.AddComponent(otherComp); } + if (srcEntity.HasComponent()) { + // These have a proper copy constructor + auto otherComp = srcEntity.GetComponent(); + dstEntity.AddComponent(otherComp); + } if (srcEntity.HasComponent()) { auto otherComp = srcEntity.GetComponent(); auto& comp = dstEntity.AddComponent(otherComp.font, otherComp.text); @@ -819,6 +837,26 @@ namespace Atlas { } + std::vector Scene::Backup(const Ref& scene) { + + json j; + SceneToJson(j, scene.get()); + + return json::to_bjdata(j); + + } + + Ref Scene::Restore(const std::vector& serialized) { + + json j = json::from_bjdata(serialized); + + Ref scene; + SceneFromJson(j, scene); + + return scene; + + } + } } \ No newline at end of file diff --git a/src/engine/scene/Scene.h b/src/engine/scene/Scene.h index bc95b8426..3fd944596 100644 --- a/src/engine/scene/Scene.h +++ b/src/engine/scene/Scene.h @@ -30,6 +30,8 @@ #include "raytracing/RayTracingWorld.h" #include "Clutter.h" +#include "../scripting/LuaScriptManager.h" + #include #include @@ -99,12 +101,14 @@ namespace Atlas { Volume::RayResult CastRay(Volume::Ray& ray, SceneQueryComponents queryComponents = SceneQueryComponentBits::AllComponentsBit); - void GetRenderList(Volume::Frustum frustum, RenderList& renderList); + void GetRenderList(Volume::Frustum frustum, RenderList& renderList, const Ref& pass); void ClearRTStructures(); void WaitForResourceLoad(); + void WaitForAsyncWorkCompletion(); + bool IsFullyLoaded(); bool IsRtDataValid() const; @@ -115,13 +119,17 @@ namespace Atlas { SceneIterator end(); + static std::vector Backup(const Ref& scene); + + static Ref Restore(const std::vector& serialized); + std::string name; Ref ocean = nullptr; Ref terrain = nullptr; Ref clutter = nullptr; Ref physicsWorld = nullptr; - Ref rayTracingWorld = nullptr; + Ref rayTracingWorld = nullptr; Wind wind; Lighting::Sky sky; @@ -169,6 +177,10 @@ namespace Atlas { bool rtDataValid = false; bool vegetationChanged = false; + Scripting::LuaScriptManager luaScriptManager = Scripting::LuaScriptManager(this); + + std::future rayTracingWorldUpdateFuture; + friend Entity; friend SpacePartitioning; friend RayTracing::RayTracingWorld; diff --git a/src/engine/scene/SceneSerializer.cpp b/src/engine/scene/SceneSerializer.cpp index 5f69b2b0b..f5a657ed5 100644 --- a/src/engine/scene/SceneSerializer.cpp +++ b/src/engine/scene/SceneSerializer.cpp @@ -1,213 +1,237 @@ #include "SceneSerializer.h" -#include "Entity.h" -#include "EntitySerializer.h" -#include "lighting/LightingSerializer.h" #include "postprocessing/PostProcessingSerializer.h" #include "physics/PhysicsSerializer.h" -#include "../common/SerializationHelper.h" -#include "../loader/AssetLoader.h" -#include "../loader/TerrainLoader.h" +namespace Atlas::Scene { -namespace Atlas { + void EntityToJson(json& j, const Entity& p, Scene* scene, + std::set& insertedEntities) { - namespace Scene { + AE_ASSERT(!insertedEntities.contains(p) && "Entity should only be present once in the hierarchy"); - void SceneSerializer::SerializeScene(Ref scene, const std::string& filename) { + if (!insertedEntities.contains(p)) + insertedEntities.insert(p); - auto path = Loader::AssetLoader::GetFullPath(filename); - auto fileStream = Loader::AssetLoader::WriteFile(path, std::ios::out | std::ios::binary); - - if (!fileStream.is_open()) { - Log::Error("Couldn't write scene file " + filename); - return; - } - - json j; + j["id"] = size_t(p); + if (p.HasComponent()) { + j["name"] = p.GetComponent(); + } + if (p.HasComponent()) { + // Create a copy and update local matrix (physics always just update global matrices) + auto transformComponent = p.GetComponent(); + auto parentEntity = scene->GetParentEntity(p); + transformComponent.ReconstructLocalMatrix(parentEntity); + j["transform"] = transformComponent; + } + if (p.HasComponent()) { + j["mesh"] = p.GetComponent(); + } + if (p.HasComponent()) { + j["light"] = p.GetComponent(); + } + if (p.HasComponent()) { + j["camera"] = p.GetComponent(); + } + if (p.HasComponent()) { + j["audio"] = p.GetComponent(); + } + if (p.HasComponent()) { + j["audioVolume"] = p.GetComponent(); + } + if (p.HasComponent()) { + j["rigidBody"] = p.GetComponent(); + } + if (p.HasComponent()) { + j["player"] = p.GetComponent(); + } + if (p.HasComponent()) { + j["text"] = p.GetComponent(); + } + if (p.HasComponent()) { + j["script"] = p.GetComponent(); + } + if (p.HasComponent()) { + // Need to check how to get this to work + auto& hierarchyComponent = p.GetComponent(); std::vector entities; - std::set insertedEntities; - - auto hierarchySubset = scene->GetSubset(); - for (auto entity : hierarchySubset) { - auto hierarchy = hierarchySubset.Get(entity); - // Serialize from root recursively. Also means free floating hierarchies without a - // root will be ignored. - if (!hierarchy.root) continue; - entities.emplace_back(); - EntityToJson(entities.back(), entity, scene, insertedEntities); - } - - for (auto entity : *scene) { - // No need here, since it was already inserted through the hierarchy - if (insertedEntities.contains(entity)) - continue; - + for (auto entity : hierarchyComponent.GetChildren()) { entities.emplace_back(); EntityToJson(entities.back(), entity, scene, insertedEntities); } - - // Parse all mandatory members - j["name"] = scene->name; - j["aabb"] = scene->aabb; - j["depth"] = scene->depth; j["entities"] = entities; - j["sky"] = scene->sky; - j["postProcessing"] = scene->postProcessing; - - // Parse all optional members - if (scene->fog) - j["fog"] = *scene->fog; - if (scene->irradianceVolume) - j["irradianceVolume"] = *scene->irradianceVolume; - if (scene->ao) - j["ao"] = *scene->ao; - if (scene->reflection) - j["reflection"] = *scene->reflection; - if (scene->sss) - j["sss"] = *scene->sss; - if (scene->ssgi) - j["ssgi"] = *scene->ssgi; - - if (scene->physicsWorld) - Physics::SerializePhysicsWorld(j["physicsWorld"], scene->physicsWorld); - - fileStream << to_string(j); - - fileStream.close(); - + j["root"] = hierarchyComponent.root; } + } - Ref SceneSerializer::DeserializeScene(const std::string& filename) { - - Loader::AssetLoader::UnpackFile(filename); - auto path = Loader::AssetLoader::GetFullPath(filename); - - auto fileStream = Loader::AssetLoader::ReadFile(path, std::ios::in | std::ios::binary); - - if (!fileStream.is_open()) { - throw ResourceLoadException(filename, "Couldn't open scene file stream"); - } - - std::string serialized((std::istreambuf_iterator(fileStream)), - std::istreambuf_iterator()); - - fileStream.close(); - - json j = json::parse(serialized); - - Volume::AABB aabb = j["aabb"]; - auto scene = CreateRef(j["name"], aabb.min, aabb.max, j["depth"]); - + void EntityFromJson(const json& j, Entity& p, Scene* scene) { + if (j.contains("name")) { + NameComponent comp = j["name"]; + p.AddComponent(comp); + } + if (j.contains("transform")) { + TransformComponent comp = j["transform"]; + p.AddComponent(comp); + } + if (j.contains("mesh")) { + MeshComponent comp = j["mesh"]; + p.AddComponent(std::move(comp)); + } + if (j.contains("light")) { + LightComponent comp = j["light"]; + p.AddComponent(comp); + } + if (j.contains("camera")) { + CameraComponent comp = j["camera"]; + p.AddComponent(comp); + } + if (j.contains("audio")) { + AudioComponent comp = j["audio"]; + p.AddComponent(comp); + } + if (j.contains("audioVolume")) { + AudioVolumeComponent comp = j["audioVolume"]; + p.AddComponent(comp); + } + if (j.contains("rigidBody")) { + RigidBodyComponent comp = j["rigidBody"]; + p.AddComponent(comp); + } + if (j.contains("player")) { + PlayerComponent comp = j["player"]; + p.AddComponent(comp); + } + if (j.contains("text")) { + TextComponent comp = j["text"]; + p.AddComponent(comp); + } + if (j.contains("script")) { + LuaScriptComponent comp = j["script"]; + p.AddComponent(comp); + } + if (j.contains("entities")) { + // We need to first push back to a temporary vector to not invalidate + // component references (i.e. when directly getting the hierarchy component). + // That way all children will have components created before the parent creates its own std::vector jEntities = j["entities"]; + std::vector entities; for (auto jEntity : jEntities) { auto entity = scene->CreateEntity(); EntityFromJson(jEntity, entity, scene); + entities.push_back(entity); } - scene->sky = j["sky"]; - scene->postProcessing = j["postProcessing"]; - - if (j.contains("fog")) { - scene->fog = CreateRef(); - *scene->fog = j["fog"]; - } - if (j.contains("irradianceVolume")) { - scene->irradianceVolume = CreateRef(); - *scene->irradianceVolume = j["irradianceVolume"]; - } - if (j.contains("ao")) { - scene->ao = CreateRef(); - *scene->ao = j["ao"]; - } - if (j.contains("reflection")) { - scene->reflection = CreateRef(); - *scene->reflection = j["reflection"]; - } - if (j.contains("sss")) { - scene->sss = CreateRef(); - *scene->sss = j["sss"]; - } - if (j.contains("ssgi")) { - scene->ssgi = CreateRef(); - *scene->ssgi = j["ssgi"]; - } - - // Create physics world in any case - scene->physicsWorld = CreateRef(); - scene->physicsWorld->pauseSimulation = true; - - if (j.contains("physicsWorld")) { - std::unordered_map bodyCreationMap; - Physics::DeserializePhysicsWorld(j["physicsWorld"], bodyCreationMap); + auto& comp = p.AddComponent(); + comp.root = j["root"]; + for (auto entity : entities) { + comp.AddChild(entity); } - - scene->rayTracingWorld = CreateRef(); - - return scene; - } + } - void SceneSerializer::SerializePrefab(Ref scene, Entity entity, const std::string& filename) { - - auto path = Loader::AssetLoader::GetFullPath(filename); - auto fileStream = Loader::AssetLoader::WriteFile(path, std::ios::out | std::ios::binary); - - if (!fileStream.is_open()) { - Log::Error("Couldn't write entity file " + filename); - return; - } - - json j; - - std::set insertedEntities; - EntityToJson(j, entity, scene, insertedEntities); - - auto rigidBody = entity.TryGetComponent(); + void SceneToJson(json& j, Scene* scene) { - if (rigidBody) { - j["body"] = rigidBody->GetBodyCreationSettings(); - } + std::vector entities; + std::set insertedEntities; - fileStream << to_string(j); + auto hierarchySubset = scene->GetSubset(); + for (auto entity : hierarchySubset) { + auto hierarchy = hierarchySubset.Get(entity); + // Serialize from root recursively. Also means free floating hierarchies without a + // root will be ignored. + if (!hierarchy.root) continue; + entities.emplace_back(); + EntityToJson(entities.back(), entity, scene, insertedEntities); + } - fileStream.close(); + for (auto entity : *scene) { + // No need here, since it was already inserted through the hierarchy + if (insertedEntities.contains(entity)) + continue; + entities.emplace_back(); + EntityToJson(entities.back(), entity, scene, insertedEntities); } - Entity SceneSerializer::DeserializePrefab(Ref scene, const std::string& filename) { - - Loader::AssetLoader::UnpackFile(filename); - auto path = Loader::AssetLoader::GetFullPath(filename); + // Parse all mandatory members + j["name"] = scene->name; + j["aabb"] = scene->aabb; + j["depth"] = scene->depth; + j["entities"] = entities; + j["sky"] = scene->sky; + j["postProcessing"] = scene->postProcessing; + + // Parse all optional members + if (scene->fog) + j["fog"] = *scene->fog; + if (scene->irradianceVolume) + j["irradianceVolume"] = *scene->irradianceVolume; + if (scene->ao) + j["ao"] = *scene->ao; + if (scene->reflection) + j["reflection"] = *scene->reflection; + if (scene->sss) + j["sss"] = *scene->sss; + if (scene->ssgi) + j["ssgi"] = *scene->ssgi; + + if (scene->physicsWorld) + Physics::SerializePhysicsWorld(j["physicsWorld"], scene->physicsWorld); - auto fileStream = Loader::AssetLoader::ReadFile(path, std::ios::in | std::ios::binary); + } - if (!fileStream.is_open()) { - throw ResourceLoadException(filename, "Couldn't open entity file stream"); - } + void SceneFromJson(const json& j, Ref& scene) { - std::string serialized((std::istreambuf_iterator(fileStream)), - std::istreambuf_iterator()); + Volume::AABB aabb = j["aabb"]; + scene = CreateRef(j["name"], aabb.min, aabb.max, j["depth"]); - fileStream.close(); + // Create physics world in any case (and before entities, such that they can push bodies immediately) + scene->physicsWorld = CreateRef(); + scene->physicsWorld->pauseSimulation = true; - json j = json::parse(serialized); + if (j.contains("physicsWorld")) { + std::unordered_map bodyCreationMap; + Physics::DeserializePhysicsWorld(j["physicsWorld"], bodyCreationMap); + } + std::vector jEntities = j["entities"]; + for (auto jEntity : jEntities) { auto entity = scene->CreateEntity(); + EntityFromJson(jEntity, entity, scene.get()); + } - EntityFromJson(j, entity, scene); - - auto rigidBody = entity.TryGetComponent(); - if (rigidBody) - rigidBody->creationSettings = CreateRef(); + scene->sky = j["sky"]; + scene->postProcessing = j["postProcessing"]; - if (rigidBody && j.contains("body")) - *rigidBody->creationSettings = j["body"]; + if (j.contains("fog")) { + scene->fog = CreateRef(); + *scene->fog = j["fog"]; + } + if (j.contains("irradianceVolume")) { + scene->irradianceVolume = CreateRef(); + *scene->irradianceVolume = j["irradianceVolume"]; + } + if (j.contains("ao")) { + scene->ao = CreateRef(); + *scene->ao = j["ao"]; + } + if (j.contains("reflection")) { + scene->reflection = CreateRef(); + *scene->reflection = j["reflection"]; + } + if (j.contains("sss")) { + scene->sss = CreateRef(); + *scene->sss = j["sss"]; + } + if (j.contains("ssgi")) { + scene->ssgi = CreateRef(); + *scene->ssgi = j["ssgi"]; + } - return entity; + scene->rayTracingWorld = CreateRef(); - } + scene->physicsWorld->OptimizeBroadphase(); } diff --git a/src/engine/scene/SceneSerializer.h b/src/engine/scene/SceneSerializer.h index 7399c433b..45ed85aa5 100644 --- a/src/engine/scene/SceneSerializer.h +++ b/src/engine/scene/SceneSerializer.h @@ -1,25 +1,19 @@ #pragma once -#include "Scene.h" +#include "components/ComponentSerializer.h" +#include "scene/Scene.h" -namespace Atlas { +#include - namespace Scene { +namespace Atlas::Scene { - class SceneSerializer { + void EntityToJson(json& j, const Entity& p, Scene* scene, + std::set& insertedEntities); - public: - static void SerializeScene(Ref scene, const std::string& filename); + void EntityFromJson(const json& j, Entity& p, Scene* scene); - static Ref DeserializeScene(const std::string& filename); - - static void SerializePrefab(Ref scene, Entity entity, const std::string& filename); - - static Entity DeserializePrefab(Ref scene, const std::string& filename); - - }; - - }; + void SceneToJson(json& j, Scene* scene); + void SceneFromJson(const json& j, Ref& scene); } \ No newline at end of file diff --git a/src/engine/scene/SpacePartitioning.cpp b/src/engine/scene/SpacePartitioning.cpp index 40d1827fc..7c5b697a6 100644 --- a/src/engine/scene/SpacePartitioning.cpp +++ b/src/engine/scene/SpacePartitioning.cpp @@ -39,6 +39,7 @@ namespace Atlas { void SpacePartitioning::GetRenderList(Volume::Frustum frustum, RenderList& renderList) { + /* auto entityManager = &scene->entityManager; std::vector staticEntities; @@ -82,6 +83,7 @@ namespace Atlas { if (meshComp->visible) renderList.Add(entity, *meshComp); } + */ } diff --git a/src/engine/scene/components/AudioComponent.cpp b/src/engine/scene/components/AudioComponent.cpp index a0b52962e..2003b1b8c 100644 --- a/src/engine/scene/components/AudioComponent.cpp +++ b/src/engine/scene/components/AudioComponent.cpp @@ -23,7 +23,7 @@ namespace Atlas { } - AudioComponent::AudioComponent(Scene* scene, ResourceHandle audioData, + AudioComponent::AudioComponent(Scene* scene, const ResourceHandle& audioData, float falloffFactor, bool loop) : falloffFactor(falloffFactor), scene(scene) { stream = Audio::AudioManager::CreateStream(audioData, 0.0f, loop); diff --git a/src/engine/scene/components/AudioComponent.h b/src/engine/scene/components/AudioComponent.h index 449bed22c..cc15d8860 100644 --- a/src/engine/scene/components/AudioComponent.h +++ b/src/engine/scene/components/AudioComponent.h @@ -21,7 +21,7 @@ namespace Atlas { AudioComponent() = default; explicit AudioComponent(Scene* scene) : scene(scene) {} explicit AudioComponent(Scene* scene, const AudioComponent& that); - explicit AudioComponent(Scene* scene, ResourceHandle audioData, + explicit AudioComponent(Scene* scene, const ResourceHandle& audioData, float falloffFactor = 1.0f, bool loop = false); void ChangeResource(ResourceHandle audioData); diff --git a/src/engine/scene/components/AudioVolumeComponent.cpp b/src/engine/scene/components/AudioVolumeComponent.cpp index e75fd7a46..77cf730bc 100644 --- a/src/engine/scene/components/AudioVolumeComponent.cpp +++ b/src/engine/scene/components/AudioVolumeComponent.cpp @@ -24,7 +24,7 @@ namespace Atlas { } - AudioVolumeComponent::AudioVolumeComponent(Scene* scene, ResourceHandle audioData, + AudioVolumeComponent::AudioVolumeComponent(Scene* scene, const ResourceHandle& audioData, Volume::AABB aabb, float falloffFactor) : aabb(aabb), falloffFactor(falloffFactor), scene(scene) { stream = Audio::AudioManager::CreateStream(audioData, 0.0f); diff --git a/src/engine/scene/components/AudioVolumeComponent.h b/src/engine/scene/components/AudioVolumeComponent.h index 2e8fba53b..69bedd84a 100644 --- a/src/engine/scene/components/AudioVolumeComponent.h +++ b/src/engine/scene/components/AudioVolumeComponent.h @@ -21,7 +21,7 @@ namespace Atlas { AudioVolumeComponent() = default; explicit AudioVolumeComponent(Scene* scene) : scene(scene) {} explicit AudioVolumeComponent(Scene* scene, const AudioVolumeComponent& that); - explicit AudioVolumeComponent(Scene* scene, ResourceHandle audioData, + explicit AudioVolumeComponent(Scene* scene, const ResourceHandle& audioData, Volume::AABB aabb = Volume::AABB(vec3(-1.0f), vec3(1.0f)), float falloffFactor = 1.0f); void ChangeResource(ResourceHandle audioData); diff --git a/src/engine/scene/components/CameraComponent.cpp b/src/engine/scene/components/CameraComponent.cpp index 2df9fb3c0..230f61d06 100644 --- a/src/engine/scene/components/CameraComponent.cpp +++ b/src/engine/scene/components/CameraComponent.cpp @@ -25,22 +25,25 @@ namespace Atlas { right = normalize(vec3(sin(rotation.x - 3.14f / 2.0f), 0.0f, cos(rotation.x - 3.14f / 2.0f))); - if (useEntityRotation) { - direction = normalize(vec3(transform * vec4(direction, 0.0f))); - right = normalize(vec3(transform * vec4(right, 0.0f))); - } - up = cross(right, direction); - vec3 globalLocation = location; + globalDirection = direction; + vec3 globalUp = up; + + if (useEntityRotation) { + globalDirection = normalize(vec3(transform * vec4(direction, 0.0f))); + globalUp = normalize(vec3(transform * vec4(up, 0.0f))); + } + + globalLocation = location; if (useEntityTranslation) { globalLocation = vec3(transform * vec4(location, 1.0f)); } if (!thirdPerson) - viewMatrix = lookAt(globalLocation, globalLocation + direction, up); + viewMatrix = lookAt(globalLocation, globalLocation + globalDirection, globalUp); else - viewMatrix = lookAt(globalLocation - direction * thirdPersonDistance, globalLocation, up); + viewMatrix = lookAt(globalLocation - globalDirection * thirdPersonDistance, globalLocation, globalUp); invViewMatrix = inverse(viewMatrix); @@ -132,8 +135,8 @@ namespace Atlas { float nearWidth = aspectRatio * nearHeight; vec3 cameraLocation = GetLocation(); - vec3 farPoint = cameraLocation + direction * farPlane; - vec3 nearPoint = cameraLocation + direction * nearPlane; + vec3 farPoint = cameraLocation + globalDirection * farPlane; + vec3 nearPoint = cameraLocation + globalDirection * nearPlane; corners.push_back(farPoint + farHeight * up - farWidth * right); corners.push_back(farPoint + farHeight * up + farWidth * right); diff --git a/src/engine/scene/components/CameraComponent.h b/src/engine/scene/components/CameraComponent.h index fcc555784..4ec26b699 100644 --- a/src/engine/scene/components/CameraComponent.h +++ b/src/engine/scene/components/CameraComponent.h @@ -54,6 +54,9 @@ namespace Atlas { vec3 up = vec3{ 0.0f, 1.0f, 0.0f }; vec3 right = vec3{ 1.0f, 0.0f, 0.0f }; + vec3 globalLocation = vec3{ 0.0f }; + vec3 globalDirection = vec3{ 0.0f, 0.0f, -1.0f }; + mat4 viewMatrix = mat4{ 1.0f }; mat4 projectionMatrix = mat4{ 1.0f }; diff --git a/src/engine/scene/components/ComponentSerializer.cpp b/src/engine/scene/components/ComponentSerializer.cpp index 60c23b77e..d5ad0bf76 100644 --- a/src/engine/scene/components/ComponentSerializer.cpp +++ b/src/engine/scene/components/ComponentSerializer.cpp @@ -279,4 +279,87 @@ namespace Atlas::Scene::Components { } } + void to_json(json &j, const LuaScriptComponent &p) + { + j = json{}; + + if (p.script.IsValid()) + j["resourcePath"] = p.script.GetResource()->path; + + for (const auto &prop : p.properties) + { + switch (prop.type) + { + case LuaScriptComponent::PropertyType::Boolean: + j["scriptProperties"][prop.name]["type"] = "boolean"; + j["scriptProperties"][prop.name]["value"] = prop.booleanValue; + break; + case LuaScriptComponent::PropertyType::Integer: + j["scriptProperties"][prop.name]["type"] = "integer"; + j["scriptProperties"][prop.name]["value"] = prop.integerValue; + break; + case LuaScriptComponent::PropertyType::Double: + j["scriptProperties"][prop.name]["type"] = "double"; + j["scriptProperties"][prop.name]["value"] = prop.doubleValue; + break; + case LuaScriptComponent::PropertyType::String: + j["scriptProperties"][prop.name]["type"] = "string"; + j["scriptProperties"][prop.name]["value"] = prop.stringValue; + break; + default: + AE_ASSERT(false); + } + } + } + + void from_json(const json &j, LuaScriptComponent &p) + { + + if (j.contains("resourcePath")) + { + std::string resourcePath; + j.at("resourcePath").get_to(resourcePath); + + p.script = ResourceManager::GetOrLoadResourceAsync( + resourcePath, ResourceOrigin::User); + } + + if (j.contains("scriptProperties")) + { + for (const auto &v : j["scriptProperties"].items()) + { + LuaScriptComponent::ScriptProperty scriptProperty; + scriptProperty.name = v.key(); + const auto &value = v.value(); + auto propertyTypeAsString = value["type"].get(); + if (propertyTypeAsString == "boolean") + { + scriptProperty.type = LuaScriptComponent::PropertyType::Boolean; + scriptProperty.booleanValue = value["value"].get(); + } + else if (propertyTypeAsString == "integer") + { + scriptProperty.type = LuaScriptComponent::PropertyType::Integer; + scriptProperty.integerValue = value["value"].get(); + } + else if (propertyTypeAsString == "double") + { + scriptProperty.type = LuaScriptComponent::PropertyType::Double; + scriptProperty.doubleValue = value["value"].get(); + } + else if (propertyTypeAsString == "string") + { + scriptProperty.type = LuaScriptComponent::PropertyType::String; + scriptProperty.stringValue = value["value"].get(); + } + else + { + // unknown type + continue; + } + + p.properties.push_back(scriptProperty); + } + } + } } \ No newline at end of file diff --git a/src/engine/scene/components/ComponentSerializer.h b/src/engine/scene/components/ComponentSerializer.h index c9e27ae81..66abb46df 100644 --- a/src/engine/scene/components/ComponentSerializer.h +++ b/src/engine/scene/components/ComponentSerializer.h @@ -52,4 +52,8 @@ namespace Atlas::Scene::Components { void from_json(const json& j, PlayerComponent& p); + void to_json(json& j, const LuaScriptComponent& p); + + void from_json(const json& j, LuaScriptComponent& p); + } \ No newline at end of file diff --git a/src/engine/scene/components/Components.h b/src/engine/scene/components/Components.h index 2ebb7198e..00edbfa32 100644 --- a/src/engine/scene/components/Components.h +++ b/src/engine/scene/components/Components.h @@ -9,7 +9,8 @@ #include "NameComponent.h" #include "TransformComponent.h" #include "ObjectComponent.h" +#include "LuaScriptComponent.h" #include "RigidBodyComponent.h" #include "PlayerComponent.h" #include "TextComponent.h" -#include "ClutterComponent.h" \ No newline at end of file +#include "ClutterComponent.h" diff --git a/src/engine/scene/components/HierarchyComponent.cpp b/src/engine/scene/components/HierarchyComponent.cpp index 131023c93..1759ba9af 100644 --- a/src/engine/scene/components/HierarchyComponent.cpp +++ b/src/engine/scene/components/HierarchyComponent.cpp @@ -40,6 +40,8 @@ namespace Atlas { updated = true; + globalMatrix = transform.globalMatrix; + for (auto entity : entities) { bool transformChanged = parentChanged; @@ -53,6 +55,7 @@ namespace Atlas { } if (hierarchyComponent) { + AE_ASSERT(!hierarchyComponent->root && "A child hierarchy should never also be a root hierarchy"); hierarchyComponent->Update(transformComponent ? *transformComponent : transform, transformChanged); } diff --git a/src/engine/scene/components/HierarchyComponent.h b/src/engine/scene/components/HierarchyComponent.h index 1c530146f..de3188185 100644 --- a/src/engine/scene/components/HierarchyComponent.h +++ b/src/engine/scene/components/HierarchyComponent.h @@ -27,7 +27,9 @@ namespace Atlas { std::vector& GetChildren(); - bool root = false; + bool root = false; + + glm::mat4 globalMatrix {1.0f}; protected: void Update(const TransformComponent& transform, bool parentChanged); diff --git a/src/engine/scene/components/LightComponent.cpp b/src/engine/scene/components/LightComponent.cpp index 90746c699..a3069e6cb 100644 --- a/src/engine/scene/components/LightComponent.cpp +++ b/src/engine/scene/components/LightComponent.cpp @@ -18,12 +18,12 @@ namespace Atlas { } - void LightComponent::AddDirectionalShadow(float distance, float bias, int32_t resolution, + void LightComponent::AddDirectionalShadow(float distance, float bias, int32_t resolution, float edgeSoftness, int32_t cascadeCount, float splitCorrection, bool longRange, float longRangeDistance) { AE_ASSERT(type == LightType::DirectionalLight && "Component must be of type directional light"); - shadow = CreateRef(distance, bias, resolution, + shadow = CreateRef(distance, bias, resolution, edgeSoftness, glm::min(cascadeCount, MAX_SHADOW_VIEW_COUNT), splitCorrection); shadow->allowTerrain = true; @@ -41,11 +41,11 @@ namespace Atlas { } void LightComponent::AddDirectionalShadow(float distance, float bias, int32_t resolution, - vec3 shadowCenter, vec4 orthoSize) { + float edgeSoftness, vec3 shadowCenter, vec4 orthoSize) { AE_ASSERT(type == LightType::DirectionalLight && "Component must be of type directional light"); - shadow = CreateRef(distance, bias, resolution); + shadow = CreateRef(distance, bias, resolution, edgeSoftness); shadow->center = shadowCenter; diff --git a/src/engine/scene/components/LightComponent.h b/src/engine/scene/components/LightComponent.h index 1d0cd9a38..e04bdcb72 100644 --- a/src/engine/scene/components/LightComponent.h +++ b/src/engine/scene/components/LightComponent.h @@ -61,11 +61,11 @@ namespace Atlas { LightComponent(const LightComponent& that) = default; LightComponent(LightType type, LightMobility mobility = LightMobility::MovableLight); - void AddDirectionalShadow(float distance, float bias, int32_t resolution, + void AddDirectionalShadow(float distance, float bias, int32_t resolution, float edgeSoftness, int32_t cascadeCount, float splitCorrection, bool longRange = false, float longRangeDistance = 0.0f); void AddDirectionalShadow(float distance, float bias, int32_t resolution, - vec3 shadowCenter, vec4 orthoSize); + float edgeSoftness, vec3 shadowCenter, vec4 orthoSize); void AddPointShadow(float bias, int32_t resolution); diff --git a/src/engine/scene/components/LuaScriptComponent.cpp b/src/engine/scene/components/LuaScriptComponent.cpp new file mode 100644 index 000000000..e254d08b9 --- /dev/null +++ b/src/engine/scene/components/LuaScriptComponent.cpp @@ -0,0 +1,294 @@ +#include "LuaScriptComponent.h" + +#include "../Scene.h" +#include "TransformComponent.h" + +namespace Atlas::Scene::Components { + + LuaScriptComponent::LuaScriptComponent(Scene* scene, Entity entity) : scene(scene), entity(entity) { + + + + } + + LuaScriptComponent::LuaScriptComponent(Scene* scene, Entity entity, const LuaScriptComponent& that) { + + if (this != &that) { + *this = that; + } + + this->scene = scene; + this->entity = entity; + + } + + void LuaScriptComponent::Update(Scripting::LuaScriptManager& scriptManager, float deltaTime) { + // set the script manager + if (this->scriptManager == nullptr) { + this->scriptManager = &scriptManager; + } + + AE_ASSERT(scene != nullptr); + AE_ASSERT(scene->physicsWorld != nullptr); + AE_ASSERT(this->scriptManager == &scriptManager); + + // check if the script resource is loaded + if (!script.IsLoaded()) + return; + + // check if script was modified the frame before + { + auto resource = script.GetResource(); + if (scriptWasModifiedInLastUpdate && resource->WasModified()) { + resource->UpdateModifiedTime(); + } + scriptWasModifiedInLastUpdate = false; + if (resource->WasModified()) { + // Do reload here, adjust modified time beforehand to be conservative + script->Reload(); + scriptWasModifiedInLastUpdate = true; + } + } + + if (scriptWasModifiedInLastUpdate) { + // the script was modified + + // reset the saved references + updateFunction.reset(); + scriptEnvironment.reset(); + + // reload the properties, therefore init the state + if (!InitScriptEnvironment()) + return; + + // and then get or update the properties from the script + GetOrUpdatePropertiesFromScript(); + } + + if (scene->physicsWorld->pauseSimulation) { + // the instance is not running, discard the state + updateFunction.reset(); + scriptEnvironment.reset(); + } + else { + // the instance is running, create a state if not existing + if (!scriptEnvironment.has_value()) { + if (!InitScriptEnvironment()) + return; + } + + // process the script + AE_ASSERT(scriptEnvironment.has_value()); + SetPropertyValuesInLuaState(); + + // call the update function + try { + if (updateFunction.has_value()) { + auto result = updateFunction.value()(deltaTime); + if (!result.valid()) { + // Call failed + // Note that if the handler was successfully called, this will include + // the additional appended error message information of + // "got_problems handler: " ... + sol::error err = result; + std::string what = err.what(); + Log::Error("Error while executing update in " + + script.GetResource()->GetFileName() + ": " + what); + } + } + } + catch (const std::exception& e) { + Atlas::Log::Message("Error while compiling lua script " + + script.GetResource()->GetFileName() + ": " + std::string(e.what())); + } + } + } + + bool LuaScriptComponent::InitScriptEnvironment() { + AE_ASSERT(!scriptEnvironment.has_value()); + try { + // create environment + auto& state = scriptManager->state(); + sol::environment scriptEnv(state, sol::create, state.globals()); + scriptEnvironment = scriptEnv; + + // create environment based functions + scriptEnv.set_function("GetThisEntity", [&]() { return this->entity; }); + + scriptEnv.set_function("GetThisScene", [&]() { return this->scene; }); + + // load script + state.script(script->code, scriptEnv); + + // load the script functions + sol::protected_function function = scriptEnv["Update"]; + if (function.valid()) { + this->updateFunction = function; + } + } + catch (const std::exception& e) { + updateFunction.reset(); + scriptEnvironment.reset(); + Atlas::Log::Message("Error while compiling lua script " + + script.GetResource()->GetFileName() + ": " + std::string(e.what())); + + return false; + } + + return true; + } + + std::vector LuaScriptComponent::GetPropertiesFromScript() { + AE_ASSERT(scriptEnvironment.has_value()); + + const auto& state = scriptEnvironment.value(); + + sol::optional scriptProperties = state["ScriptProperties"]; + if (!scriptProperties.has_value()) { + return {}; + } + + std::vector foundProperties; + for (const auto& entry : scriptProperties.value()) { + ScriptProperty scriptProperty = {}; + + // determine property name + const auto& key = entry.first; + if (!key.valid()) + continue; + if (!key.is()) + continue; + scriptProperty.name = key.as(); + + // determine property type and value + const auto& propertyTable = entry.second; + if (!propertyTable.valid()) + continue; + if (!propertyTable.is()) + continue; + const auto& tbl = propertyTable.as(); + if (!tbl.valid()) + continue; + + // determine property type + sol::optional type = tbl["type"]; + if (!type.has_value()) + continue; + + auto typeValue = type.value(); + std::transform(typeValue.begin(), typeValue.end(), typeValue.begin(), ::tolower); + + if (typeValue == "string") { + scriptProperty.type = PropertyType::String; + } + else if (typeValue == "double") { + scriptProperty.type = PropertyType::Double; + } + else if (typeValue == "integer") { + scriptProperty.type = PropertyType::Integer; + } + else if (typeValue == "boolean") { + scriptProperty.type = PropertyType::Boolean; + } + else { + continue; // unknown type + } + + // determine property value + const auto& value = tbl["value"]; + if (!value.valid()) + continue; + switch (scriptProperty.type) { + case PropertyType::String: + if (!value.is()) + continue; + scriptProperty.stringValue = value.get(); + break; + case PropertyType::Double: + if (!value.is()) + continue; + scriptProperty.doubleValue = value.get(); + break; + case PropertyType::Integer: + if (!value.is()) + continue; + scriptProperty.integerValue = value.get(); + break; + case PropertyType::Boolean: + if (!value.is()) + continue; + scriptProperty.booleanValue = value.get(); + break; + } + + foundProperties.push_back(scriptProperty); + } + + return foundProperties; + } + + void LuaScriptComponent::GetOrUpdatePropertiesFromScript() { + // generate a map for the old properties + std::unordered_map oldPropertyMap; + std::set toRemove; + for (auto i = 0; i < properties.size(); i++) { + oldPropertyMap[properties[i].name] = i; + toRemove.insert(i); + } + + // obtain the new properties from the script + auto newProperties = GetPropertiesFromScript(); + for (auto& newProp : newProperties) { + bool oldPropEqualToNewProp = false; + auto find = oldPropertyMap.find(newProp.name); + if (find != oldPropertyMap.end()) { + // a property with this name already exists + const auto& oldProperty = properties[(*find).second]; + if (newProp.type == oldProperty.type) { + // the new and old property also have the same type + // therefore it is not necessary to remove the old property + toRemove.erase((*find).second); + oldPropEqualToNewProp = true; + } + } + + if (!oldPropEqualToNewProp) { + // the new property is not covered by an old one, hence add it + properties.push_back(newProp); + } + } + + // generate the new property set by skipping the ones that are no longer defined + std::vector mergedProperties; + for (auto i = 0; i < properties.size(); i++) { + if (toRemove.contains(i)) + continue; + mergedProperties.push_back(properties[i]); + } + + // update the member + properties = mergedProperties; + } + + void LuaScriptComponent::SetPropertyValuesInLuaState() { + AE_ASSERT(scriptEnvironment.has_value()); + auto& state = scriptEnvironment.value(); + + for (const auto& property : properties) { + switch (property.type) { + case PropertyType::String: + state["ScriptProperties"][property.name]["value"] = property.stringValue; + break; + case PropertyType::Double: + state["ScriptProperties"][property.name]["value"] = property.doubleValue; + break; + case PropertyType::Integer: + state["ScriptProperties"][property.name]["value"] = property.integerValue; + break; + case PropertyType::Boolean: + state["ScriptProperties"][property.name]["value"] = property.booleanValue; + break; + } + } + } +} \ No newline at end of file diff --git a/src/engine/scene/components/LuaScriptComponent.h b/src/engine/scene/components/LuaScriptComponent.h new file mode 100644 index 000000000..d0a18f7c7 --- /dev/null +++ b/src/engine/scene/components/LuaScriptComponent.h @@ -0,0 +1,72 @@ +#pragma once + +#include "../../System.h" +#include "../../scripting/Script.h" +#include "../../resource/Resource.h" +#include "../Entity.h" +#include "scripting/LuaScriptManager.h" + +#include + +namespace Atlas::Scene +{ + + class Scene; + + namespace Components + { + + class LuaScriptComponent + { + friend Scene; + + public: + enum class PropertyType + { + String, + Double, + Integer, + Boolean + }; + + struct ScriptProperty + { + std::string name; + PropertyType type; + + double doubleValue = 0.0; + int integerValue = 0; + std::string stringValue = ""; + bool booleanValue = false; + }; + + LuaScriptComponent(Scene *scene, Entity entity); + LuaScriptComponent(Scene *scene, Entity entity, const LuaScriptComponent &that); + LuaScriptComponent() = default; + + ResourceHandle script; + std::vector properties; + + protected: + void Update(Scripting::LuaScriptManager& scriptManager, float deltaTime); + + private: + Scene *scene; + Entity entity; + Scripting::LuaScriptManager* scriptManager = nullptr; + + bool scriptWasModifiedInLastUpdate = false; + + std::optional updateFunction; + std::optional scriptEnvironment; + + bool InitScriptEnvironment(); + std::vector GetPropertiesFromScript(); + void GetOrUpdatePropertiesFromScript(); + void LoadScriptAndFetchProperties(); + void SetPropertyValuesInLuaState(); + }; + + } + +} \ No newline at end of file diff --git a/src/engine/scene/components/MeshComponent.h b/src/engine/scene/components/MeshComponent.h index cf14cc3bf..2963074f4 100644 --- a/src/engine/scene/components/MeshComponent.h +++ b/src/engine/scene/components/MeshComponent.h @@ -20,7 +20,7 @@ namespace Atlas { public: MeshComponent() = default; explicit MeshComponent(Scene* scene) : scene(scene) {} - explicit MeshComponent(Scene* scene, ResourceHandle mesh) : + explicit MeshComponent(Scene* scene, const ResourceHandle& mesh) : scene(scene), mesh(mesh) {}; void ChangeResource(const ResourceHandle& mesh); diff --git a/src/engine/scene/components/PlayerComponent.cpp b/src/engine/scene/components/PlayerComponent.cpp index cced769d4..0b6227584 100644 --- a/src/engine/scene/components/PlayerComponent.cpp +++ b/src/engine/scene/components/PlayerComponent.cpp @@ -30,8 +30,11 @@ namespace Atlas::Scene::Components { auto up = GetUp(); + // Don't want to stick to the ground while jumping if (!jumped) - StickToGround(-up * stickToGroundDistance); + stickToGroundDist = -up * stickToGroundDistance; + else + stickToGroundDist = vec3(0.0f); auto newVelocity = vec3(0.0f); auto groundVelocity = GetGroundVelocity(); @@ -49,12 +52,13 @@ namespace Atlas::Scene::Components { if (slide) { // Get difference between ground velocity and actual velocty and dampen this over time vec3 slideVelocity = GetLinearVelocity() - groundVelocity; + // Cancel out vertical velocity, we are on the ground + slideVelocity -= lastGravityAcceleration; float slideVelocityLength = glm::min(glm::length(slideVelocity), slideVelocityMax); - vec3 deaccVelocity = slideDeacceleration * 1.0f * slideVelocity * deltaTime; + vec3 deaccVelocity = slideDeacceleration * slideVelocity * deltaTime; if (slideVelocityLength > slideCutoffVelocity && slideVelocityLength > glm::length(deaccVelocity)) { - if (glm::dot(slideVelocity, slideVelocity) > 0.0f) { newVelocity += slideVelocity; newVelocity -= deaccVelocity; @@ -72,10 +76,13 @@ namespace Atlas::Scene::Components { jump = false; - newVelocity += up * world->GetGravity() * deltaTime; + lastGravityAcceleration = up * world->GetGravity() * deltaTime; + newVelocity += lastGravityAcceleration; SetLinearVelocity(newVelocity); + walkStairsStepUpDist = up * walkStairStepUpDistance; + Player::Update(deltaTime); } diff --git a/src/engine/scene/components/PlayerComponent.h b/src/engine/scene/components/PlayerComponent.h index 1b50cdd20..41e2b219b 100644 --- a/src/engine/scene/components/PlayerComponent.h +++ b/src/engine/scene/components/PlayerComponent.h @@ -35,9 +35,10 @@ namespace Atlas::Scene { bool allowInput = true; float stickToGroundDistance = 0.1f; + float walkStairStepUpDistance = 0.2f; - float slideDeacceleration = 1.0f; - float slideCutoffVelocity = 0.1f; + float slideDeacceleration = 4.0f; + float slideCutoffVelocity = 0.2f; float slideVelocityMax = 4.0f; private: @@ -54,6 +55,8 @@ namespace Atlas::Scene { vec3 inputVelocity = vec3(0.0f); + vec3 lastGravityAcceleration = vec3(0.0f); + friend Scene; }; diff --git a/src/engine/scene/components/TransformComponent.cpp b/src/engine/scene/components/TransformComponent.cpp index dcac0c1e5..b93ed041e 100644 --- a/src/engine/scene/components/TransformComponent.cpp +++ b/src/engine/scene/components/TransformComponent.cpp @@ -21,29 +21,27 @@ namespace Atlas { void TransformComponent::Set(const glm::mat4& matrix) { - AE_ASSERT(!isStatic && "Change of static transform component not allowed"); + this->matrix = matrix; + changed = true; + updated = false; - if (isStatic) { - return; - } + } + + void TransformComponent::Translate(glm::vec3 translation) { - this->matrix = matrix; + this->matrix = glm::translate(matrix, translation); changed = true; updated = false; } - void TransformComponent::ReconstructLocalMatrix(const Ref& scene) { + void TransformComponent::ReconstructLocalMatrix(const Entity& parentEntity) { mat4 parentGlobalMatrix = mat4(1.0f); - auto parentEntity = scene->GetParentEntity(entity); - TransformComponent* parentTransform = nullptr; - if (parentEntity.IsValid()) - parentTransform = parentEntity.TryGetComponent(); - - if (parentTransform) { - parentGlobalMatrix = parentTransform->globalMatrix; + if (parentEntity.IsValid()) { + const auto& parentHierarchy = parentEntity.GetComponent(); + parentGlobalMatrix = parentHierarchy.globalMatrix; } auto inverseParentMatrix = glm::inverse(parentGlobalMatrix); @@ -79,6 +77,12 @@ namespace Atlas { return Common::MatrixDecomposition(matrix); + } + + Common::MatrixDecomposition TransformComponent::DecomposeGlobal() const { + + return Common::MatrixDecomposition(globalMatrix); + } } diff --git a/src/engine/scene/components/TransformComponent.h b/src/engine/scene/components/TransformComponent.h index 905b41981..d5c88db47 100644 --- a/src/engine/scene/components/TransformComponent.h +++ b/src/engine/scene/components/TransformComponent.h @@ -33,7 +33,7 @@ namespace Atlas { void Set(const glm::mat4& matrix); - void ReconstructLocalMatrix(const Ref& scene); + void ReconstructLocalMatrix(const Entity& parentEntity); bool IsStatic() const; @@ -42,6 +42,7 @@ namespace Atlas { void Scale(glm::vec3 scale); Common::MatrixDecomposition Decompose() const; + Common::MatrixDecomposition DecomposeGlobal() const; void Compose(Common::MatrixDecomposition composition); glm::mat4 matrix = mat4{ 1.0f }; diff --git a/src/engine/scene/prefabs/Node.h b/src/engine/scene/prefabs/Node.h index 9945b205a..96771b499 100644 --- a/src/engine/scene/prefabs/Node.h +++ b/src/engine/scene/prefabs/Node.h @@ -15,11 +15,11 @@ namespace Atlas { class Node : public Entity { public: - Node(ECS::Entity entity, ECS::EntityManager* manager, mat4 transform) : Entity(entity, manager) { + Node(ECS::Entity entity, ECS::EntityManager* manager, const std::string& name, mat4 transform) : Entity(entity, manager) { AddComponent(); - AddComponent(); - AddComponent(); + AddComponent(transform); + AddComponent(name); } diff --git a/src/engine/scripting/LuaScriptBindings.cpp b/src/engine/scripting/LuaScriptBindings.cpp new file mode 100644 index 000000000..a8322cbd3 --- /dev/null +++ b/src/engine/scripting/LuaScriptBindings.cpp @@ -0,0 +1,577 @@ +#include "LuaScriptBindings.h" +#include "Log.h" +#include "scene/Entity.h" +#include "scene/Scene.h" +#include "Clock.h" +#include "resource/ResourceManager.h" +#include "input/KeyboardMap.h" + +namespace Atlas::Scripting { + + LuaScriptBindings::LuaScriptBindings(Ref luaState, sol::table* atlasNs, sol::table* glmNs) { + + this->luaState = luaState; + this->atlasNs = atlasNs; + this->glmNs = glmNs; + + } + + void LuaScriptBindings::GenerateBindings() { + + GenerateSceneBindings(atlasNs); + GenerateEntityBindings(atlasNs); + GenerateComponentBindings(atlasNs); + GenerateUtilityBindings(atlasNs); + GenerateMaterialBindings(atlasNs); + GenerateAudioBindings(atlasNs); + GenerateMeshBindings(atlasNs); + GenerateMathBindings(glmNs); + GenerateVolumeBindings(atlasNs); + GenerateInputBindings(atlasNs); + + } + + void LuaScriptBindings::GenerateSceneBindings(sol::table* ns) { + + ns->new_usertype("Scene", + "CreateEntity", &Scene::Scene::CreateEntity, + "DestroyEntity", &Scene::Scene::DestroyEntity, + "DuplicateEntity", &Scene::Scene::DuplicateEntity, + "GetEntityByName", &Scene::Scene::GetEntityByName, + "GetParentEntity", &Scene::Scene::GetParentEntity, + "GetMainCamera", &Scene::Scene::GetMainCamera, + "HasMainCamera", &Scene::Scene::HasMainCamera + ); + + } + + void LuaScriptBindings::GenerateEntityBindings(sol::table* ns) { + + auto entityType = ns->new_usertype("Entity", + "IsValid", &Scene::Entity::IsValid, + // Add components + "AddAudioComponent", &Scene::Entity::AddComponent&, float, bool>, + "AddAudioVolumeComponent", &Scene::Entity::AddComponent&, Volume::AABB&, float>, + "AddCameraComponent", &Scene::Entity::AddComponent, + "AddHierarchyComponent", &Scene::Entity::AddComponent, + "AddLightComponentComponent", &Scene::Entity::AddComponent, + "AddMeshComponent", &Scene::Entity::AddComponent&>, + "AddNameComponent", &Scene::Entity::AddComponent, + "AddPlayerComponent", &Scene::Entity::AddComponent, + "AddRigidBodyComponent", &Scene::Entity::AddComponent, + "AddTextComponent", &Scene::Entity::AddComponent&, std::string>, + "AddTransformComponent", &Scene::Entity::AddComponent, + + // Remove components + "RemoveAudioComponent", &Scene::Entity::RemoveComponent, + "RemoveAudioVolumeComponent", &Scene::Entity::RemoveComponent, + "RemoveCameraComponent", &Scene::Entity::RemoveComponent, + "RemoveHierarchyComponent", &Scene::Entity::RemoveComponent, + "RemoveLightComponentComponent", &Scene::Entity::RemoveComponent, + "RemoveMeshComponent", &Scene::Entity::RemoveComponent, + "RemoveNameComponent", &Scene::Entity::RemoveComponent, + "RemovePlayerComponent", &Scene::Entity::RemoveComponent, + "RemoveRigidBodyComponent", &Scene::Entity::RemoveComponent, + "RemoveTextComponent", &Scene::Entity::RemoveComponent, + "RemoveTransformComponent", &Scene::Entity::RemoveComponent, + + // Get components + "GetAudioComponent", &Scene::Entity::TryGetComponent, + "GetAudioVolumeComponent", &Scene::Entity::TryGetComponent, + "GetCameraComponent", &Scene::Entity::TryGetComponent, + "GetHierarchyComponent", &Scene::Entity::TryGetComponent, + "GetLightComponentComponent", &Scene::Entity::TryGetComponent, + "GetMeshComponent", &Scene::Entity::TryGetComponent, + "GetNameComponent", &Scene::Entity::TryGetComponent, + "GetPlayerComponent", &Scene::Entity::TryGetComponent, + "GetRigidBodyComponent", &Scene::Entity::TryGetComponent, + "GetTextComponent", &Scene::Entity::TryGetComponent, + "GetTransformComponent", &Scene::Entity::TryGetComponent + ); + + } + + void LuaScriptBindings::GenerateComponentBindings(sol::table* ns) { + + ns->new_usertype("AudioComponent", + "falloffFactor", &AudioComponent::falloffFactor, + "falloffPower", &AudioComponent::falloffPower, + "cutoff", &AudioComponent::cutoff, + "volume", &AudioComponent::volume, + "stream", &AudioComponent::stream + ); + + ns->new_usertype("AudioVolumeComponent", + "falloffFactor", &AudioVolumeComponent::falloffFactor, + "falloffPower", &AudioVolumeComponent::falloffPower, + "cutoff", &AudioVolumeComponent::cutoff, + "volume", &AudioVolumeComponent::volume, + "aabb", &AudioVolumeComponent::aabb, + "stream", &AudioVolumeComponent::stream + ); + + ns->new_usertype("CameraComponent", + "GetJitter", &CameraComponent::GetJitter, + "GetLastJitter", &CameraComponent::GetLastJitter, + "GetLastJitteredMatrix", &CameraComponent::GetLastJitteredMatrix, + "GetLocation", &CameraComponent::GetLocation, + "GetLastLocation", &CameraComponent::GetLastLocation, + "GetFrustumCorners", &CameraComponent::GetFrustumCorners, + "UpdateFrustum", &CameraComponent::UpdateFrustum, + "location", &CameraComponent::location, + "rotation", &CameraComponent::rotation, + "exposure", &CameraComponent::exposure, + "fieldOfView", &CameraComponent::fieldOfView, + "aspectRatio", &CameraComponent::aspectRatio, + "nearPlane", &CameraComponent::nearPlane, + "farPlane", &CameraComponent::farPlane, + "thirdPerson", &CameraComponent::thirdPerson, + "thirdPersonDistance", &CameraComponent::thirdPersonDistance, + "direction", &CameraComponent::direction, + "up", &CameraComponent::up, + "right", &CameraComponent::right, + "viewMatrix", &CameraComponent::viewMatrix, + "projectionMatrix", &CameraComponent::projectionMatrix, + "invViewMatrix", &CameraComponent::invViewMatrix, + "invProjectionMatrix", &CameraComponent::invProjectionMatrix, + "unjitterdProjection", &CameraComponent::unjitterdProjection, + "invUnjitteredProjection", &CameraComponent::invUnjitteredProjection, + "parentTransform", &CameraComponent::parentTransform, + "frustum", &CameraComponent::frustum, + "isMain", &CameraComponent::isMain, + "useEntityTranslation", &CameraComponent::useEntityTranslation, + "useEntityRotation", &CameraComponent::useEntityRotation + ); + + ns->new_usertype("HierarchyComponent", + "AddChild", &HierarchyComponent::AddChild, + "RemoveChild", &HierarchyComponent::RemoveChild, + "GetChildren", &HierarchyComponent::GetChildren, + "globalMatrix", &HierarchyComponent::globalMatrix, + "root", &HierarchyComponent::root + ); + + // TODO: Extend this + ns->new_usertype("LightComponent", + "color", &LightComponent::color, + "intensity", &LightComponent::intensity, + "properties", &LightComponent::properties, + "transformedProperties", &LightComponent::transformedProperties, + "isMain", &LightComponent::isMain, + "volumetric", &LightComponent::volumetric + ); + + ns->new_usertype("MeshComponent", + "mesh", &MeshComponent::mesh, + "visible", &MeshComponent::visible, + "dontCull", &MeshComponent::dontCull, + "aabb", &MeshComponent::aabb + ); + + ns->new_usertype("NameComponent", + "name", &NameComponent::name + ); + + ns->new_usertype("TransformComponent", + "Translate", &TransformComponent::Translate, + "Set", &TransformComponent::Set, + "Decompose", &TransformComponent::Decompose, + "DecomposeGlobal", &TransformComponent::DecomposeGlobal, + "ReconstructLocalMatrix", &TransformComponent::ReconstructLocalMatrix, + //"Compose", &TransformComponent::Compose, + "matrix", &TransformComponent::matrix, + "globalMatrix", &TransformComponent::globalMatrix + ); + + ns->new_usertype("RigidBodyComponent", + "IsValid", &RigidBodyComponent::IsValid, + "SetMatrix", &RigidBodyComponent::SetMatrix, + "GetMatrix", &RigidBodyComponent::GetMatrix, + "SetLinearVelocity", &RigidBodyComponent::SetLinearVelocity, + "GetLinearVelocity", &RigidBodyComponent::GetLinearVelocity, + "SetAngularVelocity", &RigidBodyComponent::SetAngularVelocity, + "GetAngularVelocity", &RigidBodyComponent::GetAngularVelocity, + "SetRestitution", &RigidBodyComponent::SetRestitution, + "GetRestitution", &RigidBodyComponent::GetRestitution, + "SetFriction", &RigidBodyComponent::SetFriction, + "GetFriction", &RigidBodyComponent::GetFriction + ); + + ns->new_usertype("PlayerComponent", + "SetPosition", &PlayerComponent::SetPosition, + "GetPosition", &PlayerComponent::GetPosition, + "SetRotation", &PlayerComponent::SetRotation, + "GetRotation", &PlayerComponent::GetRotation, + "GetMatrix", &PlayerComponent::GetMatrix, + "SetLinearVelocity", &PlayerComponent::SetLinearVelocity, + "GetLinearVelocity", &PlayerComponent::GetLinearVelocity, + "GetGroundVelocity", &PlayerComponent::GetGroundVelocity, + "IsOnGround", &PlayerComponent::IsOnGround, + "stickToGroundDist", &PlayerComponent::stickToGroundDist, + "walkStairsStepUpDist", &PlayerComponent::walkStairsStepUpDist + ); + + ns->new_usertype("TextComponent", + "text", &TextComponent::text, + "position", &TextComponent::position, + "rotation", &TextComponent::rotation, + "halfSize", &TextComponent::halfSize, + "textColor", &TextComponent::textColor, + "outlineColor", &TextComponent::outlineColor, + "outlineFactor", &TextComponent::outlineFactor, + "textScale", &TextComponent::textScale + ); + + } + + void LuaScriptBindings::GenerateUtilityBindings(sol::table* ns) { + + auto log = ns->new_usertype("Log"); + // Set it manually here to avoid having a function that require the optional argument to log + log.set_function("Message", [](const std::string& msg) { Log::Message(msg); }); + log.set_function("Warning", [](const std::string& warn) { Log::Warning(warn); }); + log.set_function("Error", [](const std::string& err) { Log::Error(err); }); + + ns->new_usertype("Clock", + "Get", &Clock::Get, + "GetDelta", &Clock::GetDelta, + "GetAverage", &Clock::GetAverage); + + ns->new_usertype("MatrixDecomposition", + sol::call_constructor, + sol::constructors(), + "Compose", &Common::MatrixDecomposition::Compose, + "Decompose", &Common::MatrixDecomposition::Decompose, + "translation", &Common::MatrixDecomposition::translation, + "rotation", &Common::MatrixDecomposition::rotation, + "scale", &Common::MatrixDecomposition::scale, + "perspective", &Common::MatrixDecomposition::perspective, + "skew", &Common::MatrixDecomposition::skew, + "quaternion", &Common::MatrixDecomposition::quaternion); + + } + + void LuaScriptBindings::GenerateMaterialBindings(sol::table* ns) { + + ns->new_usertype("Material", + "HasBaseColorMap", &Material::HasBaseColorMap, + "HasOpacityMap", &Material::HasOpacityMap, + "HasNormalMap", &Material::HasNormalMap, + "HasRoughnessMap", &Material::HasRoughnessMap, + "HasMetalnessMap", &Material::HasMetalnessMap, + "HasAoMap", &Material::HasAoMap, + "HasDisplacementMap", &Material::HasDisplacementMap, + "name", &Material::name, + "baseColor", &Material::baseColor, + "transmissiveColor", &Material::transmissiveColor, + "emissiveColor", &Material::emissiveColor, + "emissiveIntensity", &Material::emissiveIntensity, + "opacity", &Material::opacity, + "roughness", &Material::roughness, + "metalness", &Material::metalness, + "ao", &Material::ao, + "reflectance", &Material::reflectance, + "normalScale", &Material::normalScale, + "displacementScale", &Material::displacementScale, + "tiling", &Material::tiling, + "twoSided", &Material::twoSided, + "vertexColors", &Material::vertexColors + ); + + } + + void LuaScriptBindings::GenerateAudioBindings(sol::table* ns) { + + GenerateResourceBinding(ns, "AudioResourceHandle"); + + ns->new_usertype("AudioData", + "GetChannelCount", &Audio::AudioData::GetChannelCount, + "GetFrequency", &Audio::AudioData::GetFrequency, + "GetSampleSize", &Audio::AudioData::GetSampleSize, + "filename", &Audio::AudioData::filename + ); + + ns->new_usertype("AudioStream", + "GetDuration", &Audio::AudioStream::GetDuration, + "SetTime", &Audio::AudioStream::SetTime, + "GetTime", &Audio::AudioStream::GetTime, + "SetVolume", &Audio::AudioStream::SetVolume, + "GetVolume", &Audio::AudioStream::GetVolume, + "SetPitch", &Audio::AudioStream::SetPitch, + "GetPitch", &Audio::AudioStream::GetPitch, + "Pause", &Audio::AudioStream::Pause, + "Resume", &Audio::AudioStream::Resume, + "IsPaused", &Audio::AudioStream::IsPaused, + "IsValid", &Audio::AudioStream::IsValid, + "loop", &Audio::AudioStream::loop + ); + + } + + void LuaScriptBindings::GenerateMeshBindings(sol::table* ns) { + + GenerateResourceBinding(ns, "MeshResourceHandle"); + + ns->new_usertype("MeshData", + "filename", &Mesh::MeshData::filename, + "materials", &Mesh::MeshData::materials, + "primitiveType", &Mesh::MeshData::primitiveType, + "aabb", &Mesh::MeshData::aabb, + "transform", &Mesh::MeshData::transform, + "radius", &Mesh::MeshData::radius + ); + + ns->new_usertype("Mesh", + "name", &Mesh::Mesh::name, + "data", &Mesh::Mesh::data, + "mobility", &Mesh::Mesh::mobility, + "usage", &Mesh::Mesh::usage, + "cullBackFaces", &Mesh::Mesh::cullBackFaces, + "depthTest", &Mesh::Mesh::depthTest, + "castShadow", &Mesh::Mesh::castShadow, + "vegetation", &Mesh::Mesh::vegetation, + "windNoiseTextureLod", &Mesh::Mesh::windNoiseTextureLod, + "windBendScale", &Mesh::Mesh::windBendScale, + "windWiggleScale", &Mesh::Mesh::windWiggleScale, + "allowedShadowCascades", &Mesh::Mesh::allowedShadowCascades, + "impostorDistance", &Mesh::Mesh::impostorDistance, + "impostorShadowDistance", &Mesh::Mesh::impostorShadowDistance, + "invertUVs", &Mesh::Mesh::invertUVs + ); + + } + + void LuaScriptBindings::GenerateMathBindings(sol::table* ns) { + + GenerateGlmTypeBinding(ns, "Vec2", + sol::constructors(), + "x", &glm::vec2::x, + "y", &glm::vec2::y); + + GenerateGlmTypeBinding(ns, "Vec3", + sol::constructors(), + "x", &glm::vec3::x, + "y", &glm::vec3::y, + "z", &glm::vec3::z); + + GenerateGlmTypeBinding(ns, "Vec4", + sol::constructors(), + "x", &glm::vec4::x, + "y", &glm::vec4::y, + "z", &glm::vec4::z, + "w", &glm::vec4::w); + + GenerateGlmTypeBinding(ns, "Mat3", + sol::constructors()); + + GenerateGlmTypeBinding(ns, "Mat4", + sol::constructors()); + + auto quat_multiplication_overloads = sol::overload( + [](const glm::quat& v0, const glm::quat& v1) { return v0 * v1; }, + [](const glm::quat& v0, float value) { return v0 * value; }, + [](const float& value, const glm::quat& v0) { return v0 * value; } + ); + + ns->new_usertype("Quat", + sol::call_constructor, + sol::constructors(), + sol::meta_function::multiplication, quat_multiplication_overloads, + "x", &glm::quat::x, + "y", &glm::quat::y, + "z", &glm::quat::z, + "w", &glm::quat::w + ); + + ns->set_function("Dot", sol::overload( + [](const glm::vec2& v0, const glm::vec2& v1) { return glm::dot(v0, v1); }, + [](const glm::vec3& v0, const glm::vec3& v1) { return glm::dot(v0, v1); }, + [](const glm::vec4& v0, const glm::vec4& v1) { return glm::dot(v0, v1); } + )); + + ns->set_function("Translate", sol::overload( + [](const glm::vec3& vec) { return glm::translate(vec); }, + [](const glm::mat4& mat, const glm::vec3& vec) { return glm::translate(mat, vec); } + )); + + ns->set_function("Scale", sol::overload( + [](const glm::vec3& vec) { return glm::scale(vec); }, + [](const glm::mat4& mat, const glm::vec3& vec) { return glm::scale(mat, vec); } + )); + + ns->set_function("Rotate", sol::overload( + [](float angle, const glm::vec3& vec) { return glm::rotate(angle, vec); }, + [](const glm::mat4& mat, float angle, const glm::vec3& vec) { return glm::rotate(mat, angle, vec); } + )); + + ns->set_function("Mix", sol::overload( + [](const float float0, const float float1, const float factor) { return glm::mix(float0, float1, factor); }, + [](const glm::vec2& vec0, const glm::vec2& vec1, const float factor) { return glm::mix(vec0, vec1, factor); }, + [](const glm::vec3& vec0, const glm::vec3& vec1, const float factor) { return glm::mix(vec0, vec1, factor); }, + [](const glm::quat& quat0, const glm::quat& quat1, const float factor) { return glm::mix(quat0, quat1, factor); } + )); + + ns->set_function("LookAt", [](const glm::vec3& eye, const glm::vec3& center, const glm::vec3& up) + { return glm::lookAt(eye, center, up); } + ); + + ns->set_function("EulerAngles", [](const glm::quat& quaternion) { return glm::eulerAngles(quaternion); }); + + } + + void LuaScriptBindings::GenerateVolumeBindings(sol::table* ns) { + + auto isInsideAABBOverload = sol::overload( + [](Volume::AABB& aabb0, const Volume::AABB& aabb1) { return aabb0.IsInside(aabb1); }, + [](Volume::AABB& aabb, const vec3& vec) { return aabb.IsInside(vec); } + ); + + auto growAABBOverload = sol::overload( + [](Volume::AABB& aabb0, const Volume::AABB& aabb1) { return aabb0.Grow(aabb1); }, + [](Volume::AABB& aabb, const vec3& vec) { return aabb.Grow(vec); } + ); + + ns->new_usertype("AABB", + sol::call_constructor, + sol::constructors(), + "Intersects", &Volume::AABB::Intersects, + "IsInside", isInsideAABBOverload, + "Transform", &Volume::AABB::Transform, + "Translate", &Volume::AABB::Translate, + "Scale", &Volume::AABB::Scale, + "Grow", growAABBOverload, + "Intersect", &Volume::AABB::Intersect, + "GetSurfaceArea", &Volume::AABB::GetSurfaceArea, + "GetSize", &Volume::AABB::GetSize, + "GetDistance", &Volume::AABB::GetDistance, + "GetCorners", &Volume::AABB::GetCorners, + "min", &Volume::AABB::min, + "max", &Volume::AABB::max + ); + + auto resizeFrustumOverload = sol::overload( + [](Volume::Frustum& frustum, const std::vector& corners) { frustum.Resize(corners); }, + [](Volume::Frustum& frustum, const mat4& matrix) { frustum.Resize(matrix); } + ); + + ns->new_usertype("Frustum", + sol::call_constructor, + sol::constructors&), Volume::Frustum(glm::mat4)>(), + "Resize", resizeFrustumOverload, + "Intersects", &Volume::Frustum::Intersects, + "IsInside", &Volume::Frustum::IsInside, + "GetPlanes", &Volume::Frustum::GetPlanes, + "GetCorners", &Volume::Frustum::GetCorners + ); + + } + + void LuaScriptBindings::GenerateInputBindings(sol::table* ns) { + + ns->new_enum("Keycode", + "KeyUnknown", Keycode::KeyUnknown, + "KeyEnter", Keycode::KeyEnter, + "KeyEscape", Keycode::KeyEscape, + "KeyBackspace", Keycode::KeyBackspace, + "KeyTab", Keycode::KeyTab, + "KeySpace", Keycode::KeySpace, + "KeyExclaim", Keycode::KeyExclaim, + "KeyDoubleQuote", Keycode::KeyDoubleQuote, + "KeyHash", Keycode::KeyHash, + "KeyPercent", Keycode::KeyPercent, + "KeyDollar", Keycode::KeyDollar, + "KeyAnd", Keycode::KeyAnd, + "KeyQuote", Keycode::KeyQuote, + "KeyLeftParen", Keycode::KeyLeftParen, + "KeyRightParen", Keycode::KeyRightParen, + "KeyAsterisk", Keycode::KeyAsterisk, + "KeyPlus", Keycode::KeyPlus, + "KeyComma", Keycode::KeyComma, + "KeyMinus", Keycode::KeyMinus, + "KeyPeriod", Keycode::KeyPeriod, + "KeySlash", Keycode::KeySlash, + "Key0", Keycode::Key0, + "Key1", Keycode::Key1, + "Key2", Keycode::Key2, + "Key3", Keycode::Key3, + "Key4", Keycode::Key4, + "Key5", Keycode::Key5, + "Key6", Keycode::Key6, + "Key7", Keycode::Key7, + "Key8", Keycode::Key8, + "Key9", Keycode::Key9, + "KeyColon", Keycode::KeyColon, + "KeySemicolon", Keycode::KeySemicolon, + "KeyLess", Keycode::KeyLess, + "KeyEquals", Keycode::KeyEquals, + "KeyGreater", Keycode::KeyGreater, + "KeyQuestion", Keycode::KeyQuestion, + "KeyAt", Keycode::KeyAt, + "KeyLeftBracket", Keycode::KeyLeftBracket, + "KeyBackSlash", Keycode::KeyBackSlash, + "KeyRightBracket", Keycode::KeyRightBracket, + "KeyCaret", Keycode::KeyCaret, + "KeyUnderscore", Keycode::KeyUnderscore, + "KeyBackquote", Keycode::KeyBackquote, + "KeyA", Keycode::KeyA, + "KeyB", Keycode::KeyB, + "KeyC", Keycode::KeyC, + "KeyD", Keycode::KeyD, + "KeyE", Keycode::KeyE, + "KeyF", Keycode::KeyF, + "KeyG", Keycode::KeyG, + "KeyH", Keycode::KeyH, + "KeyI", Keycode::KeyI, + "KeyJ", Keycode::KeyJ, + "KeyK", Keycode::KeyK, + "KeyL", Keycode::KeyL, + "KeyM", Keycode::KeyM, + "KeyN", Keycode::KeyN, + "KeyO", Keycode::KeyO, + "KeyP", Keycode::KeyP, + "KeyQ", Keycode::KeyQ, + "KeyR", Keycode::KeyR, + "KeyS", Keycode::KeyS, + "KeyT", Keycode::KeyT, + "KeyU", Keycode::KeyU, + "KeyV", Keycode::KeyV, + "KeyW", Keycode::KeyW, + "KeyX", Keycode::KeyX, + "KeyY", Keycode::KeyY, + "KeyZ", Keycode::KeyZ, + "KeyCapsLock", Keycode::KeyCapsLock, + "KeyF1", Keycode::KeyF1, + "KeyF2", Keycode::KeyF2, + "KeyF3", Keycode::KeyF3, + "KeyF4", Keycode::KeyF4, + "KeyF5", Keycode::KeyF5, + "KeyF6", Keycode::KeyF6, + "KeyF7", Keycode::KeyF7, + "KeyF8", Keycode::KeyF8, + "KeyF9", Keycode::KeyF9, + "KeyF10", Keycode::KeyF10, + "KeyF11", Keycode::KeyF11, + "KeyF12", Keycode::KeyF12, + "KeyPrintScreen", Keycode::KeyPrintScreen, + "KeyScrollLock", Keycode::KeyScrollLock, + "KeyPause", Keycode::KeyPause, + "KeyInsert", Keycode::KeyInsert, + "KeyHome", Keycode::KeyHome, + "KeyPageUp", Keycode::KeyPageUp, + "KeyDelete", Keycode::KeyDelete, + "KeyEnd", Keycode::KeyEnd, + "KeyPageDown", Keycode::KeyPageDown, + "KeyRight", Keycode::KeyRight, + "KeyLeft", Keycode::KeyLeft, + "KeyDown", Keycode::KeyDown, + "KeyUp", Keycode::KeyUp + ); + + ns->new_usertype("KeyboardMap", + "GetKeyState", Input::KeyboardMap::GetKeyState, + "IsKeyPressed", Input::KeyboardMap::IsKeyPressed + ); + + } + +} \ No newline at end of file diff --git a/src/engine/scripting/LuaScriptBindings.h b/src/engine/scripting/LuaScriptBindings.h new file mode 100644 index 000000000..b641e7a96 --- /dev/null +++ b/src/engine/scripting/LuaScriptBindings.h @@ -0,0 +1,113 @@ +#pragma once + +#include "LuaScriptManager.h" +#include "resource/ResourceManager.h" + +namespace Atlas::Scripting { + class LuaScriptBindings { + public: + LuaScriptBindings(Ref luaState, sol::table* atlasNs, sol::table* glmNs); + + void GenerateBindings(); + + private: + void GenerateSceneBindings(sol::table* ns); + + void GenerateEntityBindings(sol::table* ns); + + void GenerateComponentBindings(sol::table* ns); + + void GenerateUtilityBindings(sol::table* ns); + + void GenerateMaterialBindings(sol::table* ns); + + void GenerateAudioBindings(sol::table* ns); + + void GenerateMeshBindings(sol::table* ns); + + void GeneratePhysicsBindings(sol::table* ns); + + void GenerateMathBindings(sol::table* ns); + + void GenerateVolumeBindings(sol::table* ns); + + void GenerateInputBindings(sol::table* ns); + + template + void GenerateResourceBinding(sol::table* ns, const std::string& name); + + template + sol::usertype GenerateGlmTypeBinding(sol::table* ns, const std::string& name, + const sol::constructor_list constructors, Args2&&... args); + + Ref luaState; + sol::table* atlasNs; + sol::table* glmNs; + }; + + template + void LuaScriptBindings::GenerateResourceBinding(sol::table* ns, const std::string& name) { + + auto type = ns->new_usertype>(name, + "IsValid", &ResourceHandle::IsValid, + "IsLoaded", &ResourceHandle::IsLoaded, + "WaitForLoad", &ResourceHandle::WaitForLoad, + "GetID", &ResourceHandle::GetID + ); + + type.set_function("GetResource", sol::resolve>&(void)>(&ResourceHandle::GetResource) ); + type.set_function("Get", sol::resolve&(void)>(&ResourceHandle::Get) ); + + } + + template + sol::usertype LuaScriptBindings::GenerateGlmTypeBinding(sol::table* ns, const std::string& name, + const sol::constructor_list constructors, Args2&&... args) { + + auto multiplication_overloads = sol::overload( + [](const T& v0, const T& v1) { return v0 * v1; }, + [](const T& v0, S value) { return v0 * value; }, + [](const S& value, const T& v0) { return v0 * value; } + ); + + auto division_overloads = sol::overload( + [](const T& v0, const T& v1) { return v0 / v1; }, + [](const T& v0, S value) { return v0 / value; }, + [](const S& value, const T& v0) { return value / v0; } + ); + + auto addition_overloads = sol::overload( + [](const T& v0, const T& v1) { return v0 + v1; }, + [](const T& v0, S value) { return v0 + value; }, + [](const S& value, const T& v0) { return v0 + value; } + ); + + auto substraction_overloads = sol::overload( + [](const T& v0, const T& v1) { return v0 - v1; }, + [](const T& v0, S value) { return v0 - value; }, + [](const S& value, const T& v0) { return value - v0; } + ); + + return ns->new_usertype(name, + sol::call_constructor, + constructors, + sol::meta_function::multiplication, multiplication_overloads, + sol::meta_function::division, division_overloads, + sol::meta_function::addition, addition_overloads, + sol::meta_function::subtraction, substraction_overloads, + std::forward(args)...); + + } + + template + inline decltype(auto) deref(T&& item) { + using Tu = sol::meta::unqualified_t; + if constexpr (sol::meta::is_pointer_like_v) { + return *std::forward(item); + } + else { + return std::forward(item); + } + } + +} \ No newline at end of file diff --git a/src/engine/scripting/LuaScriptManager.cpp b/src/engine/scripting/LuaScriptManager.cpp new file mode 100644 index 000000000..54c085e1b --- /dev/null +++ b/src/engine/scripting/LuaScriptManager.cpp @@ -0,0 +1,32 @@ +#include "LuaScriptManager.h" +#include "Log.h" +#include "LuaScriptBindings.h" + +namespace Atlas::Scripting { + LuaScriptManager::LuaScriptManager(Scene::Scene* scene) { + this->scene = scene; + InitLuaState(); + } + + sol::state& LuaScriptManager::state() { + AE_ASSERT(luaState != nullptr); + return *luaState; + } + + void LuaScriptManager::InitLuaState() { + AE_ASSERT(luaState == nullptr); + + // create lua state + luaState = std::make_shared(); + luaState->open_libraries(sol::lib::base, sol::lib::math, sol::lib::string); + auto& state = *luaState; + + // create atlas namespace + sol::table atlasNs = state["Atlas"].get_or_create(); + sol::table glmNs = state["Glm"].get_or_create(); + + // generate bindings + LuaScriptBindings bindingGenerator(luaState, &atlasNs, &glmNs); + bindingGenerator.GenerateBindings(); + } +} \ No newline at end of file diff --git a/src/engine/scripting/LuaScriptManager.h b/src/engine/scripting/LuaScriptManager.h new file mode 100644 index 000000000..646f63920 --- /dev/null +++ b/src/engine/scripting/LuaScriptManager.h @@ -0,0 +1,22 @@ +#pragma once + +#include "../System.h" +#include "../scene/Entity.h" +#include "../common/Ref.h" + +#include + +namespace Atlas::Scripting { + class LuaScriptManager { + public: + LuaScriptManager(Scene::Scene* scene); + + sol::state& state(); + + private: + Ref luaState; + Scene::Scene* scene; + + void InitLuaState(); + }; +} diff --git a/src/engine/scripting/Script.cpp b/src/engine/scripting/Script.cpp new file mode 100644 index 000000000..ac9082c7b --- /dev/null +++ b/src/engine/scripting/Script.cpp @@ -0,0 +1,28 @@ +#include "Script.h" + +#include "loader/AssetLoader.h" +#include "resource/ResourceManager.h" + +namespace Atlas::Scripting { + + Script::Script(const std::string& filename) : filename(filename) { + + Reload(); + + } + + void Script::Reload() { + + auto stream = Loader::AssetLoader::ReadFile(filename, std::ios::in | std::ios::binary); + + if (!stream.is_open()) { + throw ResourceLoadException(filename, "Couldn't open file stream"); + } + + auto filedata = Loader::AssetLoader::GetFileContent(stream); + + code = std::string(filedata.begin(), filedata.end()); + + } + +} \ No newline at end of file diff --git a/src/engine/scripting/Script.h b/src/engine/scripting/Script.h new file mode 100644 index 000000000..dfb2202b3 --- /dev/null +++ b/src/engine/scripting/Script.h @@ -0,0 +1,21 @@ +#pragma once + +#include "../System.h" + +namespace Atlas::Scripting { + + class Script { + + public: + explicit Script(const std::string& filename); + + void Reload(); + + std::string code; + + private: + std::string filename; + + }; + +} \ No newline at end of file diff --git a/src/engine/texture/Texture2D.cpp b/src/engine/texture/Texture2D.cpp index f354f38bc..b59ebf790 100644 --- a/src/engine/texture/Texture2D.cpp +++ b/src/engine/texture/Texture2D.cpp @@ -13,7 +13,7 @@ namespace Atlas { } - Texture2D::Texture2D(std::string filename, bool colorSpaceConversion, + Texture2D::Texture2D(const std::string& filename, bool colorSpaceConversion, Wrapping wrapping, Filtering filtering, int32_t forceChannels) { auto image = Loader::ImageLoader::LoadImage(filename, @@ -22,13 +22,13 @@ namespace Atlas { } - Texture2D::Texture2D(Ref>& image, Wrapping wrapping, Filtering filtering) { + Texture2D::Texture2D(const Ref>& image, Wrapping wrapping, Filtering filtering) { InitializeInternal(image, wrapping, filtering); } - Texture2D::Texture2D(Ref>& image, Wrapping wrapping, Filtering filtering) { + Texture2D::Texture2D(const Ref>& image, Wrapping wrapping, Filtering filtering) { InitializeInternal(image, wrapping, filtering); diff --git a/src/engine/texture/Texture2D.h b/src/engine/texture/Texture2D.h index 82e5354b2..8fe6c8520 100644 --- a/src/engine/texture/Texture2D.h +++ b/src/engine/texture/Texture2D.h @@ -37,7 +37,7 @@ namespace Atlas { * @param filtering The filtering of the texture. * @param forceChannels Can be used to force a number of channels which should be loaded from the file. */ - explicit Texture2D(std::string filename, bool colorSpaceConversion = true, + explicit Texture2D(const std::string& filename, bool colorSpaceConversion = true, Wrapping wrapping = Wrapping::Repeat, Filtering filtering = Filtering::Anisotropic, int32_t forceChannels = 0); @@ -47,7 +47,7 @@ namespace Atlas { * @param wrapping The wrapping of the texture. Controls texture border behaviour. * @param filtering The filtering of the texture. */ - explicit Texture2D(Ref>& image, Wrapping wrapping = Wrapping::Repeat, + explicit Texture2D(const Ref>& image, Wrapping wrapping = Wrapping::Repeat, Filtering filtering = Filtering::Anisotropic); /** @@ -56,7 +56,7 @@ namespace Atlas { * @param wrapping The wrapping of the texture. Controls texture border behaviour. * @param filtering The filtering of the texture. */ - explicit Texture2D(Ref>& image, Wrapping wrapping = Wrapping::Repeat, + explicit Texture2D(const Ref>& image, Wrapping wrapping = Wrapping::Repeat, Filtering filtering = Filtering::Anisotropic); /** @@ -74,17 +74,17 @@ namespace Atlas { * @note Only uint8_t, uint16_t and float are supported typenames. */ template - void Save(std::string filename, bool flipHorizontally = false); + void Save(std::string& filename, bool flipHorizontally = false); private: template - void InitializeInternal(Ref>& image, Wrapping wrapping, + void InitializeInternal(const Ref>& image, Wrapping wrapping, Filtering filtering); }; template - void Texture2D::Save(std::string filename, bool flipHorizontally) { + void Texture2D::Save(std::string& filename, bool flipHorizontally) { auto image = CreateRef>(width, height, channels); @@ -126,7 +126,7 @@ namespace Atlas { } template - void Texture2D::InitializeInternal(Ref>& image, Wrapping wrapping, Filtering filtering) { + void Texture2D::InitializeInternal(const Ref>& image, Wrapping wrapping, Filtering filtering) { // RGB images are mostly not supported if (image->channels == 3) { diff --git a/src/engine/volume/BVH.cpp b/src/engine/volume/BVH.cpp index e0d73eb50..6eea1080d 100644 --- a/src/engine/volume/BVH.cpp +++ b/src/engine/volume/BVH.cpp @@ -100,18 +100,10 @@ namespace Atlas { delete builder; } - + bool BVH::GetIntersection(std::vector>& stack, Ray ray, BVHTriangle& closest, glm::vec3& intersection) { - constexpr auto max = std::numeric_limits::max(); - - return GetIntersection(stack, ray, closest, intersection, max); - - } - - bool BVH::GetIntersection(std::vector>& stack, Ray ray, BVHTriangle& closest, glm::vec3& intersection, float max) { - - intersection.x = max; + intersection.x = ray.tMax; if (nodes.size()) { // Use a stack based iterative ray traversal @@ -147,10 +139,12 @@ namespace Atlas { else { float hitL = 0.0f, hitR = 0.0f; + ray.tMax = intersection.x; + const auto& node = nodes[nodePtr]; // We might want to check whether these nodes are leafs - auto intersectL = ray.Intersects(node.leftAABB, 0.0f, intersection.x, hitL); - auto intersectR = ray.Intersects(node.rightAABB, 0.0f, intersection.x, hitR); + auto intersectL = ray.Intersects(node.leftAABB, hitL); + auto intersectR = ray.Intersects(node.rightAABB, hitR); if (intersectR && intersectL) { if (hitL < hitR) { @@ -176,11 +170,11 @@ namespace Atlas { closest = data[closestPtr]; } - return (intersection.x < max); + return (intersection.x < ray.tMax); } - bool BVH::GetIntersectionAny(std::vector>& stack, Ray ray, float max) { + bool BVH::GetIntersectionAny(std::vector>& stack, Ray ray) { if (nodes.size()) { stack[0] = std::pair(0, 0.0f); @@ -202,7 +196,7 @@ namespace Atlas { bool hit = ray.Intersects(triangle.v0, triangle.v1, triangle.v2, intersect); // Only allow intersections "in range" - if (hit && intersect.x < max) { + if (hit && intersect.x < ray.tMax) { return true; } } @@ -210,8 +204,8 @@ namespace Atlas { else { const auto& node = nodes[nodePtr]; // We might want to check whether these nodes are leafs - auto intersectL = ray.Intersects(node.leftAABB, 0.0f, max); - auto intersectR = ray.Intersects(node.rightAABB, 0.0f, max); + auto intersectL = ray.Intersects(node.leftAABB); + auto intersectR = ray.Intersects(node.rightAABB); if (intersectR) stack[stackPtr++] = std::pair(node.rightPtr, 0.0f); if (intersectL) stack[stackPtr++] = std::pair(node.leftPtr, 0.0f); @@ -314,6 +308,10 @@ namespace Atlas { } } + // Last resort. This could happend due to spatial unsplitting + if (leftRefs.empty() || rightRefs.empty()) + CreateLeaf(refs); + refs.clear(); refs.shrink_to_fit(); diff --git a/src/engine/volume/BVH.h b/src/engine/volume/BVH.h index 4e249e213..82f7ec232 100644 --- a/src/engine/volume/BVH.h +++ b/src/engine/volume/BVH.h @@ -91,6 +91,8 @@ namespace Atlas { AABB leftAABB = InitialAABB(); AABB rightAABB = InitialAABB(); + + bool validSplit = true; }; Split FindObjectSplit(std::vector& refs); @@ -127,10 +129,7 @@ namespace Atlas { bool GetIntersection(std::vector>& stack, Ray ray, BVHTriangle& closest, glm::vec3& intersection); - bool GetIntersection(std::vector>& stack, Ray ray, BVHTriangle& closest, - glm::vec3& intersection, float max); - - bool GetIntersectionAny(std::vector>& stack, Ray ray, float max); + bool GetIntersectionAny(std::vector>& stack, Ray ray); std::vector& GetTree(); diff --git a/src/engine/volume/Frustum.cpp b/src/engine/volume/Frustum.cpp index da2af7fe2..f6b9ad763 100644 --- a/src/engine/volume/Frustum.cpp +++ b/src/engine/volume/Frustum.cpp @@ -10,13 +10,13 @@ namespace Atlas { } - Frustum::Frustum(mat4 matrix) { + Frustum::Frustum(const mat4& matrix) { Resize(matrix); } - void Frustum::Resize(std::vector corners) { + void Frustum::Resize(const std::vector& corners) { this->corners = corners; planes[NEAR_PLANE] = Plane(corners[4], corners[5], corners[7]); @@ -28,14 +28,14 @@ namespace Atlas { } - void Frustum::Resize(mat4 matrix) { + void Frustum::Resize(const mat4& matrix) { CalculateCorners(matrix); Resize(corners); } - bool Frustum::Intersects(AABB aabb) const { + bool Frustum::Intersects(const AABB& aabb) const { for (uint8_t i = 0; i < 6; i++) { @@ -56,7 +56,7 @@ namespace Atlas { } - bool Frustum::IsInside(AABB aabb) const { + bool Frustum::IsInside(const AABB& aabb) const { for (uint8_t i = 0; i < 6; i++) { @@ -96,7 +96,7 @@ namespace Atlas { } - void Frustum::CalculateCorners(mat4 matrix) { + void Frustum::CalculateCorners(const mat4& matrix) { // Somehow far and near points are reversed vec3 vectors[8] = { diff --git a/src/engine/volume/Frustum.h b/src/engine/volume/Frustum.h index 156b6b62b..0ad0f9baf 100644 --- a/src/engine/volume/Frustum.h +++ b/src/engine/volume/Frustum.h @@ -33,7 +33,7 @@ namespace Atlas { * Constructs a Frustum object. * @param matrix The view projection matrix of the frustum. */ - explicit Frustum(mat4 matrix); + explicit Frustum(const mat4& matrix); /** * Resizes the frustum. @@ -43,27 +43,27 @@ namespace Atlas { * Far plane: Upper left, upper right, bottom left, bottom right * Near plane: Upper left, upper right, bottom left, bottom right */ - void Resize(std::vector corners); + void Resize(const std::vector& corners); /** * Resizes the frustum. * @param matrix The view projection matrix of the frustum. */ - void Resize(mat4 matrix); + void Resize(const mat4& matrix); /** * Checks if the AABB intersects the frustum * @param aabb An AABB to test against the frustum * @return True if visible, false otherwise. */ - bool Intersects(AABB aabb) const; + bool Intersects(const AABB& aabb) const; /** * Checks if the AABB is inside the frustum * @param aabb An AABB to test against the frustum * @return True if visible, false otherwise. */ - bool IsInside(AABB aabb) const; + bool IsInside(const AABB& aabb) const; /** * Returns the planes of the frustum as 4-component vectors @@ -84,7 +84,7 @@ namespace Atlas { std::vector GetCorners() const; private: - void CalculateCorners(mat4 matrix); + void CalculateCorners(const mat4& matrix); enum { NEAR_PLANE = 0, FAR_PLANE, TOP_PLANE, diff --git a/src/engine/volume/Octree.h b/src/engine/volume/Octree.h index 3adcea4f8..dfcddd1a0 100644 --- a/src/engine/volume/Octree.h +++ b/src/engine/volume/Octree.h @@ -149,11 +149,9 @@ namespace Atlas { template void Octree::QueryRay(std::vector& data, Ray ray) { - constexpr float maxFloat = std::numeric_limits::max(); - auto scaled = this->aabb.Scale(relaxFactor); - if (!ray.Intersects(scaled, 0.0f, maxFloat)) + if (!ray.Intersects(scaled)) return; std::copy(octreeData.begin(), octreeData.end(), back_inserter(data)); diff --git a/src/engine/volume/Ray.cpp b/src/engine/volume/Ray.cpp index 86352995c..695bbaf89 100644 --- a/src/engine/volume/Ray.cpp +++ b/src/engine/volume/Ray.cpp @@ -4,8 +4,8 @@ namespace Atlas { namespace Volume { - Ray::Ray(vec3 origin, vec3 direction) : origin(origin), - direction(direction), inverseDirection(1.0f / direction) { + Ray::Ray(vec3 origin, vec3 direction, float tMin, float tMax) : origin(origin), + direction(direction), inverseDirection(1.0f / direction), tMin(tMin), tMax(tMax) { @@ -17,15 +17,15 @@ namespace Atlas { } - bool Ray::Intersects(const AABB& aabb, float tmin, float tmax) { + bool Ray::Intersects(const AABB& aabb) { auto t = 0.0f; - return Intersects(aabb, tmin, tmax, t); + return Intersects(aabb, t); } - bool Ray::Intersects(const AABB& aabb, float tmin, float tmax, float& t) { + bool Ray::Intersects(const AABB& aabb, float& t) { auto t0 = (aabb.min - origin) * inverseDirection; auto t1 = (aabb.max - origin) * inverseDirection; @@ -33,8 +33,8 @@ namespace Atlas { auto tsmall = glm::min(t0, t1); auto tbig = glm::max(t0, t1); - auto tminf = glm::max(tmin, glm::max(tsmall.x, glm::max(tsmall.y, tsmall.z))); - auto tmaxf = glm::min(tmax, glm::min(tbig.x, glm::min(tbig.y, tbig.z))); + auto tminf = glm::max(tMin, glm::max(tsmall.x, glm::max(tsmall.y, tsmall.z))); + auto tmaxf = glm::min(tMax, glm::min(tbig.x, glm::min(tbig.y, tbig.z))); t = tminf; @@ -75,7 +75,7 @@ namespace Atlas { } - bool Ray::Intersects(const Rectangle& rect, float tmin, float tmax, float& t) { + bool Ray::Intersects(const Rectangle& rect, float& t) { auto N = rect.GetNormal(); @@ -85,7 +85,7 @@ namespace Atlas { float dist = glm::dot(rect.point - origin, N) / nDotD; - if (dist <= tmin && dist > tmax) + if (dist <= tMin && dist > tMax) return false; auto point = Get(dist) - rect.point; diff --git a/src/engine/volume/Ray.h b/src/engine/volume/Ray.h index 6ccefa303..3d78fd254 100644 --- a/src/engine/volume/Ray.h +++ b/src/engine/volume/Ray.h @@ -24,25 +24,28 @@ namespace Atlas { public: Ray() = default; - Ray(vec3 origin, vec3 direction); + Ray(vec3 origin, vec3 direction, float tMin = 0.0f, float tMax = 2048.0f); vec3 Get(float distance) const; - bool Intersects(const AABB& aabb, float tmin, float tmax); + bool Intersects(const AABB& aabb); - bool Intersects(const AABB& aabb, float tmin, float tmax, float& t); + bool Intersects(const AABB& aabb, float& t); bool Intersects(vec3 v0, vec3 v1, vec3 v2); bool Intersects(vec3 v0, vec3 v1, vec3 v2, vec3& intersection); - bool Intersects(const Rectangle& rect, float tmin, float tmax, float& t); + bool Intersects(const Rectangle& rect, float& t); vec3 Distance(Ray ray, float& distance); vec3 origin = vec3(0.0f); vec3 direction = vec3(0.0f, 1.0f, 0.0f); + float tMin = 0.0f; + float tMax = 2048.0f; + private: vec3 inverseDirection = vec3(0.0f, 1.0f, 0.0f); diff --git a/src/tests/App.cpp b/src/tests/App.cpp index c30cf606c..6293842d6 100644 --- a/src/tests/App.cpp +++ b/src/tests/App.cpp @@ -40,16 +40,16 @@ void App::LoadContent(AppConfiguration config) { Atlas::Events::EventManager::KeyboardEventDelegate.Subscribe( [this](Atlas::Events::KeyboardEvent event) { - if (event.keyCode == AE_KEY_ESCAPE) { + if (event.keyCode == Keycode::KeyEscape) { Exit(); } - if (event.keyCode == AE_KEY_F11 && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyF11 && event.state == AE_BUTTON_RELEASED) { renderUI = !renderUI; } - if (event.keyCode == AE_KEY_LSHIFT && event.state == AE_BUTTON_PRESSED) { + if (event.keyCode == Keycode::KeyLeftShift && event.state == AE_BUTTON_PRESSED) { keyboardHandler.speed = cameraSpeed * 4.0f; } - if (event.keyCode == AE_KEY_LSHIFT && event.state == AE_BUTTON_RELEASED) { + if (event.keyCode == Keycode::KeyLeftShift && event.state == AE_BUTTON_RELEASED) { keyboardHandler.speed = cameraSpeed; } }); @@ -61,7 +61,8 @@ void App::LoadContent(AppConfiguration config) { directionalLight.properties.directional.direction = glm::vec3(0.0f, -1.0f, 0.33f); directionalLight.color = glm::vec3(255, 236, 209) / 255.0f; - directionalLight.AddDirectionalShadow(200.0f, 3.0f, 4096, glm::vec3(0.0f), glm::vec4(-100.0f, 100.0f, -70.0f, 120.0f)); + directionalLight.AddDirectionalShadow(200.0f, 3.0f, 4096, 0.025f, + glm::vec3(0.0f), glm::vec4(-100.0f, 100.0f, -70.0f, 120.0f)); directionalLight.isMain = true; scene->ao = Atlas::CreateRef(16); diff --git a/vcpkg.json b/vcpkg.json index 84387b290..84980796e 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -34,7 +34,9 @@ "nlohmann-json", "gtest", "joltphysics", - "imguizmo" + "imguizmo", + "lua", + "sol2" ], "overrides": [ { @@ -76,6 +78,14 @@ { "name": "joltphysics", "version": "4.0.0" + }, + { + "name": "lua", + "version": "5.4.6" + }, + { + "name": "sol2", + "version": "3.3.0" } ] } diff --git a/wiki/images/editor.png b/wiki/images/editor.png new file mode 100644 index 000000000..6b4e5f33e Binary files /dev/null and b/wiki/images/editor.png differ