omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add mutex to App::update, move custom app-glue to git submodule

Browse Source
This commit is contained in:
omigamedev
2019-01-30 23:40:15 +01:00
parent c55ed36f2c
commit ff633eb2c8
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -49,3 +49,6 @@
[submodule "libs/hash-library"] [submodule "libs/hash-library"]
path = libs/hash-library path = libs/hash-library
url = https://github.com/stbrumme/hash-library url = https://github.com/stbrumme/hash-library
[submodule "libs/native_app_glue"]
path = libs/native_app_glue
url = https://bitbucket.org/omigamedev/native_app_glue.git

6
android/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.4.1)
# build native_app_glue as a static lib # build native_app_glue as a static lib
add_library( add_library(
app-glue STATIC app-glue STATIC
${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c ../libs/native_app_glue/android_native_app_glue.c
) )
# Specifies a library name, specifies whether the library is STATIC or # Specifies a library name, specifies whether the library is STATIC or
@@ -94,7 +94,6 @@ add_library(
) )
target_include_directories(native-lib PRIVATE target_include_directories(native-lib PRIVATE
${ANDROID_NDK}/sources/android/native_app_glue
src/main/cpp src/main/cpp
../src ../src
../libs/glm ../libs/glm
@@ -106,7 +105,8 @@ target_include_directories(native-lib PRIVATE
../libs/poly2tri/poly2tri ../libs/poly2tri/poly2tri
../libs/base64 ../libs/base64
../libs/sqlite3 ../libs/sqlite3
../libs/nanort ../libs/nanort
../libs/native_app_glue
) )
# add lib dependencies # add lib dependencies

1
libs/native_app_glue Submodule

Submodule libs/native_app_glue added at a8f8dba9ee

27
src/app.cpp
View File

@@ -443,7 +443,11 @@ void App::async_end()
void App::update(float dt) void App::update(float dt)
{ {
static std::mutex mutex;
static float rec_timer = 0.f; static float rec_timer = 0.f;
// avoid multiple threads to update the scene
std::lock_guard<std::mutex> lock(mutex);
static std::mutex m; static std::mutex m;
std::lock_guard<std::mutex> _lock(m); std::lock_guard<std::mutex> _lock(m);
@@ -511,16 +515,19 @@ void App::update(float dt)
} }
return false; return false;
}; };
/*
uirtt.bindFramebuffer(); if (vr_active)
uirtt.clear(); {
glEnable(GL_SCISSOR_TEST); uirtt.bindFramebuffer();
for (int i = 1; i < layout[main_id]->m_children.size(); i++) uirtt.clear();
layout[main_id]->m_children[i]->watch(observer); glEnable(GL_SCISSOR_TEST);
//msgbox->watch(observer); for (int i = 1; i < layout[main_id]->m_children.size(); i++)
glDisable(GL_SCISSOR_TEST); layout[main_id]->m_children[i]->watch(observer);
uirtt.unbindFramebuffer(); //msgbox->watch(observer);
*/ glDisable(GL_SCISSOR_TEST);
uirtt.unbindFramebuffer();
}
#if __IOS__ #if __IOS__
[ios_view->glview bindDrawable]; [ios_view->glview bindDrawable];
#else #else

2
src/app_cloud.cpp
View File

@@ -53,7 +53,7 @@ void App::cloud_upload()
auto m = layout[main_id]->add_child<NodeMessageBox>(); auto m = layout[main_id]->add_child<NodeMessageBox>();
m->m_title->set_text("Publish document"); m->m_title->set_text("Publish document");
m->m_message->set_text("Would you like to upload this document to the public domain?"); m->m_message->set_text("Would you like to upload to the public domain?");
m->btn_ok->m_text->set_text("Yes"); m->btn_ok->m_text->set_text("Yes");
m->btn_cancel->m_text->set_text("No"); m->btn_cancel->m_text->set_text("No");
m->btn_ok->on_click = [this, m, upload_thread](Node*) { m->btn_ok->on_click = [this, m, upload_thread](Node*) {