Skip to content

Commit bd1924c

Browse files
thedmdthedmd
committed
Removed local copy of all dependencies
Removed local copy of all dependencies in favor of auto checkout. This should also reduce user confusion and attempt to use ancient version of ImGui embedded in the repository.
1 parent 4336be9 commit bd1924c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+563
-65852
lines changed

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,37 @@ env:
2020

2121
jobs:
2222
Windows:
23-
runs-on: windows-2019
24-
env:
25-
VS_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\
26-
MSBUILD_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\
23+
runs-on: windows-latest
2724

2825
steps:
29-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v4
3027
- name: Configure CMake
3128
run: cmake -S examples -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
3229
- name: Build
3330
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
34-
31+
3532
macOS:
3633
runs-on: macos-latest
3734

3835
steps:
39-
- name: Install Dependencies
40-
run: |
41-
brew install glfw3
42-
- uses: actions/checkout@v2
36+
- uses: actions/checkout@v4
4337
- name: Configure CMake
4438
run: cmake -S examples -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
4539
- name: Build
4640
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
47-
41+
4842
Linux:
4943
runs-on: ubuntu-latest
5044

5145
steps:
52-
- name: Install Dependencies
46+
- uses: actions/checkout@v4
47+
- name: Install dependencies
5348
run: |
54-
sudo apt-get update
55-
sudo apt-get install -y libglfw3-dev
56-
- uses: actions/checkout@v2
49+
sudo apt update
50+
sudo apt install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev mesa-common-dev libgl1-mesa-dev
51+
5752
- name: Configure CMake
5853
run: cmake -S examples -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
5954
- name: Build
6055
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
61-
56+

‎crude_json.h‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -147,44 +147,44 @@ struct value
147147
# undef CRUDE_MAX4
148148
# undef CRUDE_MAX3
149149
# undef CRUDE_MAX2
150-
using storage_t = std::aligned_storage<max_size, max_align>::type;
151-
152-
static object* object_ptr( storage_t& storage) { return reinterpret_cast< object*>(&storage); }
153-
static const object* object_ptr(const storage_t& storage) { return reinterpret_cast<const object*>(&storage); }
154-
static array* array_ptr( storage_t& storage) { return reinterpret_cast< array*>(&storage); }
155-
static const array* array_ptr(const storage_t& storage) { return reinterpret_cast<const array*>(&storage); }
156-
static string* string_ptr( storage_t& storage) { return reinterpret_cast< string*>(&storage); }
157-
static const string* string_ptr(const storage_t& storage) { return reinterpret_cast<const string*>(&storage); }
158-
static boolean* boolean_ptr( storage_t& storage) { return reinterpret_cast< boolean*>(&storage); }
159-
static const boolean* boolean_ptr(const storage_t& storage) { return reinterpret_cast<const boolean*>(&storage); }
160-
static number* number_ptr( storage_t& storage) { return reinterpret_cast< number*>(&storage); }
161-
static const number* number_ptr(const storage_t& storage) { return reinterpret_cast<const number*>(&storage); }
150+
struct storage_t { alignas(max_align) unsigned char data[max_size]; };
151+
152+
static object* object_ptr( storage_t& storage) { return reinterpret_cast< object*>(storage.data); }
153+
static const object* object_ptr(const storage_t& storage) { return reinterpret_cast<const object*>(storage.data); }
154+
static array* array_ptr( storage_t& storage) { return reinterpret_cast< array*>(storage.data); }
155+
static const array* array_ptr(const storage_t& storage) { return reinterpret_cast<const array*>(storage.data); }
156+
static string* string_ptr( storage_t& storage) { return reinterpret_cast< string*>(storage.data); }
157+
static const string* string_ptr(const storage_t& storage) { return reinterpret_cast<const string*>(storage.data); }
158+
static boolean* boolean_ptr( storage_t& storage) { return reinterpret_cast< boolean*>(storage.data); }
159+
static const boolean* boolean_ptr(const storage_t& storage) { return reinterpret_cast<const boolean*>(storage.data); }
160+
static number* number_ptr( storage_t& storage) { return reinterpret_cast< number*>(storage.data); }
161+
static const number* number_ptr(const storage_t& storage) { return reinterpret_cast<const number*>(storage.data); }
162162

163163
static type_t construct(storage_t& storage, type_t type)
164164
{
165165
switch (type)
166166
{
167-
case type_t::object: new (&storage) object(); break;
168-
case type_t::array: new (&storage) array(); break;
169-
case type_t::string: new (&storage) string(); break;
170-
case type_t::boolean: new (&storage) boolean(); break;
171-
case type_t::number: new (&storage) number(); break;
167+
case type_t::object: new (storage.data) object(); break;
168+
case type_t::array: new (storage.data) array(); break;
169+
case type_t::string: new (storage.data) string(); break;
170+
case type_t::boolean: new (storage.data) boolean(); break;
171+
case type_t::number: new (storage.data) number(); break;
172172
default: break;
173173
}
174174

175175
return type;
176176
}
177177

178178
static type_t construct(storage_t& storage, null) { (void)storage; return type_t::null; }
179-
static type_t construct(storage_t& storage, object&& value) { new (&storage) object(std::forward<object>(value)); return type_t::object; }
180-
static type_t construct(storage_t& storage, const object& value) { new (&storage) object(value); return type_t::object; }
181-
static type_t construct(storage_t& storage, array&& value) { new (&storage) array(std::forward<array>(value)); return type_t::array; }
182-
static type_t construct(storage_t& storage, const array& value) { new (&storage) array(value); return type_t::array; }
183-
static type_t construct(storage_t& storage, string&& value) { new (&storage) string(std::forward<string>(value)); return type_t::string; }
184-
static type_t construct(storage_t& storage, const string& value) { new (&storage) string(value); return type_t::string; }
185-
static type_t construct(storage_t& storage, const char* value) { new (&storage) string(value); return type_t::string; }
186-
static type_t construct(storage_t& storage, boolean value) { new (&storage) boolean(value); return type_t::boolean; }
187-
static type_t construct(storage_t& storage, number value) { new (&storage) number(value); return type_t::number; }
179+
static type_t construct(storage_t& storage, object&& value) { new (storage.data) object(std::forward<object>(value)); return type_t::object; }
180+
static type_t construct(storage_t& storage, const object& value) { new (storage.data) object(value); return type_t::object; }
181+
static type_t construct(storage_t& storage, array&& value) { new (storage.data) array(std::forward<array>(value)); return type_t::array; }
182+
static type_t construct(storage_t& storage, const array& value) { new (storage.data) array(value); return type_t::array; }
183+
static type_t construct(storage_t& storage, string&& value) { new (storage.data) string(std::forward<string>(value)); return type_t::string; }
184+
static type_t construct(storage_t& storage, const string& value) { new (storage.data) string(value); return type_t::string; }
185+
static type_t construct(storage_t& storage, const char* value) { new (storage.data) string(value); return type_t::string; }
186+
static type_t construct(storage_t& storage, boolean value) { new (storage.data) boolean(value); return type_t::boolean; }
187+
static type_t construct(storage_t& storage, number value) { new (storage.data) number(value); return type_t::number; }
188188

189189
static void destruct(storage_t& storage, type_t type)
190190
{

‎docs/CHANGELOG.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ v0.10.0 (WIP):
44
From this point ed::EndCreate() and ed::EndDelete() can only be called when
55
ed::BeginCreate() and ed::BeginDelete() calls were successful.
66

7+
RESTRUCTURE:
8+
Removed local copy of all dependencies in favor of auto checkout. This should also reduce
9+
user confusion and attempt to use ancient version of ImGui embedded in the repository.
10+
711
NEW: Canvas: Add example of zooming at fixed point (#270)
812

913
NEW: Editor: Add smooth zoom (#266)

‎examples/CMakeLists.txt‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
cmake_minimum_required(VERSION 3.12)
22

3-
project(imgui-node-editor)
3+
project(imgui-node-editor-examples)
44

55
# Define IMGUI_NODE_EDITOR_ROOT_DIR pointing to project root directory
6-
get_filename_component(IMGUI_NODE_EDITOR_ROOT_DIR ${CMAKE_SOURCE_DIR}/.. ABSOLUTE CACHE)
6+
get_filename_component(IMGUI_NODE_EDITOR_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/.. ABSOLUTE CACHE)
77

88
# Enable solution folders in Visual Studio and Folders in Xcode
99
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1010

1111
# Point CMake where to look for module files.
12-
list(APPEND CMAKE_MODULE_PATH ${IMGUI_NODE_EDITOR_ROOT_DIR}/misc/cmake-modules)
12+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
1313

1414
# Node editor use C++14
1515
set(CMAKE_CXX_STANDARD 14)
1616
set(CMAKE_CXX_STANDARD_REQUIRED YES)
1717

18-
19-
20-
21-
2218
# Macro that will configure an example application
2319
macro(add_example_executable name)
2420
project(${name})
@@ -132,3 +128,5 @@ add_subdirectory(simple-example)
132128
add_subdirectory(widgets-example)
133129
add_subdirectory(basic-interaction-example)
134130
add_subdirectory(blueprints-example)
131+
132+
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blueprints-example)

‎examples/application/CMakeLists.txt‎

Lines changed: 14 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ set(_Application_Sources
44
include/application.h
55
source/application.cpp
66
source/entry_point.cpp
7-
source/imgui_extra_keys.h
87
source/config.h.in
98
source/setup.h
109
source/platform.h
@@ -19,75 +18,25 @@ add_library(application STATIC)
1918

2019
target_include_directories(application PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
2120

22-
find_package(imgui REQUIRED)
23-
find_package(stb_image REQUIRED)
24-
find_package(ScopeGuard REQUIRED)
25-
target_link_libraries(application PUBLIC imgui)
26-
target_link_libraries(application PRIVATE stb_image ScopeGuard)
27-
21+
set(imgui_components)
2822
if (WIN32)
29-
list(APPEND _Application_Sources
30-
source/imgui_impl_dx11.cpp
31-
source/imgui_impl_dx11.h
32-
source/imgui_impl_win32.cpp
33-
source/imgui_impl_win32.h
34-
)
35-
36-
set(_DXSDK_Dir ${IMGUI_NODE_EDITOR_ROOT_DIR}/external/DXSDK)
37-
set(_DXSDK_Arch x86)
38-
if (${CMAKE_SIZEOF_VOID_P} EQUAL 8)
39-
set(_DXSDK_Arch x64)
40-
endif()
41-
42-
add_library(dxerr STATIC ${_DXSDK_Dir}/src/dxerr.cpp)
43-
target_include_directories(dxerr PUBLIC "${_DXSDK_Dir}/include")
44-
set_property(TARGET dxerr PROPERTY FOLDER "external")
45-
46-
add_library(d3dx11 UNKNOWN IMPORTED)
47-
set_target_properties(d3dx11 PROPERTIES
48-
IMPORTED_LOCATION "${_DXSDK_Dir}/lib/${_DXSDK_Arch}/d3dx11.lib"
49-
IMPORTED_LOCATION_DEBUG "${_DXSDK_Dir}/lib/${_DXSDK_Arch}/d3dx11d.lib"
50-
INTERFACE_INCLUDE_DIRECTORIES "${_DXSDK_Dir}/include"
51-
INTERFACE_LINK_LIBRARIES "$<$<CONFIG:Debug>:dxerr>"
52-
)
53-
54-
target_link_libraries(application PRIVATE d3d11.lib d3dcompiler.lib d3dx11)
23+
list(APPEND imgui_components win32 dx11)
24+
target_link_libraries(application PRIVATE imgui::win32 imgui::dx11)
5525
else()
56-
find_package(OpenGL REQUIRED)
57-
find_package(glfw3 3 REQUIRED)
58-
59-
if (APPLE)
60-
target_link_libraries(application PRIVATE
61-
"-framework CoreFoundation"
62-
"-framework Cocoa"
63-
"-framework IOKit"
64-
"-framework CoreVideo"
65-
)
66-
endif()
26+
find_package(glfw REQUIRED)
27+
list(APPEND imgui_components glfw opengl3)
28+
target_link_libraries(application PRIVATE imgui::glfw imgui::opengl3)
29+
set(HAVE_GLFW3 YES)
6730
endif()
6831

69-
if (OpenGL_FOUND)
70-
set(HAVE_OPENGL YES)
71-
72-
target_include_directories(application PRIVATE ${OPENGL_INCLUDE_DIR})
73-
target_link_libraries(application PRIVATE ${OPENGL_gl_LIBRARY})
74-
list(APPEND _Application_Sources
75-
source/imgui_impl_opengl3.cpp
76-
source/imgui_impl_opengl3.h
77-
source/imgui_impl_opengl3_loader.h
78-
)
79-
endif()
8032

81-
if (glfw3_FOUND)
82-
set(HAVE_GLFW3 YES)
33+
find_package(imgui REQUIRED COMPONENTS ${imgui_components})
34+
find_package(stb REQUIRED COMPONENTS image)
35+
target_link_libraries(application PUBLIC imgui)
36+
target_link_libraries(application PRIVATE stb::image)
8337

84-
list(APPEND _Application_Sources
85-
source/imgui_impl_glfw.cpp
86-
source/imgui_impl_glfw.h
87-
)
88-
target_link_libraries(application PRIVATE
89-
glfw
90-
)
38+
if (OpenGL_FOUND)
39+
set(HAVE_OPENGL YES)
9140
endif()
9241

9342
configure_file(
@@ -106,4 +55,4 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${_Application_Sources})
10655

10756
target_sources(application PRIVATE ${_Application_Sources})
10857

109-
set_property(TARGET application PROPERTY FOLDER "examples")
58+
set_property(TARGET application PROPERTY FOLDER "lib")

‎examples/application/source/application.cpp‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
# include "setup.h"
33
# include "platform.h"
44
# include "renderer.h"
5-
6-
extern "C" {
7-
#define STB_IMAGE_IMPLEMENTATION
8-
#define STB_IMAGE_STATIC
9-
#include "stb_image.h"
10-
}
11-
5+
# include "stb_image.h"
126

137
Application::Application(const char* name)
148
: Application(name, 0, nullptr)
@@ -94,9 +88,8 @@ void Application::RecreateFontAtlas()
9488
io.Fonts = IM_NEW(ImFontAtlas);
9589

9690
ImFontConfig config;
97-
config.OversampleH = 4;
98-
config.OversampleV = 4;
99-
config.PixelSnapH = false;
91+
config.PixelSnapH = true;
92+
config.RasterizerDensity = m_Platform->GetFramebufferScale();
10093

10194
m_DefaultFont = io.Fonts->AddFontFromFileTTF("data/Play-Regular.ttf", 18.0f, &config);
10295
m_HeaderFont = io.Fonts->AddFontFromFileTTF("data/Cuprum-Bold.ttf", 20.0f, &config);
@@ -113,29 +106,19 @@ void Application::Frame()
113106

114107
if (m_Platform->HasFramebufferScaleChanged())
115108
{
109+
m_Renderer->InvalidateResources();
116110
RecreateFontAtlas();
111+
m_Renderer->UpdateResources();
117112
m_Platform->AcknowledgeFramebufferScaleChanged();
118113
}
119114

120115
const float windowScale = m_Platform->GetWindowScale();
121116
const float framebufferScale = m_Platform->GetFramebufferScale();
122117

123-
if (io.WantSetMousePos)
124-
{
125-
io.MousePos.x *= windowScale;
126-
io.MousePos.y *= windowScale;
127-
}
128-
129118
m_Platform->NewFrame();
130119

131-
// Don't touch "uninitialized" mouse position
132-
if (io.MousePos.x > -FLT_MAX && io.MousePos.y > -FLT_MAX)
133-
{
134-
io.MousePos.x /= windowScale;
135-
io.MousePos.y /= windowScale;
136-
}
137-
io.DisplaySize.x /= windowScale;
138-
io.DisplaySize.y /= windowScale;
120+
io.DisplaySize.x *= windowScale;
121+
io.DisplaySize.y *= windowScale;
139122

140123
io.DisplayFramebufferScale.x = framebufferScale;
141124
io.DisplayFramebufferScale.y = framebufferScale;
@@ -163,7 +146,30 @@ void Application::Frame()
163146
// Rendering
164147
m_Renderer->Clear(ImColor(32, 32, 32, 255));
165148
ImGui::Render();
166-
m_Renderer->RenderDrawData(ImGui::GetDrawData());
149+
150+
// Manually scale the draw data, because ImGui backends are not yet
151+
// consistent in handling FramebufferScale
152+
auto drawData = ImGui::GetDrawData();
153+
154+
drawData->DisplaySize.x *= framebufferScale;
155+
drawData->DisplaySize.y *= framebufferScale;
156+
157+
for (int i = 0; i < drawData->CmdListsCount; i++)
158+
{
159+
auto& cmdList = drawData->CmdLists[i];
160+
for (auto& vtx : cmdList->VtxBuffer)
161+
{
162+
vtx.pos.x *= framebufferScale;
163+
vtx.pos.y *= framebufferScale;
164+
}
165+
}
166+
167+
drawData->ScaleClipRects(drawData->FramebufferScale);
168+
169+
drawData->FramebufferScale.x = 1.0f;
170+
drawData->FramebufferScale.y = 1.0f;
171+
172+
m_Renderer->RenderDrawData(drawData);
167173

168174
m_Platform->FinishFrame();
169175
}

0 commit comments

Comments
 (0)