From e30ac277c1b1a8724ea5eaa7e7db8d9a86436c77 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Sat, 19 Oct 2019 23:44:55 +0200 Subject: [PATCH] update Xcode project --- PanoPainter.xcodeproj/project.pbxproj | 8 ++++++++ PanoPainter/GameViewController.m | 4 ++-- src/app.cpp | 2 +- src/canvas_layer.cpp | 8 ++++++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/PanoPainter.xcodeproj/project.pbxproj b/PanoPainter.xcodeproj/project.pbxproj index 7aea083..cb548de 100644 --- a/PanoPainter.xcodeproj/project.pbxproj +++ b/PanoPainter.xcodeproj/project.pbxproj @@ -254,6 +254,8 @@ ADE4911F1F86E65E00FB8E92 /* sweep.cc in Sources */ = {isa = PBXBuildFile; fileRef = ADE491131F86D09100FB8E92 /* sweep.cc */; }; ADEBA9062069A4F40085AE16 /* objc_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEBA9052069A4F40085AE16 /* objc_utils.cpp */; }; ADEBA9092069A50E0085AE16 /* objc_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEBA9082069A50E0085AE16 /* objc_utils.cpp */; }; + ADEF1F19235BB2E90043D5C4 /* node_panel_animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEF1F17235BB2E90043D5C4 /* node_panel_animation.cpp */; }; + ADEF1F1A235BB2F30043D5C4 /* node_panel_animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADEF1F17235BB2E90043D5C4 /* node_panel_animation.cpp */; }; ADF396DD216F749200024722 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADF396DB216F6BD800024722 /* AppKit.framework */; }; ADF396DF216FA6C900024722 /* pp-icon-square.png in Resources */ = {isa = PBXBuildFile; fileRef = ADF396DE216FA6C700024722 /* pp-icon-square.png */; }; ADF4F7752263920400422C7C /* settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADF4F7742263920400422C7C /* settings.cpp */; }; @@ -573,6 +575,8 @@ ADEBA9052069A4F40085AE16 /* objc_utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = objc_utils.cpp; path = src/objc_utils.cpp; sourceTree = SOURCE_ROOT; }; ADEBA9072069A50E0085AE16 /* objc_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = objc_utils.h; path = src/objc_utils.h; sourceTree = SOURCE_ROOT; }; ADEBA9082069A50E0085AE16 /* objc_utils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = objc_utils.cpp; path = src/objc_utils.cpp; sourceTree = SOURCE_ROOT; }; + ADEF1F17235BB2E90043D5C4 /* node_panel_animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_panel_animation.cpp; sourceTree = ""; }; + ADEF1F18235BB2E90043D5C4 /* node_panel_animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_panel_animation.h; sourceTree = ""; }; ADF396DB216F6BD800024722 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; ADF396DE216FA6C700024722 /* pp-icon-square.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pp-icon-square.png"; path = "extra/pp-icon-square.png"; sourceTree = ""; }; ADF4F7732263920400422C7C /* settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = settings.h; sourceTree = ""; }; @@ -773,6 +777,8 @@ AD83A0D8232A7906005B0871 /* node_input_box.h */, AD1063651EC7ADFA002A525F /* node_message_box.cpp */, AD1063661EC7ADFA002A525F /* node_message_box.h */, + ADEF1F17235BB2E90043D5C4 /* node_panel_animation.cpp */, + ADEF1F18235BB2E90043D5C4 /* node_panel_animation.h */, AD1063671EC7ADFA002A525F /* node_panel_brush.cpp */, AD1063681EC7ADFA002A525F /* node_panel_brush.h */, AD1063691EC7ADFA002A525F /* node_panel_color.cpp */, @@ -1513,6 +1519,7 @@ AD0E5CDB1ECC72AD00C35669 /* font.cpp in Sources */, ADBC8C561FAFD0530094B339 /* app_cloud.cpp in Sources */, AD7FB084223E8A43005913AB /* YGConfig.cpp in Sources */, + ADEF1F1A235BB2F30043D5C4 /* node_panel_animation.cpp in Sources */, AD0E5CDA1ECC72AD00C35669 /* event.cpp in Sources */, ADFD32282166C9A000F46F85 /* node_dialog_resize.cpp in Sources */, AD0E5CCB1ECC72AD00C35669 /* node_scroll.cpp in Sources */, @@ -1671,6 +1678,7 @@ ADD7D2981EBF9E1C00D5A897 /* rtt.cpp in Sources */, AD1063A01EC7AE92002A525F /* node_image.cpp in Sources */, AD10639F1EC7AE92002A525F /* node_image_texture.cpp in Sources */, + ADEF1F19235BB2E90043D5C4 /* node_panel_animation.cpp in Sources */, ADD7D2721EBF9AE300D5A897 /* AppDelegate.m in Sources */, AD1063981EC7AE92002A525F /* node_button_custom.cpp in Sources */, ADBC8C4E1FAE7D360094B339 /* node_dialog_browse.cpp in Sources */, diff --git a/PanoPainter/GameViewController.m b/PanoPainter/GameViewController.m index 74a3225..74712f1 100644 --- a/PanoPainter/GameViewController.m +++ b/PanoPainter/GameViewController.m @@ -65,8 +65,8 @@ std::recursive_mutex lock_mutex; { lock_mutex.lock(); [EAGLContext setCurrentContext:context]; - GameView* view = (GameView*)self.view; - [view bindDrawable]; +// GameView* view = (GameView*)self.view; +// [view bindDrawable]; } - (void)async_unlock { diff --git a/src/app.cpp b/src/app.cpp index 12c06bd..6bc384d 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -562,7 +562,7 @@ bool App::update_ui_observer(Node *n) n->handle_on_screen(false, true); n->m_on_screen = true; } - glm::ivec4 c = glm::vec4(box.x /*- 1*/, (height / zoom - box.y - box.w /*- 1*/), box.z /*+ 2*/, box.w /*+ 2*/) * zoom; + glm::ivec4 c = glm::vec4(box.x - 1, (height / zoom - box.y - box.w - 1), box.z + 2, box.w + 2) * zoom; glScissor(floorf(c.x + off_x), floorf(c.y + off_y), ceilf(c.z), ceilf(c.w)); n->draw(); return true; diff --git a/src/canvas_layer.cpp b/src/canvas_layer.cpp index 84946f6..3e48d24 100644 --- a/src/canvas_layer.cpp +++ b/src/canvas_layer.cpp @@ -366,12 +366,16 @@ LayerFrame& LayerFrame::operator=(LayerFrame&& other) bool LayerFrame::create(int width, int height, int duration /*= 1*/) { + bool success = true; App::I->render_task([&] { for (int i = 0; i < 6; i++) { if (!m_rtt[i].create(width, height)) - return false; + { + success = false; + return; + } m_rtt[i].bindFramebuffer(); m_rtt[i].clear(); m_rtt[i].unbindFramebuffer(); @@ -382,7 +386,7 @@ bool LayerFrame::create(int width, int height, int duration /*= 1*/) m_duration = duration; w = width; h = height; - return true; + return success; } bool LayerFrame::resize(int width, int height)