diff --git a/Assets/Scripts/UI/SC_SliderText.cs b/Assets/Scripts/UI/SC_SliderText.cs index f2a8c8a4..54d59f28 100644 --- a/Assets/Scripts/UI/SC_SliderText.cs +++ b/Assets/Scripts/UI/SC_SliderText.cs @@ -21,8 +21,8 @@ namespace SHADE_Scripting.UI TextRenderable text = GetComponent(); if(slider != null && text != null) { - Debug.Log("SETTING TEXT"); - text.Text = (slider.GetValue() * (maxValue - minValue) + minValue).ToString(); + + text.Text = ((int)(slider.GetValue() * (maxValue - minValue) + minValue)).ToString(); } } diff --git a/SHADE_Managed/Canvas.cxx b/SHADE_Managed/src/Components/Canvas.cxx similarity index 100% rename from SHADE_Managed/Canvas.cxx rename to SHADE_Managed/src/Components/Canvas.cxx diff --git a/SHADE_Managed/Canvas.hxx b/SHADE_Managed/src/Components/Canvas.hxx similarity index 100% rename from SHADE_Managed/Canvas.hxx rename to SHADE_Managed/src/Components/Canvas.hxx diff --git a/SHADE_Managed/Slider.cxx b/SHADE_Managed/src/Components/Slider.cxx similarity index 100% rename from SHADE_Managed/Slider.cxx rename to SHADE_Managed/src/Components/Slider.cxx diff --git a/SHADE_Managed/Slider.hxx b/SHADE_Managed/src/Components/Slider.hxx similarity index 100% rename from SHADE_Managed/Slider.hxx rename to SHADE_Managed/src/Components/Slider.hxx diff --git a/SHADE_Managed/src/Engine/ECS.cxx b/SHADE_Managed/src/Engine/ECS.cxx index ecd3784d..38596010 100644 --- a/SHADE_Managed/src/Engine/ECS.cxx +++ b/SHADE_Managed/src/Engine/ECS.cxx @@ -30,18 +30,24 @@ of DigiPen Institute of Technology is prohibited. #include "Graphics\MiddleEnd\Interface\SHRenderable.h" #include "Graphics\MiddleEnd\TextRendering\SHTextRenderableComponent.h" #include "UI\SHUIComponent.h" +#include "UI\SHSliderComponent.h" +#include "UI\SHCanvasComponent.h" // Project Headers #include "Utility/Convert.hxx" #include "Utility/Debug.hxx" -#include "Components/Transform.hxx" -#include "Components/RigidBody.hxx" -#include "Components/Collider.hxx" -#include "Components/Camera.hxx" -#include "Components/CameraArm.hxx" -#include "Components/Light.hxx" +#include "Components\Transform.hxx" +#include "Components\RigidBody.hxx" +#include "Components\Collider.hxx" +#include "Components\Camera.hxx" +#include "Components\CameraArm.hxx" +#include "Components\Light.hxx" #include "Components\Renderable.hxx" #include "Components\TextRenderable.hxx" #include "Components\UIElement.hxx" +#include "Components\Canvas.hxx" +#include "Components\Slider.hxx" + + namespace SHADE { @@ -327,6 +333,8 @@ namespace SHADE componentMap.Add(createComponentSet()); componentMap.Add(createComponentSet()); componentMap.Add(createComponentSet()); + componentMap.Add(createComponentSet()); + componentMap.Add(createComponentSet()); } /*---------------------------------------------------------------------------------*/