fix a strange bug about update

NeilKleistGao · Oct 30, 2021 · fcf4c95 · fcf4c95
1 parent c6a311c
commit fcf4c95
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 21 deletions.
diff --git a/kernel/components/sprite.cc b/kernel/components/sprite.cc
@@ -35,8 +35,8 @@ namespace ngind::components {
 
 Sprite::Sprite()
         : RendererComponent(),
-          _command(nullptr), _quad(nullptr),
-          _texture(nullptr), _lb(), _rt() {
+        _command(nullptr), _quad(nullptr),
+        _texture(nullptr), _lb(), _rt() {
 }
 
 Sprite::~Sprite() {
@@ -100,7 +100,7 @@ void Sprite::draw() {
                         0.0f, 0.0f, static_cast<float>(_lb.x) / texture_size.x, static_cast<float>(_rt.y) / texture_size.y, // Bottom Left
                         0.0f, _rt.y - _lb.y, static_cast<float>(_lb.x) / texture_size.x, static_cast<float>(_lb.y) / texture_size.y  // Top Left
                 }
-        );
+                );
         _quad->addReference();
         _command = memory::MemoryPool::getInstance()
                 ->create<rendering::QuadRenderingCommand>(_quad, (*_texture)->getTextureID());

diff --git a/kernel/components/state_machine.cc b/kernel/components/state_machine.cc
@@ -34,7 +34,6 @@ _update_function(script::LuaState::getInstance()->getState()) {
 
 StateMachine::~StateMachine() {
     halt();
-    script::LuaState::getInstance()->destroyStateMachineInstance(_instance);
 }
 
 void StateMachine::init(const typename resources::ConfigResource::JsonObject& data) {
@@ -91,15 +90,21 @@ StateMachine* StateMachine::create(const typename resources::ConfigResource::Jso
 }
 
 void StateMachine::halt() {
+    if (_instance.isNil()) {
+        return;
+    }
+
     luabridge::LuaRef state_exit = _instance["exit"];
     if (!state_exit.isNil()) {
-        state_exit();
+        state_exit(_instance);
     }
 
     auto instance = script::Observer::getInstance();
     for (const auto& [name, _] : _subscribe) {
         instance->cancel(this, name);
     }
+
+    script::LuaState::getInstance()->destroyStateMachineInstance(_instance);
 }
 
 void StateMachine::update(const float& dlt) {

diff --git a/kernel/log/logger.cc b/kernel/log/logger.cc
@@ -25,8 +25,6 @@
 
 #include "logger.h"
 
-#include <ctime>
-
 namespace ngind::log {
 void Logger::log(const std::string& msg) {
     std::string format_msg;

diff --git a/kernel/objects/object.cc b/kernel/objects/object.cc
@@ -71,7 +71,7 @@ void Object::removeChild(Object* child) {
         for (auto it = _children.begin(); it != _children.end(); ++it) {
             if (it->second == child) {
                 flag = true;
-                _children.erase(it);
+                it->second = nullptr;
                 break;
             }
         }
@@ -99,7 +99,9 @@ void Object::update(const float& delta) {
     }
 
     for (auto child : this->_children) {
-        child.second->update(delta);
+        if (child.second) {
+            child.second->update(delta);
+        }
     }
 }
 

diff --git a/kernel/objects/object.h b/kernel/objects/object.h
@@ -56,10 +56,10 @@ class Object : public memory::AutoCollectionObject, public UpdatableObject {
     virtual void addChild(const std::string& name, EntityObject* object);
 
     /**
-     * Remove a reference of a child. If child is not found, nothing
+     * Remove a reference of a child. If child is not found, nothing will be done
      * @param name: the name of child
      */
-    void removeChild(Object* child);
+    virtual void removeChild(Object* child);
 
     /**
      * Remove all children by given name.

diff --git a/kernel/objects/world.cc b/kernel/objects/world.cc
@@ -121,4 +121,15 @@ void World::unregisterEntity(int id) {
     }
 }
 
+void World::removeChild(Object* child) {
+    for (auto it = _all_children.begin(); it != _all_children.end(); ++it) {
+        if (it->second == child) {
+            _all_children.erase(it);
+            break;
+        }
+    }
+
+    Object::removeChild(child);
+}
+
 } // namespace ngind::objects
diff --git a/kernel/objects/world.h b/kernel/objects/world.h
@@ -125,6 +125,8 @@ class World : public Object {
     * Load children objects using config file
     */
     void loadObjects();
+
+    void removeChild(Object* child) override;
 private:
     /**
      * The name of this world

diff --git a/kernel/rendering/renderer.cc b/kernel/rendering/renderer.cc
@@ -28,7 +28,6 @@
 #include "renderer.h"
 #include "camera.h"
 #include "log/logger_factory.h"
-#include "adaptor.h"
 
 namespace ngind::rendering {
 Renderer* Renderer::_instance = nullptr;
@@ -100,7 +99,6 @@ void Renderer::createWindow(int screen_width,
     glEnable(GL_BLEND);
     setBlendFactor(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glEnable(GL_MULTISAMPLE);
-    Adaptor::getInstance()->setWindowSize({screen_width, screen_height});
     Camera::getInstance()->init({resolution_width / 2.0f, resolution_height / 2.0f},
                                 resolution_width, resolution_height);
 }

diff --git a/kernel/rendering/window.cc b/kernel/rendering/window.cc
@@ -103,13 +103,8 @@ void Window::setFullScreen(const bool& is_full) {
     if (is_full) {
         glfwSetWindowMonitor(this->_window, monitor, 0, 0, mode->width, mode->height, mode->refreshRate);
 
-#ifdef PLATFORM_WINDOWS
         auto scale = getContentScale();
-        Adaptor::getInstance()->setWindowSize({ mode->width, mode->height });
-#else
-        auto scale = getContentScale();
-        Adaptor::getInstance()->setWindowSize({ mode->width * scale.first, mode->height * scale.second });
-#endif
+        Adaptor::getInstance()->setWindowSize({mode->width * scale.first, mode->height * scale.second});
     }
     else {
         glfwSetWindowMonitor(this->_window, nullptr, 0, 0, _width, _height, 0);

diff --git a/kernel/ui/kd_tree.cc b/kernel/ui/kd_tree.cc
@@ -23,8 +23,6 @@
 
 #include "kd_tree.h"
 
-#include <algorithm>
-
 namespace ngind::ui {
 KDTree::KDTree() : _root(new KDNode()) {
 }