Skip to content
This repository was archived by the owner on Apr 22, 2020. It is now read-only.

Fix CJK glyph ranges problem, and some minor fixes #55

Open
origamidance wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Fix CJK glyph ranges problem, and some minor fixes #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d9628a7
added cmake
origamidance Jun 1, 2017
771e214
Merge branch 'master' of https://gitlab.com/origamidance/StringFab
origamidance Jun 1, 2017
36e7865
Merge remote-tracking branch 'upstream/master'
origamidance Jun 5, 2017
e5b9e79
merge upstream
origamidance Jun 5, 2017
35e0894
remove warning
origamidance Jun 5, 2017
eb3b4e1
update imgui
origamidance Aug 27, 2017
d561686
merge upsteram
origamidance Oct 2, 2017
ea41c29
Merge remote-tracking branch 'upstream/master'
origamidance Oct 5, 2017
3d46368
local changes
origamidance Oct 23, 2017
e5c5535
Merge remote-tracking branch 'upstream/master'
origamidance Oct 23, 2017
524a739
merge upstream
origamidance Oct 23, 2017
400e7c5
fix id
origamidance Oct 23, 2017
8903ee4
fix id
origamidance Oct 23, 2017
17bd6a5
merge upstream
origamidance Dec 5, 2017
2c6d35d
updated sumodule
origamidance Dec 5, 2017
b01c6d5
revert and fix glyph problem
origamidance Dec 21, 2017
678ab11
Merge remote-tracking branch 'upstream/master'
origamidance Jan 11, 2018
fd1e0d3
added clipboard submodule
origamidance Feb 15, 2018
e772c0e
recover cmake
origamidance Feb 27, 2018
167f76a
merge
origamidance Mar 6, 2018
ebb5119
update submodule
origamidance Mar 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "lib/imgui"]
path = lib/imgui
url = https://github.com/ocornut/imgui.git
[submodule "lib/clipboard_lite"]
path = lib/clipboard_lite
url = https://github.com/smasherprog/clipboard_lite
10 changes: 5 additions & 5 deletions include/CinderImGui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,10 @@ namespace ImGui {
bool DragInt3(const char* label, T *object, ci::ivec3( T::*get )() const, void( T::*set )( const ci::ivec3& ), float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* display_format = "%.0f" );
template<typename T>
bool DragInt4(const char* label, T *object, ci::ivec4( T::*get )() const, void( T::*set )( const ci::ivec4& ), float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* display_format = "%.0f" );
template<typename T>
bool ColorPicker3( const char* label, T *object, ci::Color( T::*get )() const, void( T::*set )( const ci::Color& ) );
template<typename T>
bool ColorPicker4( const char* label, T *object, ci::ColorA( T::*get )() const, void( T::*set )( const ci::ColorA& ) );
// template<typename T>
// bool ColorPicker3( const char* label, T *object, ci::Color( T::*get )() const, void( T::*set )( const ci::Color& ) );
// template<typename T>
// bool ColorPicker4( const char* label, T *object, ci::ColorA( T::*get )() const, void( T::*set )( const ci::ColorA& ) );

// Scoped objects goodness (push the state when created and pop it when destroyed)

Expand Down Expand Up @@ -411,4 +411,4 @@ namespace ImGui {
}
return false;
}
}
}
1 change: 1 addition & 0 deletions lib/clipboard_lite
Open in desktop
Submodule clipboard_lite added at 5b26bb
2 changes: 1 addition & 1 deletion lib/imgui
Open in desktop
Submodule imgui updated 16 files
+6 −0 CHANGELOG.txt
+3 −4 README.md
+1 −1 examples/directx10_example/imgui_impl_dx10.cpp
+1 −1 examples/directx11_example/imgui_impl_dx11.cpp
+1 −1 examples/directx12_example/imgui_impl_dx12.cpp
+1 −1 examples/directx9_example/imgui_impl_dx9.cpp
+2 −2 examples/opengl2_example/imgui_impl_glfw_gl2.cpp
+2 −2 examples/opengl3_example/imgui_impl_glfw_gl3.cpp
+2 −2 examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
+2 −2 examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
+2 −2 examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
+111 −87 imgui.cpp
+30 −9 imgui.h
+9 −3 imgui_demo.cpp
+4 −4 imgui_draw.cpp
+3 −13 imgui_internal.h
51 changes: 27 additions & 24 deletions proj/cmake/Cinder-ImGuiConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
if( NOT TARGET Cinder-ImGui )
get_filename_component( IMGUI_ROOT_PATH "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE )
if (NOT TARGET Cinder-ImGui)
get_filename_component(IMGUI_ROOT_PATH "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
list(APPEND IMGUI_SOURCES
${IMGUI_ROOT_PATH}/src/CinderImGui.cpp
${IMGUI_ROOT_PATH}/lib/imgui/imgui.cpp
${IMGUI_ROOT_PATH}/lib/imgui/imgui_draw.cpp
${IMGUI_ROOT_PATH}/lib/imgui/imgui_demo.cpp
)
add_library(Cinder-ImGui
${IMGUI_SOURCES}
)

list( APPEND IMGUI_SOURCES
${IMGUI_ROOT_PATH}/src/CinderImGui.cpp
${IMGUI_ROOT_PATH}/lib/imgui/imgui.cpp
${IMGUI_ROOT_PATH}/lib/imgui/imgui_draw.cpp
)
list(APPEND IMGUI_INCLUDE_DIRS
${IMGUI_ROOT_PATH}/include
${IMGUI_ROOT_PATH}/lib/imgui
)

add_library( Cinder-ImGui ${IMGUI_SOURCES} )
target_include_directories(Cinder-ImGui PUBLIC
${IMGUI_INCLUDE_DIRS}
)

list( APPEND IMGUI_INCLUDE_DIRS
${IMGUI_ROOT_PATH}/include
${IMGUI_ROOT_PATH}/lib/imgui
)

target_include_directories( Cinder-ImGui PUBLIC "${IMGUI_INCLUDE_DIRS}" )
if (NOT TARGET cinder)
include("${CINDER_PATH}/proj/cmake/configure.cmake")
find_package(cinder REQUIRED PATHS
"${CINDER_PATH}/${CINDER_LIB_DIRECTORY}"
"$ENV{CINDER_PATH}/${CINDER_LIB_DIRECTORY}")
endif ()

if( NOT TARGET cinder )
include( "${CINDER_PATH}/proj/cmake/configure.cmake" )
find_package( cinder REQUIRED PATHS
"${CINDER_PATH}/${CINDER_LIB_DIRECTORY}"
"$ENV{CINDER_PATH}/${CINDER_LIB_DIRECTORY}" )
endif()

target_link_libraries( Cinder-ImGui PRIVATE cinder )

endif()
target_link_libraries(Cinder-ImGui PRIVATE cinder)

endif ()
4 changes: 2 additions & 2 deletions samples/Basic/linux/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
cmake_minimum_required( VERSION 2.8 FATAL_ERROR )
set( CMAKE_VERBOSE_MAKEFILE on )

get_filename_component( CINDER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../.." ABSOLUTE )
include( ${CINDER_DIR}/linux/cmake/Cinder.cmake )
get_filename_component( CINDER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../Cinder" ABSOLUTE )
include( ${CINDER_DIR}/proj/cmake/Cinder.cmake )

project( Basic )

Expand Down
2 changes: 1 addition & 1 deletion src/CinderImGui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,8 +546,8 @@ ImFont* Renderer::addFont( const ci::fs::path &font, float size, const ImWchar*
for( const ImWchar* range = glyph_ranges; range[0] && range[1]; range += 2 ) {
ranges.push_back( range[0] );
ranges.push_back( range[1] );
ranges.push_back( 0 );
}
ranges.push_back( 0 );
glyphRanges = ranges.data();
}
// otherwise get them from the font
Expand Down