From ece0a92717289469223ef94acc85d1942ab27c58 Mon Sep 17 00:00:00 2001 From: Kah Wei Date: Tue, 22 Nov 2022 11:29:01 +0800 Subject: [PATCH 1/3] Fixed TextRenderable components not being retrievable by C# scripts --- SHADE_Managed/src/Engine/ECS.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SHADE_Managed/src/Engine/ECS.cxx b/SHADE_Managed/src/Engine/ECS.cxx index ffdffd12..c388f0cd 100644 --- a/SHADE_Managed/src/Engine/ECS.cxx +++ b/SHADE_Managed/src/Engine/ECS.cxx @@ -28,6 +28,7 @@ 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" @@ -38,6 +39,7 @@ 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 { @@ -321,6 +323,7 @@ namespace SHADE componentMap.Add(createComponentSet()); componentMap.Add(createComponentSet()); componentMap.Add(createComponentSet()); + componentMap.Add(createComponentSet()); } /*---------------------------------------------------------------------------------*/ -- 2.40.1 From fcf258d77379c7579f389fabcbef9f6e52cc4959 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Tue, 22 Nov 2022 14:11:10 +0800 Subject: [PATCH 2/3] Added SceneManager managed code --- SHADE_Managed/src/Scene/SceneManager.cxx | 25 +++++++++++++++++++++++ SHADE_Managed/src/Scene/SceneManager.hxx | 26 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 SHADE_Managed/src/Scene/SceneManager.cxx create mode 100644 SHADE_Managed/src/Scene/SceneManager.hxx diff --git a/SHADE_Managed/src/Scene/SceneManager.cxx b/SHADE_Managed/src/Scene/SceneManager.cxx new file mode 100644 index 00000000..179a8b2f --- /dev/null +++ b/SHADE_Managed/src/Scene/SceneManager.cxx @@ -0,0 +1,25 @@ +/************************************************************************************//*! +\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 "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 new file mode 100644 index 00000000..e1b30bc3 --- /dev/null +++ b/SHADE_Managed/src/Scene/SceneManager.hxx @@ -0,0 +1,26 @@ +/************************************************************************************//*! +\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); + }; +} -- 2.40.1 From 3f39cfc6379fb15064a95f3a17e869b98c963384 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Tue, 22 Nov 2022 14:14:58 +0800 Subject: [PATCH 3/3] include pch --- SHADE_Managed/src/Scene/SceneManager.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SHADE_Managed/src/Scene/SceneManager.cxx b/SHADE_Managed/src/Scene/SceneManager.cxx index 179a8b2f..1e139a95 100644 --- a/SHADE_Managed/src/Scene/SceneManager.cxx +++ b/SHADE_Managed/src/Scene/SceneManager.cxx @@ -12,7 +12,7 @@ Reproduction or disclosure of this file or its contents without the prior writte of DigiPen Institute of Technology is prohibited. *//*************************************************************************************/ - +#include "SHpch.h" #include "SceneManager.hxx" #include "Scene/SHSceneManager.h" -- 2.40.1