diff options
| -rw-r--r-- | modules/vhacd/SCsub | 4 | ||||
| -rw-r--r-- | scene/animation/animation_tree.cpp | 14 | ||||
| -rw-r--r-- | scene/main/viewport.cpp | 2 | ||||
| -rw-r--r-- | thirdparty/vhacd/src/btConvexHullComputer.cpp | 13 |
4 files changed, 22 insertions, 11 deletions
diff --git a/modules/vhacd/SCsub b/modules/vhacd/SCsub index e89a64a68e..11cd5f4743 100644 --- a/modules/vhacd/SCsub +++ b/modules/vhacd/SCsub @@ -27,6 +27,10 @@ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_vhacd.Append(CPPPATH=[thirdparty_dir+"/inc"]) env_vhacd.Append(CPPFLAGS=["-DGODOT_ENET"]) +# upstream uses c++11 +if not env.msvc: + env_vhacd.Append(CCFLAGS="-std=c++11") + env_thirdparty = env_vhacd.Clone() env_thirdparty.disable_warnings() env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index 2f209ed946..13b8ebe12d 100644 --- a/scene/animation/animation_tree.cpp +++ b/scene/animation/animation_tree.cpp @@ -1302,9 +1302,17 @@ void AnimationTree::_notification(int p_what) { _clear_caches(); if (last_animation_player) { - Object *old_player = ObjectDB::get_instance(last_animation_player); - if (old_player) { - old_player->disconnect("caches_cleared", this, "_clear_caches"); + Object *player = ObjectDB::get_instance(last_animation_player); + if (player) { + player->disconnect("caches_cleared", this, "_clear_caches"); + } + } + } else if (p_what == NOTIFICATION_ENTER_TREE) { + if (last_animation_player) { + + Object *player = ObjectDB::get_instance(last_animation_player); + if (player) { + player->connect("caches_cleared", this, "_clear_caches"); } } } diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 2524af9cfb..05c183275a 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -3222,7 +3222,7 @@ Viewport::Viewport() { gui.tooltip_timer = -1; //gui.tooltip_timer->force_parent_owned(); - gui.tooltip_delay = GLOBAL_DEF("gui/timers/tooltip_delay_sec", 0.7); + gui.tooltip_delay = GLOBAL_DEF("gui/timers/tooltip_delay_sec", 0.5); ProjectSettings::get_singleton()->set_custom_property_info("gui/timers/tooltip_delay_sec", PropertyInfo(Variant::REAL, "gui/timers/tooltip_delay_sec", PROPERTY_HINT_RANGE, "0,5,0.01,or_greater")); // No negative numbers gui.tooltip = NULL; diff --git a/thirdparty/vhacd/src/btConvexHullComputer.cpp b/thirdparty/vhacd/src/btConvexHullComputer.cpp index 5ff3ab917e..15956fc0c4 100644 --- a/thirdparty/vhacd/src/btConvexHullComputer.cpp +++ b/thirdparty/vhacd/src/btConvexHullComputer.cpp @@ -3,8 +3,8 @@ Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. @@ -21,11 +21,6 @@ subject to the following restrictions: #ifdef __GNUC__ #include <stdint.h> - -//GODOT ADDITION -namespace VHACD { -// - #elif defined(_MSC_VER) typedef __int32 int32_t; typedef __int64 int64_t; @@ -54,6 +49,10 @@ typedef unsigned long long int32_t uint64_t; #include <stdio.h> #endif +//GODOT ADDITION +namespace VHACD { +// + // Convex hull implementation based on Preparata and Hong // Ole Kniemeyer, MAXON Computer GmbH class btConvexHullInternal { |