Merge branch 'implot' of github.com:Devsh-Graphics-Programming/Nabla

Author: AnastaZIuk

.gitmodules

@@ -87,3 +87,6 @@
 [submodule "3rdparty/imgui"]
 	path = 3rdparty/imgui
 	url = git@github.com:ocornut/imgui.git
+[submodule "3rdparty/implot"]
+	path = 3rdparty/implot
+	url = git@github.com:epezent/implot.git

3rdparty/CMakeLists.txt

@@ -250,6 +250,24 @@ if(NBL_BUILD_IMGUI)
 		PUBLIC "imgui/backends"
 	)
 
+	# ImPlot
+	add_library(implot STATIC
+		"implot/implot.h"
+		"implot/implot_internal.h"
+		"implot/implot.cpp"
+		"implot/implot_items.cpp"
+	)
+	target_include_directories(implot
+		PUBLIC "imgui"
+	)
+	target_link_libraries(implot PUBLIC imgui)
+	target_compile_definitions(implot PUBLIC IMPLOT_DEBUG IMPLOT_DLL_EXPORT)
+	set_property(TARGET implot PROPERTY CXX_STANDARD 11)
+	if(MSVC)
+		target_compile_options(implot PRIVATE /MT /W4 /WX /arch:AVX2 /fp:fast /permissive-) 
+	else()
+		target_compile_options(implot PRIVATE -Wall -Wextra -pedantic -Werror -mavx2 -Ofast)
+	endif()
 endif()
 
 add_library(aesGladman OBJECT

3rdparty/implot

@@ -238,7 +238,11 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
 	target_link_libraries(${LIB_NAME} PUBLIC Nabla)
 	target_compile_options(${LIB_NAME} PUBLIC ${LIB_OPTIONS})
 	target_compile_definitions(${LIB_NAME} PUBLIC ${DEF_OPTIONS})
-	set_target_properties(${LIB_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+	if(NBL_DYNAMIC_MSVC_RUNTIME)
+		set_target_properties(${LIB_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+	else()
+		set_target_properties(${LIB_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+	endif()
 
 	if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 		add_compile_options(

cmake/common.cmake

@@ -1,14 +1,13 @@
 #ifndef NBL_EXT_IMGUI_UI_H
 #define NBL_EXT_IMGUI_UI_H
 
-#include <glm/vec3.hpp>
 
 namespace nbl::ext::imgui
 {
-	class NBL_API2 UI final : public core::IReferenceCounted{
+	class UI final : public core::IReferenceCounted{
 	public:
 
-		explicit UI(
+		UI(
 			core::smart_refctd_ptr<video::ILogicalDevice> device,
 			int maxFramesInFlight,
 			core::smart_refctd_ptr<video::IGPURenderpass>& renderPass,
@@ -52,7 +51,7 @@ namespace nbl::ext::imgui
 
 		void InputFloat4(char const* label, float* value);
 
-		void InputFloat3(char const* label, glm::vec3& value);
+		void InputFloat3(char const* label, nbl::core::vector3df& value);
 
 		bool Combo(
 			char const* label,

include/nbl/ext/ImGui/ImGui.h

@@ -879,14 +879,14 @@ namespace nbl::ext::imgui
 
 	//-------------------------------------------------------------------------------------------------
 
-	void UI::InputFloat3(char const* label, glm::vec3& value)
+	void UI::InputFloat3(char const* label, nbl::core::vector3df&value)
 	{
-		float tempValue[3]{ value.x, value.y, value.z };
+		float tempValue[3]{ value.X, value.Y, value.Z };
 		InputFloat3(label, tempValue);
 
-		if (memcmp(tempValue, &value[0], sizeof(float) * 3) != 0)
+		if (memcmp(tempValue, &value.X, sizeof(float) * 3) != 0)
 		{
-			memcpy(&value[0], tempValue, sizeof(float) * 3);
+			memcpy(&value.X, tempValue, sizeof(float) * 3);
 		}
 	}