From f1f21255c16821854590263fcc06fc566a6edaaa Mon Sep 17 00:00:00 2001 From: Samuel Luescher Date: Thu, 28 Mar 2013 01:29:22 -0400 Subject: [PATCH] Fixed QCAR --- .../project.pbxproj | 36 ++++++++++++++----- iOS/ofxiphone-Info.plist | 4 +++ src/mainApp.h | 8 +++-- src/mainApp.mm | 12 +++++-- 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/iOS/GeoSenseReliefClientiOS.xcodeproj/project.pbxproj b/iOS/GeoSenseReliefClientiOS.xcodeproj/project.pbxproj index 69d6212..5b4a077 100644 --- a/iOS/GeoSenseReliefClientiOS.xcodeproj/project.pbxproj +++ b/iOS/GeoSenseReliefClientiOS.xcodeproj/project.pbxproj @@ -15,6 +15,9 @@ 2206932816E695500033720A /* GeoSenseIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2206932716E695500033720A /* GeoSenseIcon@2x.png */; }; 2206932A16E696590033720A /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 2206932916E696590033720A /* Default-Portrait~ipad.png */; }; 2206932C16E6965E0033720A /* Default-Portrait@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 2206932B16E6965E0033720A /* Default-Portrait@2x~ipad.png */; }; + 2212DFEC170406A600F473AA /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2212DFEB170406A600F473AA /* CoreMotion.framework */; }; + 22320F101703BA120029872F /* MouseController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22320F0C1703BA120029872F /* MouseController.cpp */; }; + 22320F111703BA120029872F /* SceneController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22320F0E1703BA120029872F /* SceneController.cpp */; }; 223CDEBE16F15216003560A6 /* MapFeatureLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 223CDEBD16F15216003560A6 /* MapFeatureLayer.cpp */; }; 226023E916066EA40082606C /* ofPinchGestureRecognizer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 226023E216066EA40082606C /* ofPinchGestureRecognizer.mm */; }; 226023EA16066EA40082606C /* ofSwipeGestureRecognizer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 226023E416066EA40082606C /* ofSwipeGestureRecognizer.mm */; }; @@ -51,7 +54,6 @@ 2283735516E683590082FF64 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2283735016E683590082FF64 /* ofxXmlSettings.cpp */; }; 22FC30B016E68B360017D8A1 /* mainApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = 22FC30A816E68B360017D8A1 /* mainApp.mm */; }; 22FC30B116E68B360017D8A1 /* MapFeature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22FC30A916E68B360017D8A1 /* MapFeature.cpp */; }; - 22FC30B216E68B360017D8A1 /* MouseController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22FC30AB16E68B360017D8A1 /* MouseController.cpp */; }; 22FC30B316E68B360017D8A1 /* ReliefClientBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22FC30AD16E68B360017D8A1 /* ReliefClientBase.cpp */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; 5326AEA810A23A0500278DE6 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5326AEA710A23A0500278DE6 /* CoreLocation.framework */; }; @@ -98,6 +100,11 @@ 2206932716E695500033720A /* GeoSenseIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "GeoSenseIcon@2x.png"; path = "../../GeoSenseIcon@2x.png"; sourceTree = ""; }; 2206932916E696590033720A /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait~ipad.png"; sourceTree = ""; }; 2206932B16E6965E0033720A /* Default-Portrait@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait@2x~ipad.png"; sourceTree = ""; }; + 2212DFEB170406A600F473AA /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; }; + 22320F0C1703BA120029872F /* MouseController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MouseController.cpp; path = ../../src/MouseController.cpp; sourceTree = ""; }; + 22320F0D1703BA120029872F /* MouseController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MouseController.h; path = ../../src/MouseController.h; sourceTree = ""; }; + 22320F0E1703BA120029872F /* SceneController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SceneController.cpp; path = ../../src/SceneController.cpp; sourceTree = ""; }; + 22320F0F1703BA120029872F /* SceneController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SceneController.h; path = ../../src/SceneController.h; sourceTree = ""; }; 223CDEB916F151FC003560A6 /* GeoJSONMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeoJSONMesh.h; path = ../../src/GeoJSONMesh.h; sourceTree = ""; }; 223CDEBB16F151FC003560A6 /* MapFeatureLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapFeatureLayer.h; path = ../../src/MapFeatureLayer.h; sourceTree = ""; }; 223CDEBD16F15216003560A6 /* MapFeatureLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MapFeatureLayer.cpp; path = ../../src/MapFeatureLayer.cpp; sourceTree = ""; }; @@ -250,11 +257,8 @@ 22FC30A816E68B360017D8A1 /* mainApp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mainApp.mm; path = ../../src/mainApp.mm; sourceTree = ""; }; 22FC30A916E68B360017D8A1 /* MapFeature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MapFeature.cpp; path = ../../src/MapFeature.cpp; sourceTree = ""; }; 22FC30AA16E68B360017D8A1 /* MapFeature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapFeature.h; path = ../../src/MapFeature.h; sourceTree = ""; }; - 22FC30AB16E68B360017D8A1 /* MouseController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MouseController.cpp; path = ../../src/MouseController.cpp; sourceTree = ""; }; - 22FC30AC16E68B360017D8A1 /* MouseController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MouseController.h; path = ../../src/MouseController.h; sourceTree = ""; }; 22FC30AD16E68B360017D8A1 /* ReliefClientBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ReliefClientBase.cpp; path = ../../src/ReliefClientBase.cpp; sourceTree = ""; }; 22FC30AE16E68B360017D8A1 /* ReliefClientBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ReliefClientBase.h; path = ../../src/ReliefClientBase.h; sourceTree = ""; }; - 22FC30AF16E68B360017D8A1 /* SceneController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SceneController.h; path = ../../src/SceneController.h; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 32CA4F630368D1EE00C91783 /* iPhone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iPhone_Prefix.pch; sourceTree = ""; }; 5326AEA710A23A0500278DE6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; @@ -279,6 +283,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 2212DFEC170406A600F473AA /* CoreMotion.framework in Frameworks */, E41D421413B3A95300A75A5D /* libofxiPhone_iphoneos_Debug.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, @@ -310,6 +315,17 @@ name = Products; sourceTree = ""; }; + 22320F0B1703B9F40029872F /* Controllers */ = { + isa = PBXGroup; + children = ( + 22320F0C1703BA120029872F /* MouseController.cpp */, + 22320F0D1703BA120029872F /* MouseController.h */, + 22320F0E1703BA120029872F /* SceneController.cpp */, + 22320F0F1703BA120029872F /* SceneController.h */, + ); + name = Controllers; + sourceTree = ""; + }; 226023DF16066EA40082606C /* gestures */ = { isa = PBXGroup; children = ( @@ -715,6 +731,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 2212DFEB170406A600F473AA /* CoreMotion.framework */, 2206932B16E6965E0033720A /* Default-Portrait@2x~ipad.png */, 2206932916E696590033720A /* Default-Portrait~ipad.png */, E4D8936A11527B74007E1F53 /* src */, @@ -811,6 +828,7 @@ E4D8936A11527B74007E1F53 /* src */ = { isa = PBXGroup; children = ( + 22320F0B1703B9F40029872F /* Controllers */, 223CDEB916F151FC003560A6 /* GeoJSONMesh.h */, 223CDEBD16F15216003560A6 /* MapFeatureLayer.cpp */, 223CDEBB16F151FC003560A6 /* MapFeatureLayer.h */, @@ -820,11 +838,8 @@ 22FC30A816E68B360017D8A1 /* mainApp.mm */, 22FC30A916E68B360017D8A1 /* MapFeature.cpp */, 22FC30AA16E68B360017D8A1 /* MapFeature.h */, - 22FC30AB16E68B360017D8A1 /* MouseController.cpp */, - 22FC30AC16E68B360017D8A1 /* MouseController.h */, 22FC30AD16E68B360017D8A1 /* ReliefClientBase.cpp */, 22FC30AE16E68B360017D8A1 /* ReliefClientBase.h */, - 22FC30AF16E68B360017D8A1 /* SceneController.h */, 226023DF16066EA40082606C /* gestures */, E4D8936B11527B74007E1F53 /* main.mm */, ); @@ -966,9 +981,10 @@ 2283735516E683590082FF64 /* ofxXmlSettings.cpp in Sources */, 22FC30B016E68B360017D8A1 /* mainApp.mm in Sources */, 22FC30B116E68B360017D8A1 /* MapFeature.cpp in Sources */, - 22FC30B216E68B360017D8A1 /* MouseController.cpp in Sources */, 22FC30B316E68B360017D8A1 /* ReliefClientBase.cpp in Sources */, 223CDEBE16F15216003560A6 /* MapFeatureLayer.cpp in Sources */, + 22320F101703BA120029872F /* MouseController.cpp in Sources */, + 22320F111703BA120029872F /* SceneController.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1012,6 +1028,8 @@ "$(inherited)", ../../../addons/ofxQCAR/libs/qcar/lib/arm, "\"$(SRCROOT)/../../../addons/ofxQCAR/libs/qcar/lib/arm\"", + "\"$(SRCROOT)/../../../addons/ofxOpenCv/libs/opencv/lib/ios\"", + "\"$(SRCROOT)/../../../addons/ofxOpenCv/libs/opencv/lib/osx\"", ); ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = GeoSenseReliefClientiOS; @@ -1050,6 +1068,8 @@ "$(inherited)", ../../../addons/ofxQCAR/libs/qcar/lib/arm, "\"$(SRCROOT)/../../../addons/ofxQCAR/libs/qcar/lib/arm\"", + "\"$(SRCROOT)/../../../addons/ofxOpenCv/libs/opencv/lib/ios\"", + "\"$(SRCROOT)/../../../addons/ofxOpenCv/libs/opencv/lib/osx\"", ); ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = GeoSenseReliefClientiOS; diff --git a/iOS/ofxiphone-Info.plist b/iOS/ofxiphone-Info.plist index fa4c6e1..6762915 100644 --- a/iOS/ofxiphone-Info.plist +++ b/iOS/ofxiphone-Info.plist @@ -50,5 +50,9 @@ UIInterfaceOrientationPortrait UIStatusBarHidden + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + diff --git a/src/mainApp.h b/src/mainApp.h index 971ae2d..3d65661 100755 --- a/src/mainApp.h +++ b/src/mainApp.h @@ -10,11 +10,12 @@ #include "ofxiPhone.h" #include "ofxiPhoneExtras.h" #include "ofPinchGestureRecognizer.h" -#define USE_ARTK true +#define USE_ARTK false #define USE_QCAR !(USE_ARTK) #else #define USE_QCAR false #define USE_ARTK true +#include "KeyboardController.h" #endif #if (USE_ARTK) @@ -22,7 +23,6 @@ #endif #include "MouseController.h" -#include "KeyboardController.h" #include "MapFeature.h" #include "MapFeatureLayer.h" #include "ofxJSONElement.h" @@ -77,7 +77,11 @@ class mainApp : public ReliefClientBase{ void setCalibrationMode(bool state); MouseController mouseController; + + #if !(TARGET_OS_IPHONE) KeyboardController keyboardController; + #endif + void onPan(const void* sender, ofVec3f & distance); void onZoom(const void* sender, float & factor); void onViewpointChange(const void* sender, ofNode & viewpoint); diff --git a/src/mainApp.mm b/src/mainApp.mm index f2da32d..5e15550 100755 --- a/src/mainApp.mm +++ b/src/mainApp.mm @@ -223,7 +223,10 @@ #endif mouseController.registerEvents(this); + + #if !(TARGET_OS_IPHONE) keyboardController.registerEvents(this); + #endif cursorNotMovedSince = 0; } @@ -359,9 +362,12 @@ void mainApp::update() { + reliefUpdate(); mouseController.update(); + + #if !(TARGET_OS_IPHONE) keyboardController.update(); - reliefUpdate(); + #endif #if (USE_QCAR) ofxQCAR::getInstance()->update(); @@ -476,7 +482,7 @@ cam.begin(); #endif - /* ofPushMatrix(); + ofPushMatrix(); #if (!USE_QCAR) if (cam.getOrtho()) { @@ -563,7 +569,7 @@ drawReliefFrame(); #endif - ofPopMatrix();*/ + ofPopMatrix(); ofPopView();