Merge branch 'master' of github.com:NeilKleistGao/NginD

extern/physics/physics_listener.cc

@@ -81,7 +81,7 @@ std::pair<RigidBody*, RigidBody*> PhysicsListener::getContactingBodies(b2Contact
 void PhysicsListener::sendMessage(const std::string& name, objects::Object* sender, objects::Object* other) {
     auto ob = script::Observer::getInstance();
     luabridge::setGlobal(script::LuaState::getInstance()->getState(), other, "__PHYSICS_CONTACT_DATA__");
-    ob->notifySiblings("BeginContact", sender, luabridge::getGlobal(script::LuaState::getInstance()->getState(), "__PHYSICS_CONTACT_DATA__"));
+    ob->notifySiblings(name, sender, luabridge::getGlobal(script::LuaState::getInstance()->getState(), "__PHYSICS_CONTACT_DATA__"));
     luabridge::setGlobal(script::LuaState::getInstance()->getState(), 0, "__PHYSICS_CONTACT_DATA__");
 }
 

extern/physics/physics_world.cc

@@ -65,15 +65,19 @@ PhysicsWorld* PhysicsWorld::create(const typename resources::ConfigResource::Jso
 
 void PhysicsWorld::clearRigidBody(objects::Object* node) {
     auto body = node->getComponent<RigidBody>("RigidBody");
+    _world.SetContactListener(nullptr);
     if (body != nullptr) {
-        _world.DestroyBody(body->_body);
+        auto temp = body->_body;
         body->_body = nullptr;
+        _world.DestroyBody(temp);
     }
 
     auto children = node->getChildren();
     for (auto* child : children) {
         clearRigidBody(child);
     }
+
+    _world.SetContactListener(&listener);
 }
 
 } // namespace ngind::physics

kernel/log/logger.cc

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

kernel/rendering/renderer.cc

@@ -28,6 +28,7 @@
 #include "renderer.h"
 #include "camera.h"
 #include "log/logger_factory.h"
+#include "adaptor.h"
 
 namespace ngind::rendering {
 Renderer* Renderer::_instance = nullptr;
@@ -99,6 +100,7 @@ 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);
 }

kernel/rendering/window.cc

@@ -103,8 +103,13 @@ 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 * scale.first, mode->height * scale.second});
+        Adaptor::getInstance()->setWindowSize({ mode->width, mode->height });
+#else
+        auto scale = getContentScale();
+        Adaptor::getInstance()->setWindowSize({ mode->width * scale.first, mode->height * scale.second });
+#endif
     }
     else {
         glfwSetWindowMonitor(this->_window, nullptr, 0, 0, _width, _height, 0);

kernel/ui/kd_tree.cc

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