diff --git a/Assets/Materials/UIMat.shmat b/Assets/Materials/UIMat.shmat index b31fed2e..625021b0 100644 --- a/Assets/Materials/UIMat.shmat +++ b/Assets/Materials/UIMat.shmat @@ -3,6 +3,6 @@ SubPass: G-Buffer Write Properties: data.color: {x: 1, y: 1, z: 1, w: 1} - data.textureIndex: 0 + data.textureIndex: 54429632 data.alpha: 0 data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade new file mode 100644 index 00000000..30363b79 --- /dev/null +++ b/Assets/Scenes/MainMenu.shade @@ -0,0 +1,57 @@ +- EID: 0 + Name: Default + IsActive: true + NumberOfChildren: 1 + Components: ~ + Scripts: ~ +- EID: 1 + Name: Default + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 1080, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 129340704 + IsActive: true + Scripts: ~ +- EID: 2 + Name: Default + IsActive: true + NumberOfChildren: 0 + Components: + Light Component: + Position: {x: 0, y: 0, z: 0} + Type: Directional + Direction: {x: 0, y: 0, z: 1} + Color: {x: 1, y: 1, z: 1, w: 1} + Layer: 4294967295 + Strength: 0 + IsActive: true + Scripts: ~ +- EID: 3 + Name: Default + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + Camera Component: + Position: {x: 0, y: 0, z: 0} + Pitch: 0 + Yaw: 0 + Roll: 0 + Width: 1920 + Height: 1080 + Near: 0.00999999978 + Far: 10000 + Perspective: true + IsActive: true + Scripts: ~ \ No newline at end of file diff --git a/Assets/Scenes/MainMenu.shade.shmeta b/Assets/Scenes/MainMenu.shade.shmeta new file mode 100644 index 00000000..93975878 --- /dev/null +++ b/Assets/Scenes/MainMenu.shade.shmeta @@ -0,0 +1,3 @@ +Name: MainMenu +ID: 97158628 +Type: 5 diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState .cs b/Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState.cs similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState .cs rename to Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState.cs diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState .cs.shmeta b/Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState.cs.shmeta similarity index 72% rename from Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState .cs.shmeta rename to Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState.cs.shmeta index 1bbbdc0d..455fa0e3 100644 --- a/Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState .cs.shmeta +++ b/Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState.cs.shmeta @@ -1,3 +1,3 @@ Name: UT_PlayerCaughtState -ID: 154746070 +ID: 162030736 Type: 9 diff --git a/Assets/Scripts/SC_MainMenu.cs b/Assets/Scripts/SC_MainMenu.cs new file mode 100644 index 00000000..ff8c58dd --- /dev/null +++ b/Assets/Scripts/SC_MainMenu.cs @@ -0,0 +1,13 @@ +using System; +using SHADE; + +public class SC_MainMenu : Script +{ + protected override void awake() + { + } + protected override void update() + { + } +} + diff --git a/Assets/Scripts/SC_MainMenu.cs.shmeta b/Assets/Scripts/SC_MainMenu.cs.shmeta new file mode 100644 index 00000000..7e2f1ac2 --- /dev/null +++ b/Assets/Scripts/SC_MainMenu.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_MainMenu +ID: 158552402 +Type: 9 diff --git a/Assets/Shaders/UI_FS.glsl b/Assets/Shaders/UI_FS.glsl index 4f919a04..093cc9c6 100644 --- a/Assets/Shaders/UI_FS.glsl +++ b/Assets/Shaders/UI_FS.glsl @@ -43,7 +43,7 @@ void main() { position = In.vertPos; normals = In.normal; - albedo = vec4(1.0f); + albedo = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv); outEntityID = In2.eid; lightLayerIndices = In2.lightLayerIndex; diff --git a/Assets/Shaders/UI_FS.shshaderb b/Assets/Shaders/UI_FS.shshaderb index 6be9c565..fcb72b6e 100644 Binary files a/Assets/Shaders/UI_FS.shshaderb and b/Assets/Shaders/UI_FS.shshaderb differ diff --git a/Assets/RaccoonBag_Color_Ver4.dds b/Assets/Texture/RaccoonBag_Color_Ver4.dds similarity index 100% rename from Assets/RaccoonBag_Color_Ver4.dds rename to Assets/Texture/RaccoonBag_Color_Ver4.dds diff --git a/Assets/RaccoonBag_Color_Ver4.shtex b/Assets/Texture/RaccoonBag_Color_Ver4.shtex similarity index 100% rename from Assets/RaccoonBag_Color_Ver4.shtex rename to Assets/Texture/RaccoonBag_Color_Ver4.shtex diff --git a/Assets/RaccoonBag_Color_Ver4.shtex.shmeta b/Assets/Texture/RaccoonBag_Color_Ver4.shtex.shmeta similarity index 100% rename from Assets/RaccoonBag_Color_Ver4.shtex.shmeta rename to Assets/Texture/RaccoonBag_Color_Ver4.shtex.shmeta diff --git a/Assets/RaccoonPreTexturedVer1_Base9.dds b/Assets/Texture/RaccoonPreTexturedVer1_Base9.dds similarity index 100% rename from Assets/RaccoonPreTexturedVer1_Base9.dds rename to Assets/Texture/RaccoonPreTexturedVer1_Base9.dds diff --git a/Assets/RaccoonPreTexturedVer1_Base9.shtex b/Assets/Texture/RaccoonPreTexturedVer1_Base9.shtex similarity index 100% rename from Assets/RaccoonPreTexturedVer1_Base9.shtex rename to Assets/Texture/RaccoonPreTexturedVer1_Base9.shtex diff --git a/Assets/RaccoonPreTexturedVer1_Base9.shtex.shmeta b/Assets/Texture/RaccoonPreTexturedVer1_Base9.shtex.shmeta similarity index 100% rename from Assets/RaccoonPreTexturedVer1_Base9.shtex.shmeta rename to Assets/Texture/RaccoonPreTexturedVer1_Base9.shtex.shmeta diff --git a/Assets/TD_Checker_Base_Color.dds b/Assets/Texture/TD_Checker_Base_Color.dds similarity index 100% rename from Assets/TD_Checker_Base_Color.dds rename to Assets/Texture/TD_Checker_Base_Color.dds diff --git a/Assets/TD_Checker_Base_Color.shtex b/Assets/Texture/TD_Checker_Base_Color.shtex similarity index 100% rename from Assets/TD_Checker_Base_Color.shtex rename to Assets/Texture/TD_Checker_Base_Color.shtex diff --git a/Assets/TD_Checker_Base_Color.shtex.shmeta b/Assets/Texture/TD_Checker_Base_Color.shtex.shmeta similarity index 100% rename from Assets/TD_Checker_Base_Color.shtex.shmeta rename to Assets/Texture/TD_Checker_Base_Color.shtex.shmeta diff --git a/Assets/Texture/TX_EndScreen.dds b/Assets/Texture/TX_EndScreen.dds new file mode 100644 index 00000000..4ba58025 Binary files /dev/null and b/Assets/Texture/TX_EndScreen.dds differ diff --git a/Assets/Texture/TX_EndScreen.shtex b/Assets/Texture/TX_EndScreen.shtex new file mode 100644 index 00000000..7de7d99f Binary files /dev/null and b/Assets/Texture/TX_EndScreen.shtex differ diff --git a/Assets/Texture/TX_EndScreen.shtex.shmeta b/Assets/Texture/TX_EndScreen.shtex.shmeta new file mode 100644 index 00000000..152082e9 --- /dev/null +++ b/Assets/Texture/TX_EndScreen.shtex.shmeta @@ -0,0 +1,3 @@ +Name: TX_EndScreen +ID: 52936944 +Type: 3 diff --git a/Assets/TX_HouseInterior_Palette4.dds b/Assets/Texture/TX_HouseInterior_Palette4.dds similarity index 100% rename from Assets/TX_HouseInterior_Palette4.dds rename to Assets/Texture/TX_HouseInterior_Palette4.dds diff --git a/Assets/TX_HouseInterior_Palette4.shtex b/Assets/Texture/TX_HouseInterior_Palette4.shtex similarity index 100% rename from Assets/TX_HouseInterior_Palette4.shtex rename to Assets/Texture/TX_HouseInterior_Palette4.shtex diff --git a/Assets/TX_HouseInterior_Palette4.shtex.shmeta b/Assets/Texture/TX_HouseInterior_Palette4.shtex.shmeta similarity index 100% rename from Assets/TX_HouseInterior_Palette4.shtex.shmeta rename to Assets/Texture/TX_HouseInterior_Palette4.shtex.shmeta diff --git a/Assets/Texture/TX_MainMenu.dds b/Assets/Texture/TX_MainMenu.dds new file mode 100644 index 00000000..250b431d Binary files /dev/null and b/Assets/Texture/TX_MainMenu.dds differ diff --git a/Assets/Texture/TX_MainMenu.shtex b/Assets/Texture/TX_MainMenu.shtex new file mode 100644 index 00000000..2370006f Binary files /dev/null and b/Assets/Texture/TX_MainMenu.shtex differ diff --git a/Assets/Texture/TX_MainMenu.shtex.shmeta b/Assets/Texture/TX_MainMenu.shtex.shmeta new file mode 100644 index 00000000..cef6f5ee --- /dev/null +++ b/Assets/Texture/TX_MainMenu.shtex.shmeta @@ -0,0 +1,3 @@ +Name: TX_MainMenu +ID: 54429632 +Type: 3 diff --git a/Assets/TX_StaticMesh.dds b/Assets/Texture/TX_StaticMesh.dds similarity index 100% rename from Assets/TX_StaticMesh.dds rename to Assets/Texture/TX_StaticMesh.dds diff --git a/Assets/TX_StaticMesh.shtex b/Assets/Texture/TX_StaticMesh.shtex similarity index 100% rename from Assets/TX_StaticMesh.shtex rename to Assets/Texture/TX_StaticMesh.shtex diff --git a/Assets/TX_StaticMesh.shtex.shmeta b/Assets/Texture/TX_StaticMesh.shtex.shmeta similarity index 100% rename from Assets/TX_StaticMesh.shtex.shmeta rename to Assets/Texture/TX_StaticMesh.shtex.shmeta diff --git a/SHADE_Engine/src/Assets/SHAssetManager.cpp b/SHADE_Engine/src/Assets/SHAssetManager.cpp index 7fcb9b36..5d8a0f13 100644 --- a/SHADE_Engine/src/Assets/SHAssetManager.cpp +++ b/SHADE_Engine/src/Assets/SHAssetManager.cpp @@ -580,12 +580,12 @@ namespace SHADE assetCollection.emplace(newAsset.id, newAsset); SHAssetMetaHandler::WriteMetaData(newAsset); } - else if (ext == TEXTURE_EXTENSION.data()) + else if (ext == TEXTURE_EXTENSION) { SHAsset newAsset{ path.stem().string(), GenerateAssetID(AssetType::TEXTURE), - AssetType::SHADER_BUILT_IN, + AssetType::TEXTURE, path, false }; diff --git a/SHADE_Engine/src/Camera/SHCameraDirector.cpp b/SHADE_Engine/src/Camera/SHCameraDirector.cpp index 29e2dcde..1f97160c 100644 --- a/SHADE_Engine/src/Camera/SHCameraDirector.cpp +++ b/SHADE_Engine/src/Camera/SHCameraDirector.cpp @@ -42,6 +42,7 @@ namespace SHADE SHCameraComponent* camComponent = SHComponentManager::GetComponent_s(mainCameraEID); if (!camComponent) { + mainCameraEID = MAX_EID; SHLOG_WARNING("Camera Director warning: Entity does not have a camera"); return nullptr; } diff --git a/SHADE_Engine/src/Editor/SHEditor.cpp b/SHADE_Engine/src/Editor/SHEditor.cpp index 07caee7a..abddf457 100644 --- a/SHADE_Engine/src/Editor/SHEditor.cpp +++ b/SHADE_Engine/src/Editor/SHEditor.cpp @@ -612,7 +612,7 @@ namespace SHADE { if(editorState == State::PLAY) return; - if (SaveScene()) + if (editorState == State::STOP && SaveScene()) { const SHEditorStateChangeEvent STATE_CHANGE_EVENT { @@ -622,6 +622,10 @@ namespace SHADE SHCommandManager::SwapStacks(); SHEventManager::BroadcastEvent(STATE_CHANGE_EVENT, SH_EDITOR_ON_PLAY_EVENT); } + else if (editorState == State::PAUSE) + { + editorState = State::PLAY; + } } void SHEditor::Pause()