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

Merge remote-tracking branch 'origin/main' into SP3-2-Physics

This commit is contained in:
Diren D Bharwani 2022-11-25 14:06:28 +08:00
parent afd2abf036 d9c8296aca
commit 1cfd3cfd3a
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SHADE_Engine/src/Camera/SHCameraSystem.h
View File

@ -41,7 +41,7 @@ namespace SHADE
class SH_API CameraSystemUpdate final: public SHSystemRoutine class SH_API CameraSystemUpdate final: public SHSystemRoutine
{ {
public: public:
CameraSystemUpdate() : SHSystemRoutine("Camera System Update", true) {}; CameraSystemUpdate() : SHSystemRoutine("Camera System Update", false) {};
virtual void Execute(double dt)noexcept override final; virtual void Execute(double dt)noexcept override final;
}; };
friend class CameraSystemUpdate; friend class CameraSystemUpdate;

8
SHADE_Managed/src/Components/Component.cxx
View File

@ -22,6 +22,14 @@ of DigiPen Institute of Technology is prohibited.
namespace SHADE namespace SHADE
{ {
/*---------------------------------------------------------------------------------*/
/* Properties */
/*---------------------------------------------------------------------------------*/
GameObject BaseComponent::Owner::get()
{
return owner;
}
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/
/* Component Access Functions */ /* Component Access Functions */
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/

15
SHADE_Managed/src/Components/Component.hxx
View File

@ -36,7 +36,7 @@ namespace SHADE
/// </summary> /// </summary>
property GameObject Owner property GameObject Owner
{ {
GameObject get() { return owner; } GameObject get();
} }
/*-----------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------*/
@ -166,6 +166,19 @@ namespace SHADE
template<typename NativeType> template<typename NativeType>
public ref class Component : public BaseComponent public ref class Component : public BaseComponent
{ {
public:
/*-----------------------------------------------------------------------------*/
/* Properties */
/*-----------------------------------------------------------------------------*/
/// <summary>
/// Whether or not the Component is active and being updated by the engine.
/// </summary>
property bool Enabled
{
bool get() { return GetNativeComponent()->isActive; }
void set(bool value) { GetNativeComponent()->isActive = value; }
}
internal: internal:
/*-----------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------*/
/* Type Definitions */ /* Type Definitions */