diff --git a/Assets/CollisionTags.SHConfig b/Assets/CollisionTags.SHConfig index d3ebe7e2..18a339dd 100644 --- a/Assets/CollisionTags.SHConfig +++ b/Assets/CollisionTags.SHConfig @@ -1,16 +1,20 @@ -0 1 -1 2 -2 3 -3 4 -4 5 -5 6 -6 7 -7 8 -8 9 -9 10 -10 11 -11 12 -12 13 -13 14 -14 15 -15 16 +0 1 +1 2 +2 3 +3 4 +4 5 +5 6 +6 7 +7 8 +8 9 +9 10 +10 11 +11 12 +12 13 +13 14 +14 15 +15 16 + +note: +All collision tags should follow the above format "indextag name". +If it fails to follow this, the default tag names will be used. \ No newline at end of file diff --git a/Assets/Shaders/SSAO_CS.glsl b/Assets/Shaders/SSAO_CS.glsl index 1a572521..627c59d1 100644 --- a/Assets/Shaders/SSAO_CS.glsl +++ b/Assets/Shaders/SSAO_CS.glsl @@ -6,8 +6,8 @@ const int ROTATION_KERNEL_W = 4; const int ROTATION_KERNEL_H = 4; // can perhaps pass in as push constant. -const float RADIUS = 0.5f; -const float BIAS = 0.025f; +const float RADIUS = 0.2f; +const float BIAS = 0.0025f; layout(local_size_x = 16, local_size_y = 16) in; layout(set = 4, binding = 0, rgba32f) uniform image2D positions; diff --git a/Assets/Shaders/SSAO_CS.shshaderb b/Assets/Shaders/SSAO_CS.shshaderb index 69f7a44f..a9154e10 100644 Binary files a/Assets/Shaders/SSAO_CS.shshaderb and b/Assets/Shaders/SSAO_CS.shshaderb differ diff --git a/SHADE_Engine/src/Assets/SHAssetMacros.h b/SHADE_Engine/src/Assets/SHAssetMacros.h index 566e34e2..5ab1945d 100644 --- a/SHADE_Engine/src/Assets/SHAssetMacros.h +++ b/SHADE_Engine/src/Assets/SHAssetMacros.h @@ -40,8 +40,6 @@ typedef FMOD::Sound* SHSound; // Asset Meta Version constexpr std::string_view ASSET_META_VER { "1.0" }; -constexpr AssetID INVALID_ASSET_ID {0}; - // Asset type enum enum class AssetType : AssetTypeMeta { diff --git a/SHADE_Engine/src/Camera/SHCameraDirector.cpp b/SHADE_Engine/src/Camera/SHCameraDirector.cpp index 29e2dcde..ec539fa1 100644 --- a/SHADE_Engine/src/Camera/SHCameraDirector.cpp +++ b/SHADE_Engine/src/Camera/SHCameraDirector.cpp @@ -43,9 +43,7 @@ namespace SHADE if (!camComponent) { SHLOG_WARNING("Camera Director warning: Entity does not have a camera"); - return nullptr; } - return camComponent; } diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp index 1c603c57..19eb5168 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp +++ b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp @@ -146,7 +146,7 @@ namespace SHADE //Call all the children to Destroy themselves first before the parent is destroyed. if (entityVec[eIndex]) { - auto children = SHSceneManager::GetCurrentSceneGraph().GetChildren(eID); + auto& children = SHSceneManager::GetCurrentSceneGraph().GetChildren(eID); for (auto& child : children) { DestroyEntity(child->GetEntityID()); diff --git a/SHADE_Managed/src/Engine/ECS.cxx b/SHADE_Managed/src/Engine/ECS.cxx index c388f0cd..ffdffd12 100644 --- a/SHADE_Managed/src/Engine/ECS.cxx +++ b/SHADE_Managed/src/Engine/ECS.cxx @@ -28,7 +28,6 @@ of DigiPen Institute of Technology is prohibited. #include "Scene/SHSceneGraph.h" #include "Tools/Logger/SHLog.h" #include "Graphics\MiddleEnd\Interface\SHRenderable.h" -#include "Graphics\MiddleEnd\TextRendering\SHTextRenderableComponent.h" // Project Headers #include "Utility/Convert.hxx" #include "Utility/Debug.hxx" @@ -39,7 +38,6 @@ of DigiPen Institute of Technology is prohibited. #include "Components/CameraArm.hxx" #include "Components/Light.hxx" #include "Components\Renderable.hxx" -#include "Components\TextRenderable.hxx" namespace SHADE { @@ -323,7 +321,6 @@ namespace SHADE componentMap.Add(createComponentSet()); componentMap.Add(createComponentSet()); componentMap.Add(createComponentSet()); - componentMap.Add(createComponentSet()); } /*---------------------------------------------------------------------------------*/ diff --git a/SHADE_Managed/src/Scene/SceneManager.cxx b/SHADE_Managed/src/Scene/SceneManager.cxx deleted file mode 100644 index 1e139a95..00000000 --- a/SHADE_Managed/src/Scene/SceneManager.cxx +++ /dev/null @@ -1,25 +0,0 @@ -/************************************************************************************//*! -\file Input.hxx -\author Daniel Chua -\par email: yeechendaniel.chua@digipen.edu -\date Oct 16, 2022 -\brief Contains the definition of the managed SceneManager static class. - - Note: This file is written in C++17/CLI. - -Copyright (C) 2022 DigiPen Institute of Technology. -Reproduction or disclosure of this file or its contents without the prior written consent -of DigiPen Institute of Technology is prohibited. -*//*************************************************************************************/ - -#include "SHpch.h" -#include "SceneManager.hxx" -#include "Scene/SHSceneManager.h" - -namespace SHADE -{ - void SceneManager::ChangeScene(AssetID sceneAssetID) - { - SHSceneManager::RestartScene(sceneAssetID); - } -} \ No newline at end of file diff --git a/SHADE_Managed/src/Scene/SceneManager.hxx b/SHADE_Managed/src/Scene/SceneManager.hxx deleted file mode 100644 index e1b30bc3..00000000 --- a/SHADE_Managed/src/Scene/SceneManager.hxx +++ /dev/null @@ -1,26 +0,0 @@ -/************************************************************************************//*! -\file Input.hxx -\author Daniel Chua -\par email: yeechendaniel.chua@digipen.edu -\date Oct 16, 2022 -\brief Contains the definition of the managed SceneManager static class. - - Note: This file is written in C++17/CLI. - -Copyright (C) 2022 DigiPen Institute of Technology. -Reproduction or disclosure of this file or its contents without the prior written consent -of DigiPen Institute of Technology is prohibited. -*//*************************************************************************************/ - - -#pragma once - -#include "Assets/SHAssetMacros.h" - -namespace SHADE -{ - public ref class SceneManager abstract sealed - { - static void ChangeScene(AssetID sceneAssetID); - }; -}