Ios

.gitignore

@@ -2,5 +2,4 @@
 /emscripten/main.js
 /emscripten/main.js.map
 /build
-/xcode
-*.sublime-*
+*.sublime-*

README.md

@@ -1,39 +1,24 @@
-An OpenGL renderer for [Mapbox vector tiles](https://www.mapbox.com/blog/vector-tiles),
-implemented in C++, targeting iOS & OSX.
+iOS
+===
 
-# Build instructions
+1. Make sure you have `xcode/llmr.xcodeproj`, which is a modified version of the OS X CMake-generated version. 
 
-## Mac OS X
+1. Download & unpack Boost into `ios/boost_1_55_0`. 
 
-You may need to install [glfw3](http://www.glfw.org/docs/latest/):
+1. This does some nasty things with exposing `map.transform` and hardcoding the shader preamble, but be not afraid. 
 
-```
-brew install homebrew/versions/glfw3
-```
+1. Open, build, and run on simulator. Does not build for ARM yet. 
 
-```
-mkdir xcode
-cd xcode
-cmake .. -G Xcode
-```
+### Gestures
 
-Then open the xcode project and build.
+ * Pan to move. 
 
+ * Pinch to zoom in or out (currently around map center, not gesture center). 
 
-# Style protobuf
+ * Double-tap to zoom in one level at gesture center. 
 
-We're encoding the styling information as a protocol buffer, according to
-proto/style.proto. The reason for doing so is that we don't have to ship with a
-JSON/yaml parser. To test the conversion script, run
+ * Two-finger single-tap to zoom out one level at gesture center. 
 
-```
-bin/convert-style.js | protoc --decode=style proto/style.proto
-```
+ * Rotate with two fingers to rotate map (currently around map center, not gesture center). 
 
-You should see a nicely formatted hierarchical output of the converted style.
-
-
-# Usage
-
-- Press 'R' to reset the transform
-- Press 'N' to reset north
+ * Long-press to reset north as up. 

include/llmr/map/map.hpp

@@ -47,19 +47,20 @@ class Map {
 
     void toggleDebug();
 
+    void update();
+
 private:
     bool findLoadedChildren(const Tile::ID& id, int32_t maxCoveringZoom, std::forward_list<Tile::ID>& retain);
     bool findLoadedParent(const Tile::ID& id, int32_t minCoveringZoom, std::forward_list<Tile::ID>& retain);
     void updateTiles();
     Tile::Ptr addTile(const Tile::ID& id);
     Tile::Ptr hasTile(const Tile::ID& id);
 
-
-    void update();
-
-private:
+public:
     Settings& settings;
     Transform transform;
+
+private:
     Style style;
     Painter painter;
 

ios/MBXAppDelegate.h

@@ -0,0 +1,15 @@
+//
+//  MBXAppDelegate.h
+//  ios
+//
+//  Created by Justin R. Miller on 1/27/14.
+//
+//
+
+#import <UIKit/UIKit.h>
+
+@interface MBXAppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@end

ios/MBXAppDelegate.m

@@ -0,0 +1,24 @@
+//
+//  MBXAppDelegate.m
+//  ios
+//
+//  Created by Justin R. Miller on 1/27/14.
+//
+//
+
+#import "MBXAppDelegate.h"
+
+#import "MBXViewController.h"
+
+@implementation MBXAppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+    self.window.rootViewController = [MBXViewController new];
+    [self.window makeKeyAndVisible];
+
+    return YES;
+}
+
+@end

ios/MBXSettings.h

@@ -0,0 +1,21 @@
+//
+//  MBXSettings.hpp
+//  llmr
+//
+//  Created by Justin R. Miller on 1/27/14.
+//
+//
+
+#import <llmr/map/settings.hpp>
+
+namespace llmr
+{
+    class Settings_iOS : public Settings
+    {
+        public:
+            Settings_iOS();
+            virtual void save();
+            virtual void load();
+            virtual void clear();
+    };
+}

ios/MBXSettings.mm

@@ -0,0 +1,68 @@
+//
+//  MBXSettings.cpp
+//  llmr
+//
+//  Created by Justin R. Miller on 1/27/14.
+//
+//
+
+#import "MBXSettings.h"
+
+#import <Foundation/Foundation.h>
+
+using namespace llmr;
+
+Settings_iOS::Settings_iOS() {
+    NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
+
+                                 // position
+                                 [NSNumber numberWithDouble:longitude], @"longitude",
+                                 [NSNumber numberWithDouble:latitude], @"latitude",
+                                 [NSNumber numberWithDouble:scale], @"scale",
+                                 [NSNumber numberWithDouble:angle], @"angle",
+
+                                 // debug
+                                 [NSNumber numberWithBool:debug], @"debug",
+
+                                 nil
+                                 ];
+
+    [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults];
+}
+
+void Settings_iOS::load() {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+    // position
+    longitude = [defaults doubleForKey:@"longitude"];
+    latitude = [defaults doubleForKey:@"latitude"];
+    scale = [defaults doubleForKey:@"scale"];
+    angle = [defaults doubleForKey:@"angle"];
+
+    // debug
+    debug = [defaults boolForKey:@"debug"];
+}
+
+void Settings_iOS::save() {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+    NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
+
+                                 // position
+                                 [NSNumber numberWithDouble:longitude], @"longitude",
+                                 [NSNumber numberWithDouble:latitude], @"latitude",
+                                 [NSNumber numberWithDouble:scale], @"scale",
+                                 [NSNumber numberWithDouble:angle], @"angle",
+
+                                 // debug
+                                 [NSNumber numberWithBool:debug], @"debug",
+
+                                 nil
+                                 ];
+//    [defaults setPersistentDomain:appDefaults forName:[[NSBundle mainBundle] bundleIdentifier]];
+
+//    [defaults synchronize];
+}
+
+void Settings_iOS::clear() {
+}

ios/MBXViewController.h

@@ -0,0 +1,14 @@
+//
+//  MBXViewController.h
+//  ios
+//
+//  Created by Justin R. Miller on 1/27/14.
+//
+//
+
+#import <GLKit/GLKit.h>
+#import <UIKit/UIKit.h>
+
+@interface MBXViewController : GLKViewController
+
+@end