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

Fixed outdated header includes in cxx files 

Changed references to isActive to function calls
This commit is contained in:
Xiao Qi 2022-09-16 14:14:51 +08:00
parent 0373754e37
commit 7315d3038f
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ of DigiPen Institute of Technology is prohibited.
#include <sstream> #include <sstream>
#include <msclr\marshal_cppstd.h> #include <msclr\marshal_cppstd.h>
// External Dependencies // External Dependencies
#include "ECS_Base/System/SHEntityManager.h" #include "ECS_Base/Managers/SHEntityManager.h"
// Project Headers // Project Headers
#include "Utility/Convert.hxx" #include "Utility/Convert.hxx"
#include "Utility/Debug.hxx" #include "Utility/Debug.hxx"

4
SHADE_Managed/src/Engine/ECS.h++
View File

@ -17,8 +17,8 @@ of DigiPen Institute of Technology is prohibited.
// Primary Include // Primary Include
#include "ECS.hxx" #include "ECS.hxx"
// External Dependencies // External Dependencies
#include "ECS_Base/System/SHComponentManager.h" #include "ECS_Base/Managers/SHComponentManager.h"
#include "ECS_Base/System/SHEntityManager.h" #include "ECS_Base/Managers/SHEntityManager.h"
namespace SHADE namespace SHADE
{ {

2
SHADE_Managed/src/Engine/ECS.hxx
View File

@ -15,7 +15,7 @@ of DigiPen Institute of Technology is prohibited.
#pragma once #pragma once
// External Dependencies // External Dependencies
#include "ECS_Base/System/SHComponentManager.h" #include "ECS_Base/Managers/SHComponentManager.h"
// Project Includes // Project Includes
#include "Components/Component.hxx" #include "Components/Component.hxx"

2
SHADE_Managed/src/Engine/Entity.cxx
View File

@ -17,7 +17,7 @@ of DigiPen Institute of Technology is prohibited.
// Primary Header // Primary Header
#include "Entity.hxx" #include "Entity.hxx"
// External Dependencies // External Dependencies
#include "ECS_Base/System/SHEntityManager.h" #include "ECS_Base/Managers/SHEntityManager.h"
namespace SHADE namespace SHADE
{ {

6
SHADE_Managed/src/Engine/GameObject.cxx
View File

@ -16,7 +16,7 @@ of DigiPen Institute of Technology is prohibited.
// Primary Header // Primary Header
#include "GameObject.hxx" #include "GameObject.hxx"
// External Dependencies // External Dependencies
#include "ECS_Base/System/SHEntityManager.h" #include "ECS_Base/Managers/SHEntityManager.h"
// Project Headers // Project Headers
#include "ECS.hxx" #include "ECS.hxx"
#include "Scripts/ScriptStore.hxx" #include "Scripts/ScriptStore.hxx"
@ -52,7 +52,7 @@ namespace SHADE
} }
bool GameObject::IsActiveSelf::get() bool GameObject::IsActiveSelf::get()
{ {
return GetNativeEntity().isActive; return GetNativeEntity().GetActive();
} }
bool GameObject::IsActiveInHierarchy::get() bool GameObject::IsActiveInHierarchy::get()
{ {
@ -68,7 +68,7 @@ namespace SHADE
} }
void GameObject::SetActive(bool active) void GameObject::SetActive(bool active)
{ {
GetNativeEntity().isActive = active; GetNativeEntity().SetActive(active);
} }
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/

4
SHADE_Managed/src/Scripts/ScriptStore.cxx
View File

@ -19,7 +19,7 @@ of DigiPen Institute of Technology is prohibited.
// Standard Libraries // Standard Libraries
#include <sstream> #include <sstream>
// External Dependencies // External Dependencies
#include "ECS_Base/System/SHEntityManager.h" #include "ECS_Base/Managers/SHEntityManager.h"
// Project Headers // Project Headers
#include "Utility/Debug.hxx" #include "Utility/Debug.hxx"
#include "Utility/Convert.hxx" #include "Utility/Convert.hxx"
@ -668,6 +668,6 @@ namespace SHADE
throw gcnew System::InvalidOperationException("Attempted to get native Component to an invalid Entity."); throw gcnew System::InvalidOperationException("Attempted to get native Component to an invalid Entity.");
// Check active state // Check active state
return nativeEntity->isActive; return nativeEntity->GetActive();
} }
} }

2
SHADE_Managed/src/Utility/Convert.cxx
View File

@ -17,7 +17,7 @@ of DigiPen Institute of Technology is prohibited.
// Primary Header // Primary Header
#include "Convert.hxx" #include "Convert.hxx"
// External Dependencies // External Dependencies
#include "ECS_Base/System//SHEntityManager.h" #include "ECS_Base/Managers/SHEntityManager.h"
#include <msclr/marshal_cppstd.h> #include <msclr/marshal_cppstd.h>
namespace SHADE namespace SHADE