From 235862c9d1aef6e174e607e81046b5fe6003e918 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Wed, 2 Aug 2017 19:51:59 +0100 Subject: [PATCH] adding color picking on iOS --- PanoPainter/GameViewController.m | 3 + PanoPainter/Info.plist | 2 + data/layout.xml | 1 + engine.xcodeproj/project.pbxproj | 2 +- engine/app.cpp | 17 +++++- engine/app.h | 3 + engine/app_events.cpp | 14 +++++ engine/app_layout.cpp | 10 ++++ engine/canvas.cpp | 97 ++++++++++++++++++++++++++++++++ engine/canvas.h | 5 ++ engine/canvas_modes.cpp | 51 +++++++++++++---- engine/canvas_modes.h | 2 +- engine/pch.h | 10 ++++ 13 files changed, 202 insertions(+), 15 deletions(-) diff --git a/PanoPainter/GameViewController.m b/PanoPainter/GameViewController.m index d66940e..1e5f101 100644 --- a/PanoPainter/GameViewController.m +++ b/PanoPainter/GameViewController.m @@ -157,6 +157,7 @@ int t_count = 0; - (void)viewDidAppear:(BOOL)animated { + App::I.redraw = true; [self resignFirstResponder]; [self registerForKeyboardNotifications]; } @@ -235,6 +236,8 @@ int t_count = 0; - (void)glkView:(GLKView *)view drawInRect:(CGRect)rect { + if (!App::I.redraw) + return; App::I.clear(); App::I.update(0); } diff --git a/PanoPainter/Info.plist b/PanoPainter/Info.plist index 44468d2..90b2ea6 100644 --- a/PanoPainter/Info.plist +++ b/PanoPainter/Info.plist @@ -2,6 +2,8 @@ + NSPhotoLibraryAddUsageDescription + Save the pano image in the user gallery CFBundleDevelopmentRegion en CFBundleExecutable diff --git a/data/layout.xml b/data/layout.xml index 9586553..e36854d 100644 --- a/data/layout.xml +++ b/data/layout.xml @@ -353,6 +353,7 @@