xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge branch 'main' into PlayerController

This commit is contained in:
Glence 2022-11-22 15:12:22 +08:00
parent 81d44e6c59 25c9d6eea2
commit be16e46872
4 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SHADE_Engine/src/Assets/SHAssetMacros.h
View File

@ -40,6 +40,8 @@ typedef FMOD::Sound* SHSound;
// Asset Meta Version // Asset Meta Version
constexpr std::string_view ASSET_META_VER { "1.0" }; constexpr std::string_view ASSET_META_VER { "1.0" };
constexpr AssetID INVALID_ASSET_ID {0};
// Asset type enum // Asset type enum
enum class AssetType : AssetTypeMeta enum class AssetType : AssetTypeMeta
{ {

3
SHADE_Managed/src/Engine/ECS.cxx
View File

@ -28,6 +28,7 @@ of DigiPen Institute of Technology is prohibited.
#include "Scene/SHSceneGraph.h" #include "Scene/SHSceneGraph.h"
#include "Tools/Logger/SHLog.h" #include "Tools/Logger/SHLog.h"
#include "Graphics\MiddleEnd\Interface\SHRenderable.h" #include "Graphics\MiddleEnd\Interface\SHRenderable.h"
#include "Graphics\MiddleEnd\TextRendering\SHTextRenderableComponent.h"
// Project Headers // Project Headers
#include "Utility/Convert.hxx" #include "Utility/Convert.hxx"
#include "Utility/Debug.hxx" #include "Utility/Debug.hxx"
@ -38,6 +39,7 @@ of DigiPen Institute of Technology is prohibited.
#include "Components/CameraArm.hxx" #include "Components/CameraArm.hxx"
#include "Components/Light.hxx" #include "Components/Light.hxx"
#include "Components\Renderable.hxx" #include "Components\Renderable.hxx"
#include "Components\TextRenderable.hxx"
namespace SHADE namespace SHADE
{ {
@ -321,6 +323,7 @@ namespace SHADE
componentMap.Add(createComponentSet<SHCameraComponent, Camera>()); componentMap.Add(createComponentSet<SHCameraComponent, Camera>());
componentMap.Add(createComponentSet<SHCameraArmComponent, CameraArm>()); componentMap.Add(createComponentSet<SHCameraArmComponent, CameraArm>());
componentMap.Add(createComponentSet<SHLightComponent, Light>()); componentMap.Add(createComponentSet<SHLightComponent, Light>());
componentMap.Add(createComponentSet<SHTextRenderableComponent, TextRenderable>());
} }
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/

25
SHADE_Managed/src/Scene/SceneManager.cxx Normal file
View File

@ -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 "SHpch.h"
#include "SceneManager.hxx"
#include "Scene/SHSceneManager.h"
namespace SHADE
{
void SceneManager::ChangeScene(AssetID sceneAssetID)
{
SHSceneManager::RestartScene(sceneAssetID);
}
}

26
SHADE_Managed/src/Scene/SceneManager.hxx Normal file
View File

@ -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);
};
}