[#190]: Fix SA issues

JacobDomagala · Feb 6, 2024 · 8e6076f · 8e6076f
1 parent 9de0938
commit 8e6076f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/editor/editor.cpp b/editor/editor.cpp
@@ -551,11 +551,18 @@ Editor::GetSelectedObjects() const
 void
 Editor::SelectGameObject(Object::ID newSelectedGameObject)
 {
+   if (currentSelectedGameObject_ != Object::INVALID_ID)
+   {
+      currentLevel_->GetGameObjectRef(currentSelectedGameObject_)
+         .SetColor({1.0f, 1.0f, 1.0f, 1.0f});
+   }
+
    currentSelectedGameObject_ = newSelectedGameObject;
    gui_.ObjectSelected(currentSelectedGameObject_);
 
    // Make sure to render animation points if needed
    auto& gameObject = currentLevel_->GetGameObjectRef(newSelectedGameObject);
+   gameObject.SetColor({0.4f, 0.0f, 0.0f, 0.8f});
    const auto* animatable = dynamic_cast< Animatable* >(&gameObject);
 
    if (animatable and animatable->GetRenderAnimationSteps())
@@ -634,8 +641,8 @@ Editor::UnselectGameObject(Object::ID object, bool groupSelect)
 
    if (currentSelectedGameObject_ == object)
    {
+      currentLevel_->GetGameObjectRef(object).SetColor({1.0f, 1.0f, 1.0f, 1.0f});
       currentSelectedGameObject_ = Object::INVALID_ID;
-      selectedObjects_.clear();
    }
    else if (groupSelect)
    {
@@ -670,6 +677,13 @@ Editor::UnselectAll()
       gui_.ObjectUnselected(object);
    }
    selectedObjects_.clear();
+
+   if (currentSelectedGameObject_ != Object::INVALID_ID)
+   {
+      currentLevel_->GetGameObjectRef(currentSelectedGameObject_)
+         .SetColor({1.0f, 1.0f, 1.0f, 1.0f});
+      currentSelectedGameObject_ = Object::INVALID_ID;
+   }
 }
 
 void

diff --git a/editor/gizmo.cpp b/editor/gizmo.cpp
@@ -88,7 +88,7 @@ Gizmo::AdjustSize()
    float scaleFactor = 1.0f;
    if (zoomLevel_ >= 0)
    {
-      scaleFactor = 20.0f / (20.0f - zoomLevel_);
+      scaleFactor = 20.0f / (20.0f - static_cast< float >(zoomLevel_));
    }
 
    gizmoCenter_.Scale(
@@ -114,13 +114,6 @@ Gizmo::AdjustSize()
                   0.0f});
 }
 
-
-glm::vec2
-Gizmo::Position() const
-{
-   return gizmoCenter_.GetPosition();
-}
-
 void
 Gizmo::CheckHovered(const glm::vec3& cameraPos, const glm::vec2& globalPosition)
 {

diff --git a/editor/gizmo.hpp b/editor/gizmo.hpp
@@ -45,8 +45,6 @@ class Gizmo
    SwitchToRotate();
    void
    SwitchToTranslate();
-   glm::vec2
-   Position() const;
 
  private:
    void

diff --git a/engine/renderer/sprite.cpp b/engine/renderer/sprite.cpp
@@ -35,7 +35,7 @@ Sprite::ChangeRenderLayer(int32_t newLayer)
 
    for (auto& vertex : vertices_)
    {
-      vertex.position_.z = LAYERS.at(newLayer);
+      vertex.position_.z = LAYERS.at(static_cast< uint32_t >(newLayer));
    }
 
    const auto transformMat = ComputeModelMat();