From 91953860f7614950d9eb68755b9f40e0adf6bda2 Mon Sep 17 00:00:00 2001 From: Rene Christen Date: Wed, 1 Nov 2017 11:42:46 +1100 Subject: [PATCH 1/4] Compiling/Displaying on RPI again --- src/CinderImGui.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CinderImGui.cpp b/src/CinderImGui.cpp index 68b665b..56a7f5d 100644 --- a/src/CinderImGui.cpp +++ b/src/CinderImGui.cpp @@ -391,7 +391,7 @@ void Renderer::render( ImDrawData* draw_data ) int needed_vtx_size = cmd_list->VtxBuffer.size() * sizeof(ImDrawVert); if ( vbo->getSize() < needed_vtx_size) { GLsizeiptr size = needed_vtx_size + 2000 * sizeof(ImDrawVert); -#ifndef CINDER_LINUX_EGL_RPI2 +#ifndef CINDER_GL_ES_2_RPI mVbo->bufferData( size, nullptr, GL_STREAM_DRAW ); #else mVbo->bufferData( size, nullptr, GL_DYNAMIC_DRAW ); @@ -411,7 +411,7 @@ void Renderer::render( ImDrawData* draw_data ) int needed_idx_size = cmd_list->IdxBuffer.Size * sizeof(ImDrawIdx); if( mIbo->getSize() < needed_idx_size ) { GLsizeiptr size = needed_idx_size + 2000 * sizeof(ImDrawIdx); -#if ! defined( CINDER_LINUX_EGL_RPI2 ) +#if ! defined( CINDER_GL_ES_2_RPI ) mIbo->bufferData( size, nullptr, GL_STREAM_DRAW ); #else mIbo->bufferData( size, nullptr, GL_DYNAMIC_DRAW ); @@ -427,7 +427,7 @@ void Renderer::render( ImDrawData* draw_data ) mIbo->unmap(); } #else -#if ! defined( CINDER_LINUX_EGL_RPI2 ) +#if ! defined( CINDER_GL_ES_2_RPI ) mVbo->bufferData( (GLsizeiptr)cmd_list->VtxBuffer.Size * sizeof(ImDrawVert), (const GLvoid*)cmd_list->VtxBuffer.Data, GL_STREAM_DRAW ); mIbo->bufferData( (GLsizeiptr)cmd_list->IdxBuffer.Size * sizeof(ImDrawIdx), (const GLvoid*)cmd_list->IdxBuffer.Data, GL_STREAM_DRAW ); #else @@ -490,7 +490,7 @@ gl::VboRef Renderer::getVbo() //! initializes the vbo mesh void Renderer::initBuffers( size_t size ) { - #if ! defined( CINDER_LINUX_EGL_RPI2 ) + #if ! defined( CINDER_GL_ES_2_RPI ) mVbo = gl::Vbo::create( GL_ARRAY_BUFFER, size, nullptr, GL_STREAM_DRAW ); mIbo = gl::Vbo::create( GL_ELEMENT_ARRAY_BUFFER, 10, nullptr, GL_STREAM_DRAW ); #else @@ -534,7 +534,7 @@ ImFont* Renderer::addFont( const ci::fs::path &font, float size, const ImWchar* ImFontAtlas* fontAtlas = ImGui::GetIO().Fonts; auto fontSource = loadFile( font ); - Font ciFont( fontSource, size ); + ci::Font ciFont( fontSource, size ); ImWchar* glyphRanges = NULL; // if we have glyph ranges copy them @@ -561,7 +561,7 @@ ImFont* Renderer::addFont( const ci::fs::path &font, float size, const ImWchar* // find glyph ranges mFontsGlyphRanges.push_back( vector() ); auto &ranges = mFontsGlyphRanges.back(); - Font::Glyph start = glyphs[0] == 0 ? '0' : glyphs[0]; + ci::Font::Glyph start = glyphs[0] == 0 ? '0' : glyphs[0]; for( size_t i = 1; i < numGlyphs; ++i ) { if( glyphs[i] != glyphs[i-1] + 1 ) { ranges.push_back( start ); From f050a00e13094a3de1d72f227a86057fd3038d86 Mon Sep 17 00:00:00 2001 From: Rene Christen Date: Wed, 1 Nov 2017 11:48:04 +1100 Subject: [PATCH 2/4] Update sample project to use block cmake file --- samples/Basic/linux/CMakeLists.txt | 47 ------------------------- samples/Basic/linux/cibuild | 2 -- samples/Basic/proj/cmake/CMakeLists.txt | 17 +++++++++ 3 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 samples/Basic/linux/CMakeLists.txt delete mode 100755 samples/Basic/linux/cibuild create mode 100644 samples/Basic/proj/cmake/CMakeLists.txt diff --git a/samples/Basic/linux/CMakeLists.txt b/samples/Basic/linux/CMakeLists.txt deleted file mode 100644 index 3db04b9..0000000 --- a/samples/Basic/linux/CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ -# Basic -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 ) - -project( Basic ) - -get_filename_component( SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../src" ABSOLUTE ) -get_filename_component( INC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../include" ABSOLUTE ) - -if( NOT TARGET cinder${CINDER_LIB_SUFFIX} ) - find_package( cinder REQUIRED - #PATHS ${PROJECT_SOURCE_DIR}/../../../linux/${CMAKE_BUILD_TYPE}/${CINDER_OUT_DIR_PREFIX} - PATHS ${CINDER_DIR}/linux/${CMAKE_BUILD_TYPE}/${CINDER_OUT_DIR_PREFIX} - $ENV{Cinder_DIR}/linux/${CMAKE_BUILD_TYPE}/${CINDER_OUT_DIR_PREFIX} - ) -endif() - -# Use PROJECT_NAME since CMAKE_PROJET_NAME returns the top-level project name. -set( EXE_NAME ${PROJECT_NAME} ) - - -file(GLOB SRC_FILES_GLOB - ${SRC_DIR}/* - ${CINDER_DIR}/blocks/Cinder-ImGui/src/* - ${CINDER_DIR}/blocks/Cinder-ImGui/lib/imgui/* -) - -set( SRC_FILES - ${SRC_FILES_GLOB} -) - -add_executable( "${EXE_NAME}" ${SRC_FILES} ) - -target_include_directories( - "${EXE_NAME}" - PUBLIC ${INC_DIR} - ${CINDER_DIR}/blocks/Cinder-ImGui/include - ${CINDER_DIR}/blocks/Cinder-ImGui/lib/imgui - -) - - -target_link_libraries( "${EXE_NAME}" cinder${CINDER_LIB_SUFFIX} ) - diff --git a/samples/Basic/linux/cibuild b/samples/Basic/linux/cibuild deleted file mode 100755 index 6d05b3c..0000000 --- a/samples/Basic/linux/cibuild +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -../../../../../tools/linux/cibuilder -app "$@" diff --git a/samples/Basic/proj/cmake/CMakeLists.txt b/samples/Basic/proj/cmake/CMakeLists.txt new file mode 100644 index 0000000..d6c49db --- /dev/null +++ b/samples/Basic/proj/cmake/CMakeLists.txt @@ -0,0 +1,17 @@ + +cmake_minimum_required( VERSION 2.8 FATAL_ERROR ) +set( CMAKE_VERBOSE_MAKEFILE ON ) + +project( BasicApp ) + +get_filename_component( CINDER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.." ABSOLUTE ) +get_filename_component( APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../" ABSOLUTE ) + +include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) + +ci_make_app( + SOURCES ${CINDER_PATH}/blocks/Cinder-ImGui/lib/imgui/imgui_demo.cpp + SOURCES ${APP_PATH}/src/BasicApp.cpp + CINDER_PATH ${CINDER_PATH} + BLOCKS Cinder-ImGui +) \ No newline at end of file From 59d8385f051f8001df357b6916a8716ffc9166df Mon Sep 17 00:00:00 2001 From: Rene Christen Date: Wed, 1 Nov 2017 11:49:52 +1100 Subject: [PATCH 3/4] Update name in cinderblock so tinderbox projects work with cmake --- cinderblock.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinderblock.xml b/cinderblock.xml index f98b51d..ce4be41 100644 --- a/cinderblock.xml +++ b/cinderblock.xml @@ -1,7 +1,7 @@ Date: Thu, 14 Dec 2017 13:05:59 +1100 Subject: [PATCH 4/4] shader version fixes for es3 odroid --- src/CinderImGui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CinderImGui.cpp b/src/CinderImGui.cpp index 56a7f5d..e420fb2 100644 --- a/src/CinderImGui.cpp +++ b/src/CinderImGui.cpp @@ -638,7 +638,7 @@ void Renderer::initGlslProg() } )" #elif defined(CINDER_GL_ES_3) R"( - #version 300 es + //#version 300 es // CoC: causes crash on Odroid (14/12/17) precision highp float; uniform mat4 uModelViewProjection; @@ -686,7 +686,7 @@ void Renderer::initGlslProg() } )" #elif defined(CINDER_GL_ES_3) R"( - #version 300 es + //#version 300 es // CoC: causes crash on Odroid (14/12/17) precision highp float; in highp vec2 vUv;