Update dependencies

effekseer · Feb 25, 2024 · 569f4b3 · 569f4b3
1 parent bbd47eb
commit 569f4b3
Show file tree

Hide file tree

Showing 11 changed files with 3,422 additions and 2,440 deletions.
diff --git a/Dev/Cpp/3rdParty/imgui b/Dev/Cpp/3rdParty/imgui
diff --git a/Dev/Cpp/3rdParty/imgui-node-editor b/Dev/Cpp/3rdParty/imgui-node-editor
diff --git a/Dev/Cpp/EffekseerMaterialEditor/effekseerMaterialEditor.cpp b/Dev/Cpp/EffekseerMaterialEditor/effekseerMaterialEditor.cpp
@@ -4,14 +4,17 @@
 #pragma comment(lib, "opengl32.lib")
 #pragma comment(lib, "gdiplus.lib")
 
+#define IMGUI_DEFINE_MATH_OPERATORS 1
+
+#include "efkMat.Editor.h"
+
 #include "Config.h"
 #include "Dialog/Dialog.h"
 #include "Graphics/efkMat.Graphics.h"
 
 #include "../IPC/IPC.h"
 
 #include <GLFW/glfw3.h>
-#include <imgui.h>
 #include <imgui_impl_glfw.h>
 #include <imgui_impl_opengl3.h>
 
@@ -20,8 +23,6 @@
 #include <efkMat.Parameters.h>
 #include <efkMat.TextExporter.h>
 
-#include "efkMat.Editor.h"
-
 #include <efkMat.CommandManager.h>
 #include <efkMat.StringContainer.h>
 

diff --git a/Dev/Cpp/EffekseerMaterialEditor/efkMat.Editor.cpp b/Dev/Cpp/EffekseerMaterialEditor/efkMat.Editor.cpp
@@ -1,13 +1,15 @@
 #define NOMINMAX
-#include "efkMat.Editor.h"
-#include "efkMat.CommandManager.h"
-#include "efkMat.Models.h"
+#define IMGUI_DEFINE_MATH_OPERATORS 1
 
-#include <imgui_node_editor.h>
+#include "efkMat.Editor.h"
 
 #include <imgui_node_editor_internal.h>
 
-#include <imgui_internal.h>
+// #include <imgui_internal.h>
+
+#include "efkMat.CommandManager.h"
+#include "efkMat.Models.h"
+
 #include <nfd.h>
 
 #include <GUI/MainWindow.h>
@@ -2107,8 +2109,7 @@ void Editor::UpdateNode(std::shared_ptr<Node> node)
 							   ImVec2(itemRectMax.x, itemRectMin.y + 30 * mainWindow->GetDPIScale()),
 							   IM_COL32(110, 110, 110, 255),
 							   ed::GetStyle().NodeRounding,
-							   ImDrawCornerFlags_Top);
-
+							   ImDrawFlags_RoundCornersTop);
 	node->ClearPosDirtied();
 }
 

diff --git a/Dev/Cpp/EffekseerMaterialEditor/efkMat.Editor.h b/Dev/Cpp/EffekseerMaterialEditor/efkMat.Editor.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "imgui_node_editor.h"
+#include <imgui_node_editor.h>
 namespace ed = ax::NodeEditor;
 
 #include "Graphics/efkMat.Graphics.h"

diff --git a/Dev/Cpp/Viewer/3rdParty/imgui_addon/fcurve/fcurve.cpp b/Dev/Cpp/Viewer/3rdParty/imgui_addon/fcurve/fcurve.cpp
@@ -264,7 +264,7 @@ namespace ImGui
 		NormalizeKeyValues(pos0, cp0m, cp1m, pos1);
 
 		window->DrawList->PathLineTo(pos0);
-		window->DrawList->PathBezierCurveTo(cp0m, cp1m, pos1, 0);
+		window->DrawList->PathBezierCubicCurveTo(cp0m, cp1m, pos1, 0);
 
 		bool isHovered = false;
 
@@ -1729,7 +1729,7 @@ namespace ImGui
 						auto v2s = transform_f2s(v2);
 						NormalizeKeyValues(v1s, cp1s, cp2s, v2s);
 
-						window->DrawList->AddBezierCurve(
+						window->DrawList->AddBezierCubic(
 							v1s,
 							cp1s,
 							cp2s,
@@ -1765,7 +1765,7 @@ namespace ImGui
 						auto v2s = transform_f2s(v2);
 						NormalizeKeyValues(v1s, cp1s, cp2s, v2s);
 
-						window->DrawList->AddBezierCurve(
+						window->DrawList->AddBezierCubic(
 							v1s,
 							cp1s,
 							cp2s,

diff --git a/Dev/Cpp/Viewer/3rdParty/imgui_addon/implot/implot.cpp b/Dev/Cpp/Viewer/3rdParty/imgui_addon/implot/implot.cpp
diff --git a/Dev/Cpp/Viewer/3rdParty/imgui_addon/implot/implot.h b/Dev/Cpp/Viewer/3rdParty/imgui_addon/implot/implot.h
+61 −0		.github/workflows/build.yml
+0 −40		.travis.yml
+0 −40		appveyor.yml
+79 −3		crude_json.cpp
+27 −0		crude_json.h
+289 −0		docs/CHANGELOG.txt
+63 −39		docs/README.md
+9 −2		examples/CMakeLists.txt
+62 −29		examples/application/CMakeLists.txt
+57 −13		examples/application/include/application.h
+244 −0		examples/application/source/application.cpp
+4 −0		examples/application/source/config.h.in
+0 −286		examples/application/source/dx11/entry.cpp
+0 −306		examples/application/source/dx11/imgui_impl_win32.cpp
+0 −22		examples/application/source/dx11/imgui_impl_win32.h
+21 −0		examples/application/source/entry_point.cpp
+0 −197		examples/application/source/glfw/entry.cpp
+0 −406		examples/application/source/glfw/imgui_impl_glfw_gl3.cpp
+0 −27		examples/application/source/glfw/imgui_impl_glfw_gl3.h
+65 −0		examples/application/source/imgui_extra_keys.h
+21 −10		examples/application/source/imgui_impl_dx11.cpp
+0 −0		examples/application/source/imgui_impl_dx11.h
+382 −0		examples/application/source/imgui_impl_glfw.cpp
+36 −0		examples/application/source/imgui_impl_glfw.h
+947 −0		examples/application/source/imgui_impl_opengl3.cpp
+66 −0		examples/application/source/imgui_impl_opengl3.h
+810 −0		examples/application/source/imgui_impl_opengl3_loader.h
+462 −0		examples/application/source/imgui_impl_win32.cpp
+37 −0		examples/application/source/imgui_impl_win32.h
+60 −0		examples/application/source/platform.h
+287 −0		examples/application/source/platform_glfw.cpp
+313 −0		examples/application/source/platform_win32.cpp
+32 −0		examples/application/source/renderer.h
+195 −0		examples/application/source/renderer_dx11.cpp
+208 −0		examples/application/source/renderer_ogl3.cpp
+98 −0		examples/application/source/setup.h
+168 −159		examples/basic-interaction-example/basic-interaction-example.cpp
+1,397 −1,296		examples/blueprints-example/blueprints-example.cpp
+8 −7		examples/blueprints-example/utilities/builders.cpp
+42 −12		examples/blueprints-example/utilities/drawing.cpp
+1 −1		examples/blueprints-example/utilities/widgets.cpp
+163 −161		examples/canvas-example/canvas-example.cpp
+ −		examples/data/Cuprum-Bold.ttf
+93 −0		examples/data/Cuprum-OFL.txt
+93 −0		examples/data/Oswald-OFL.txt
+ −		examples/data/Oswald-Regular.ttf
+93 −0		examples/data/Play-OFL.txt
+ −		examples/data/Play-Regular.ttf
+53 −45		examples/simple-example/simple-example.cpp
+3 −0		examples/widgets-example/CMakeLists.txt
+432 −0		examples/widgets-example/widgets-example.cpp
+0 −19		external/gl3w/CMakeLists.txt
+0 −1,234		external/gl3w/Include/GL/gl3w.h
+0 −4,533		external/gl3w/Include/GL/glcorearb.h
+0 −1,344		external/gl3w/Source/gl3w.c
+2 −1		external/imgui/CMakeLists.txt
+12 −15		external/imgui/imconfig.h
+4,407 −11,734		external/imgui/imgui.cpp
+368 −732		external/imgui/imgui.h
+141 −790		external/imgui/imgui_demo.cpp
+121 −130		external/imgui/imgui_draw.cpp
+362 −897		external/imgui/imgui_internal.h
+43 −69		external/imgui/imgui_tables.cpp
+701 −1,108		external/imgui/imgui_widgets.cpp
+27 −15		external/imgui/imstb_rectpack.h
+8 −6		external/imgui/imstb_textedit.h
+320 −502		external/imgui/imstb_truetype.h
+2 −0		imgui_bezier_math.h
+5 −0		imgui_bezier_math.inl
+78 −17		imgui_canvas.cpp
+37 −22		imgui_canvas.h
+7 −1		imgui_extra_math.h
+6 −0		imgui_extra_math.inl
+826 −287		imgui_node_editor.cpp
+225 −139		imgui_node_editor.h
+134 −9		imgui_node_editor_api.cpp
+117 −31		imgui_node_editor_internal.h
+10 −0		imgui_node_editor_internal.inl
+18 −0		misc/crude_json.natvis
+56 −10		misc/imgui_node_editor.natvis