diff --git a/SHADE_Engine/src/Camera/SHCameraSystem.h b/SHADE_Engine/src/Camera/SHCameraSystem.h index ee93f9a9..db680adb 100644 --- a/SHADE_Engine/src/Camera/SHCameraSystem.h +++ b/SHADE_Engine/src/Camera/SHCameraSystem.h @@ -41,7 +41,7 @@ namespace SHADE class SH_API CameraSystemUpdate final: public SHSystemRoutine { public: - CameraSystemUpdate() : SHSystemRoutine("Camera System Update", true) {}; + CameraSystemUpdate() : SHSystemRoutine("Camera System Update", false) {}; virtual void Execute(double dt)noexcept override final; }; friend class CameraSystemUpdate; diff --git a/SHADE_Managed/src/Components/Component.cxx b/SHADE_Managed/src/Components/Component.cxx index 7f56fad3..91fb73bb 100644 --- a/SHADE_Managed/src/Components/Component.cxx +++ b/SHADE_Managed/src/Components/Component.cxx @@ -22,6 +22,14 @@ of DigiPen Institute of Technology is prohibited. namespace SHADE { + /*---------------------------------------------------------------------------------*/ + /* Properties */ + /*---------------------------------------------------------------------------------*/ + GameObject BaseComponent::Owner::get() + { + return owner; + } + /*---------------------------------------------------------------------------------*/ /* Component Access Functions */ /*---------------------------------------------------------------------------------*/ diff --git a/SHADE_Managed/src/Components/Component.hxx b/SHADE_Managed/src/Components/Component.hxx index a1d83eaf..9f3702e1 100644 --- a/SHADE_Managed/src/Components/Component.hxx +++ b/SHADE_Managed/src/Components/Component.hxx @@ -36,7 +36,7 @@ namespace SHADE /// property GameObject Owner { - GameObject get() { return owner; } + GameObject get(); } /*-----------------------------------------------------------------------------*/ @@ -166,6 +166,19 @@ namespace SHADE template public ref class Component : public BaseComponent { + public: + /*-----------------------------------------------------------------------------*/ + /* Properties */ + /*-----------------------------------------------------------------------------*/ + /// + /// Whether or not the Component is active and being updated by the engine. + /// + property bool Enabled + { + bool get() { return GetNativeComponent()->isActive; } + void set(bool value) { GetNativeComponent()->isActive = value; } + } + internal: /*-----------------------------------------------------------------------------*/ /* Type Definitions */