Navigation Menu

Skip to content

Commit

Permalink
Fixed QCAR
Browse files Browse the repository at this point in the history
  • Loading branch information
@samluescher
samluescher committed Mar 28, 2013
1 parent aba0749 commit f1f2125
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 13 deletions.
36 changes: 28 additions & 8 deletions iOS/GeoSenseReliefClientiOS.xcodeproj/project.pbxproj
View file
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 */; };
Expand Down Expand Up @@ -98,6 +100,11 @@
2206932716E695500033720A /* GeoSenseIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "GeoSenseIcon@2x.png"; path = "../../GeoSenseIcon@2x.png"; sourceTree = "<group>"; };
2206932916E696590033720A /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait~ipad.png"; sourceTree = "<group>"; };
2206932B16E6965E0033720A /* Default-Portrait@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait@2x~ipad.png"; sourceTree = "<group>"; };
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 = "<group>"; };
22320F0D1703BA120029872F /* MouseController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MouseController.h; path = ../../src/MouseController.h; sourceTree = "<group>"; };
22320F0E1703BA120029872F /* SceneController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SceneController.cpp; path = ../../src/SceneController.cpp; sourceTree = "<group>"; };
22320F0F1703BA120029872F /* SceneController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SceneController.h; path = ../../src/SceneController.h; sourceTree = "<group>"; };
223CDEB916F151FC003560A6 /* GeoJSONMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeoJSONMesh.h; path = ../../src/GeoJSONMesh.h; sourceTree = "<group>"; };
223CDEBB16F151FC003560A6 /* MapFeatureLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapFeatureLayer.h; path = ../../src/MapFeatureLayer.h; sourceTree = "<group>"; };
223CDEBD16F15216003560A6 /* MapFeatureLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MapFeatureLayer.cpp; path = ../../src/MapFeatureLayer.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -250,11 +257,8 @@
22FC30A816E68B360017D8A1 /* mainApp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mainApp.mm; path = ../../src/mainApp.mm; sourceTree = "<group>"; };
22FC30A916E68B360017D8A1 /* MapFeature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MapFeature.cpp; path = ../../src/MapFeature.cpp; sourceTree = "<group>"; };
22FC30AA16E68B360017D8A1 /* MapFeature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapFeature.h; path = ../../src/MapFeature.h; sourceTree = "<group>"; };
22FC30AB16E68B360017D8A1 /* MouseController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MouseController.cpp; path = ../../src/MouseController.cpp; sourceTree = "<group>"; };
22FC30AC16E68B360017D8A1 /* MouseController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MouseController.h; path = ../../src/MouseController.h; sourceTree = "<group>"; };
22FC30AD16E68B360017D8A1 /* ReliefClientBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ReliefClientBase.cpp; path = ../../src/ReliefClientBase.cpp; sourceTree = "<group>"; };
22FC30AE16E68B360017D8A1 /* ReliefClientBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ReliefClientBase.h; path = ../../src/ReliefClientBase.h; sourceTree = "<group>"; };
22FC30AF16E68B360017D8A1 /* SceneController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SceneController.h; path = ../../src/SceneController.h; sourceTree = "<group>"; };
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 = "<group>"; };
5326AEA710A23A0500278DE6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
Expand All @@ -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 */,
Expand Down Expand Up @@ -310,6 +315,17 @@
name = Products;
sourceTree = "<group>";
};
22320F0B1703B9F40029872F /* Controllers */ = {
isa = PBXGroup;
children = (
22320F0C1703BA120029872F /* MouseController.cpp */,
22320F0D1703BA120029872F /* MouseController.h */,
22320F0E1703BA120029872F /* SceneController.cpp */,
22320F0F1703BA120029872F /* SceneController.h */,
);
name = Controllers;
sourceTree = "<group>";
};
226023DF16066EA40082606C /* gestures */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -811,6 +828,7 @@
E4D8936A11527B74007E1F53 /* src */ = {
isa = PBXGroup;
children = (
22320F0B1703B9F40029872F /* Controllers */,
223CDEB916F151FC003560A6 /* GeoJSONMesh.h */,
223CDEBD16F15216003560A6 /* MapFeatureLayer.cpp */,
223CDEBB16F151FC003560A6 /* MapFeatureLayer.h */,
Expand All @@ -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 */,
);
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions iOS/ofxiphone-Info.plist
View file
Expand Up @@ -50,5 +50,9 @@
<string>UIInterfaceOrientationPortrait</string>
<key>UIStatusBarHidden</key>
<true/>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
</dict>
</plist>
8 changes: 6 additions & 2 deletions src/mainApp.h
View file
Expand Up @@ -10,19 +10,19 @@
#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)
#include "ARTKController.h"
#endif

#include "MouseController.h"
#include "KeyboardController.h"
#include "MapFeature.h"
#include "MapFeatureLayer.h"
#include "ofxJSONElement.h"
Expand Down Expand Up @@ -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);
Expand Down
12 changes: 9 additions & 3 deletions src/mainApp.mm
View file
Expand Up @@ -223,7 +223,10 @@
#endif

mouseController.registerEvents(this);

#if !(TARGET_OS_IPHONE)
keyboardController.registerEvents(this);
#endif

cursorNotMovedSince = 0;
}
Expand Down Expand Up @@ -359,9 +362,12 @@

void mainApp::update()
{
reliefUpdate();
mouseController.update();

#if !(TARGET_OS_IPHONE)
keyboardController.update();
reliefUpdate();
#endif

#if (USE_QCAR)
ofxQCAR::getInstance()->update();
Expand Down Expand Up @@ -476,7 +482,7 @@
cam.begin();
#endif

/* ofPushMatrix();
ofPushMatrix();

#if (!USE_QCAR)
if (cam.getOrtho()) {
Expand Down Expand Up @@ -563,7 +569,7 @@
drawReliefFrame();
#endif

ofPopMatrix();*/
ofPopMatrix();

ofPopView();

Expand Down

0 comments on commit f1f2125

Please sign in to comment.