Bug fixing

ValeriiKoniushenko · Oct 20, 2023 · c79c4f6 · c79c4f6
1 parent 512c3d4
commit c79c4f6
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/lib/core/camera/include/Camera.h b/lib/core/camera/include/Camera.h
@@ -55,7 +55,7 @@ class Camera : public Utils::CopyableAndMoveable, public Updateable
 private:
 	Utils::ISize2D size_;
 	glm::vec2 position_{};
-	float zoomFactor_ = 1.f;
+	float zoomFactor_ = 0.098f;
 	glm::vec2 origin_ = {};
 	float tick_{1.f};
 };
diff --git a/lib/core/core-wrappers/include/Updateable.h b/lib/core/core-wrappers/include/Updateable.h
@@ -22,10 +22,15 @@
 
 #pragma once
 
-class Updateable
+#include "NotCopyableButMovable.h"
+
+class Updateable : public Utils::NotCopyableButMovable
 {
 public:
-	Updateable();
+	Updateable(bool isNeedUpdate = true);
 	virtual ~Updateable();
 	virtual void update() = 0;
+
+private:
+	bool isNeedUpdate_ = false;
 };
diff --git a/lib/core/core-wrappers/source/Image.cpp b/lib/core/core-wrappers/source/Image.cpp
@@ -53,6 +53,7 @@ Image& Image::operator=(Image&& obj) noexcept
 	this->height_ = obj.height_;
 	this->channel_ = obj.channel_;
 	this->internalChannel_ = obj.internalChannel_;
+	this->name_ = obj.name_;
 
 	obj.init_();
 	return *this;
@@ -63,6 +64,7 @@ void Image::init_()
 	data_ = nullptr;
 	width_ = height_ = 0;
 	channel_ = Channel::None;
+	name_.clear();
 }
 
 int Image::getWidth() const

diff --git a/lib/core/core-wrappers/source/Updateable.cpp b/lib/core/core-wrappers/source/Updateable.cpp
@@ -25,12 +25,18 @@
 
 #include "UpdateableCollector.h"
 
-Updateable::Updateable()
+Updateable::Updateable(bool isNeedUpdate/* = true*/) : isNeedUpdate_(isNeedUpdate)
 {
-	GetUpdateableCollector().add(this);
+	if (isNeedUpdate_)
+	{
+		GetUpdateableCollector().add(this);
+	}
 }
 
 Updateable::~Updateable()
 {
-	GetUpdateableCollector().remove(this);
+	if (isNeedUpdate_)
+	{
+		GetUpdateableCollector().remove(this);
+	}
 }
diff --git a/lib/core/core-wrappers/source/UpdateableCollector.cpp b/lib/core/core-wrappers/source/UpdateableCollector.cpp
@@ -36,7 +36,7 @@ void UpdateableCollector::remove(Updateable* object)
 
 void UpdateableCollector::updateAll()
 {
-	for (auto* data : data_)
+	for (auto* data : data_) // TODO: it needs multithreading
 	{
 		data->update();
 	}

diff --git a/lib/core/shapes/include/Widget.h b/lib/core/shapes/include/Widget.h
@@ -44,7 +44,7 @@ class Widget : public DrawAble, public JsonPrintable, public Updateable, public
 	inline static constexpr float borderWidth = 0.05f;
 	inline static constexpr const char* componentName = "widget";
 
-	Widget();
+	Widget(bool isNeedUpdate = false);
 
 	Widget(Widget&& other) noexcept;
 

diff --git a/lib/core/shapes/source/Widget.cpp b/lib/core/shapes/source/Widget.cpp
@@ -34,7 +34,7 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
-Widget::Widget()
+Widget::Widget(bool isNeedUpdate/* = true*/) : Updateable(isNeedUpdate)
 {
 	getWidgetCollector().add(this);
 }
@@ -123,7 +123,7 @@ void Widget::setTexture(Texture& texture)
 
 Texture& Widget::getTexture()
 {
-	if (texture_)
+	if (!texture_)
 	{
 		throw std::runtime_error("Impossible to get NULL texture");
 	}