Merge pull request #1623 from rokups/feature/misc

Misc small improvements

Source/Atomic/CMakeLists.txt

@@ -241,5 +241,5 @@ if (MSVC)
 endif ()
 
 if (UNIX OR MINGW)
-    target_compile_options(Atomic PUBLIC -std=gnu++11)
+    target_compile_options(Atomic PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11>)
 endif ()

Source/Atomic/Core/Object.cpp

@@ -75,7 +75,10 @@ bool TypeInfo::IsTypeOf(const TypeInfo* typeInfo) const
 }
 
 Object::Object(Context* context) :
-    context_(context)
+    context_(context),
+    // ATOMIC BEGIN
+    blockEvents_(false)
+    // ATOMIC END
 {
     assert(context_);
 }
@@ -88,6 +91,11 @@ Object::~Object()
 
 void Object::OnEvent(Object* sender, StringHash eventType, VariantMap& eventData)
 {
+    // ATOMIC BEGIN
+    if (blockEvents_)
+        return;
+    // ATOMIC END
+
     // Make a copy of the context pointer in case the object is destroyed during event handler invocation
     Context* context = context_;
     EventHandler* specific = 0;
@@ -340,6 +348,11 @@ void Object::SendEventNonProfiled(StringHash eventType, VariantMap& eventData)
         return;
     }
 
+    // ATOMIC BEGIN
+    if (blockEvents_)
+        return;
+    // ATOMIC END
+
     // Make a weak pointer to self to check for destruction during event handling
     WeakPtr<Object> self(this);
     Context* context = context_;
@@ -721,6 +734,12 @@ template <> Metrics* Object::GetSubsystem<Metrics>() const
     return context_->metrics_;
 }
 
+void Object::SendEvent(StringHash eventType, const VariantMap& eventData)
+{
+    VariantMap eventDataCopy = eventData;
+    SendEvent(eventType, eventDataCopy);
+}
+
 // ATOMIC END
 
 }

Source/Atomic/Core/Object.h

@@ -215,7 +215,12 @@ public:
 
     static ClassID GetClassIDStatic() { static const int typeID = 0; return (ClassID) &typeID; }
     static const Atomic::String& GetTypeNameStatic() { static const Atomic::String typeNameStatic("Object"); return typeNameStatic; }
-
+    /// Send event with parameters to all subscribers.
+    void SendEvent(StringHash eventType, const VariantMap& eventData);
+    /// Block object from sending and receiving events.
+    void SetBlockEvents(bool block) { blockEvents_ = block; }
+    /// Return sending and receiving events blocking status.
+    bool GetBlockEvents() const { return blockEvents_; }
     // ATOMIC END
 
 protected:
@@ -237,6 +242,10 @@ private:
 
     /// Event handlers. Sender is null for non-specific handlers.
     LinkedList<EventHandler> eventHandlers_;
+
+    // ATOMIC BEGIN
+    bool blockEvents_;
+    // ATOMIC END
 };
 
 template <class T> T* Object::GetSubsystem() const { return static_cast<T*>(GetSubsystem(T::GetTypeStatic())); }

Source/Atomic/Math/Vector2.h

@@ -52,7 +52,14 @@ public:
         y_(data[1])
     {
     }
-
+    // ATOMIC BEGIN
+    /// Construct from an int array.
+    IntVector2(const float* data) :
+        x_((int)data[0]),
+        y_((int)data[1])
+    {
+    }
+    // ATOMIC END
     /// Copy-construct from another vector.
     IntVector2(const IntVector2& rhs) :
         x_(rhs.x_),

Source/Atomic/UI/SystemUI/MessageBox.cpp

@@ -81,7 +81,7 @@ void MessageBox::RenderFrame(StringHash eventType, VariantMap& eventData)
     if (ImGui::Begin(titleText_.CString(), &isOpen_, windowSize_, -1, ImGuiWindowFlags_NoCollapse|
                      ImGuiWindowFlags_NoSavedSettings))
     {
-        ImGui::Text(messageText_.CString());
+        ImGui::TextUnformatted(messageText_.CString());
         auto region = ImGui::GetContentRegionAvail();
         ImGui::SetCursorPos(ImVec2(region.x - 100 + 20, region.y + 20));
 

Source/ThirdParty/SQLite/CMakeLists.txt

@@ -60,7 +60,12 @@ if (NOT IOS AND NOT TVOS AND NOT WEB)
 
     # Define dependency libs
     if (NOT WIN32)
-        set (LIBS dl pthread)    # ATOMIC FIX
+        # ATOMIC BEGIN
+        set (LIBS dl)
+        if (NOT ANDROID)
+            list (APPEND LIBS pthread)
+        endif ()
+        # ATOMIC END
         if (READLINE_FOUND)
             add_definitions (-DHAVE_READLINE)
             list (APPEND INCLUDE_DIRS ${READLINE_INCLUDE_DIRS})

Source/ThirdParty/easy_profiler/CMakeLists.txt

@@ -8,7 +8,9 @@ set(EASY_PRODUCT_VERSION_STRING "${EASY_PROGRAM_VERSION_MAJOR}.${EASY_PROGRAM_VE
 
 # ATOMIC BEGIN
 
-find_package(Qt5Widgets)
+if (ATOMIC_DESKTOP)
+    find_package(Qt5Widgets)
+endif ()
 
 set(EASY_OPTION_LIB_STATIC ON CACHE BOOL "" FORCE)
 set(EASY_OPTION_PREDEFINED_COLORS ON CACHE BOOL "" FORCE)
@@ -43,7 +45,7 @@ add_subdirectory(easy_profiler_core)
 
 # ATOMIC BEGIN
 # Only include the Qt client if on we're building desktop platform and Qt5 was found on system
-if (ATOMIC_DESKTOP AND Qt5Widgets_FOUND)
+if (Qt5Widgets_FOUND)
     add_subdirectory(profiler_gui)
 endif()
 #ATOMIC END

Source/ThirdParty/easy_profiler/easy_profiler_core/CMakeLists.txt

@@ -121,7 +121,11 @@ easy_define_target_option(easy_profiler EASY_OPTION_PREDEFINED_COLORS EASY_OPTIO
 
 if (UNIX)
     target_compile_options(easy_profiler PRIVATE -Wall -Wno-long-long -Wno-reorder -Wno-braced-scalar-init -pedantic -O3)
-    target_link_libraries(easy_profiler pthread)
+    # ATOMIC BEGIN
+    if (NOT ANDROID)
+        target_link_libraries(easy_profiler pthread)
+    endif ()
+    # ATOMIC END
 elseif (WIN32)
     target_compile_definitions(easy_profiler PRIVATE -D_WIN32_WINNT=0x0600 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)
     target_link_libraries(easy_profiler ws2_32 psapi)
@@ -132,7 +136,7 @@ if (MINGW)
 endif ()
 
 if (APPLE)
-    target_compile_options(easy_profiler PUBLIC -std=gnu++11)
+    target_compile_options(easy_profiler PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11>)
 else ()
     
 
@@ -141,11 +145,9 @@ else ()
             target_compile_options(easy_profiler PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11>)
         endif ()
     else()
-    
         if (NOT MSVC)
-            target_compile_options(easy_profiler PUBLIC -std=gnu++11)
+            target_compile_options(easy_profiler PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11>)
         endif ()
-        
         set_target_properties(easy_profiler PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
     endif ()
 endif ()