Adds dependencies on moggle and box2d

BoxCar2D.xcodeproj/project.pbxproj

@@ -11,7 +11,7 @@
 		4280D42D18E831D200E4CDFB /* Fractal-iOS.vsh in Resources */ = {isa = PBXBuildFile; fileRef = 4280D42918E831A900E4CDFB /* Fractal-iOS.vsh */; };
 		4280D42F18E831D200E4CDFB /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4280D41C18E8311400E4CDFB /* Main_iPad.storyboard */; };
 		4280D43018E831D200E4CDFB /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4280D41D18E8311400E4CDFB /* Main_iPhone.storyboard */; };
-		4280D43118E8321100E4CDFB /* Game.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2DF18CB68A400A58D8F /* Game.m */; };
+		4280D43118E8321100E4CDFB /* Game.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2DF18CB68A400A58D8F /* Game.mm */; };
 		4280D43218E8321100E4CDFB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4280D41E18E8311400E4CDFB /* main.m */; };
 		4280D43318E8321100E4CDFB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4280D41A18E8311400E4CDFB /* AppDelegate.m */; };
 		4280D43418E8321100E4CDFB /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4280D42018E8311400E4CDFB /* ViewController.m */; };
@@ -19,14 +19,17 @@
 		4295A2CA18CB4E5100A58D8F /* FullscreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2C318CB4E5100A58D8F /* FullscreenWindow.m */; };
 		4295A2CB18CB4E5100A58D8F /* GLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2C518CB4E5100A58D8F /* GLView.m */; };
 		4295A2CC18CB4E5100A58D8F /* WindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2C718CB4E5100A58D8F /* WindowController.m */; };
-		4295A2E018CB68A400A58D8F /* Game.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2DF18CB68A400A58D8F /* Game.m */; };
+		4295A2E018CB68A400A58D8F /* Game.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2DF18CB68A400A58D8F /* Game.mm */; };
 		4295A2EB18CBB0F700A58D8F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2EA18CBB0F700A58D8F /* main.m */; };
 		4295A2F318CBB22800A58D8F /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4295A2F218CBB22800A58D8F /* MainMenu.xib */; };
 		4295A2FA18CBC15000A58D8F /* Fractal.vsh in Resources */ = {isa = PBXBuildFile; fileRef = 4295A2F618CBBFF100A58D8F /* Fractal.vsh */; };
 		4295A2FB18CBC15000A58D8F /* Fractal.fsh in Resources */ = {isa = PBXBuildFile; fileRef = 4295A2F818CBC00500A58D8F /* Fractal.fsh */; };
+		6869D170D88D43F687C89757 /* libPods-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5916B6726FF14B41B517EB12 /* libPods-iOS.a */; };
+		D0B1A810E3574AD991F6A585 /* libPods-OSX.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DA27C28573F4442857789CE /* libPods-OSX.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		152FC1C248414F0B90540EC3 /* Pods-iOS.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS.xcconfig"; path = "Pods/Pods-iOS.xcconfig"; sourceTree = "<group>"; };
 		3A1598D311B9DDB0001E7AB5 /* BoxCar2D.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BoxCar2D.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		4280D3EA18E8307A00E4CDFB /* BoxCar2D.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BoxCar2D.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		4280D3EC18E8307A00E4CDFB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -51,12 +54,15 @@
 		4295A2C618CB4E5100A58D8F /* WindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WindowController.h; path = GLEssentials/OSX/WindowController.h; sourceTree = "<group>"; };
 		4295A2C718CB4E5100A58D8F /* WindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WindowController.m; path = GLEssentials/OSX/WindowController.m; sourceTree = "<group>"; };
 		4295A2DE18CB68A400A58D8F /* Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Game.h; path = GLEssentials/Game.h; sourceTree = "<group>"; };
-		4295A2DF18CB68A400A58D8F /* Game.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Game.m; path = GLEssentials/Game.m; sourceTree = "<group>"; };
+		4295A2DF18CB68A400A58D8F /* Game.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = Game.mm; path = GLEssentials/Game.mm; sourceTree = "<group>"; };
 		4295A2EA18CBB0F700A58D8F /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = GLEssentials/OSX/main.m; sourceTree = "<group>"; };
 		4295A2F018CBB1D200A58D8F /* BoxCar2D-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "BoxCar2D-Info.plist"; path = "GLEssentials/OSX/BoxCar2D-Info.plist"; sourceTree = "<group>"; };
 		4295A2F218CBB22800A58D8F /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MainMenu.xib; path = GLEssentials/OSX/MainMenu.xib; sourceTree = "<group>"; };
 		4295A2F618CBBFF100A58D8F /* Fractal.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = Fractal.vsh; path = GLEssentials/Fractal.vsh; sourceTree = "<group>"; };
 		4295A2F818CBC00500A58D8F /* Fractal.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = Fractal.fsh; path = GLEssentials/Fractal.fsh; sourceTree = "<group>"; };
+		5916B6726FF14B41B517EB12 /* libPods-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		6DA27C28573F4442857789CE /* libPods-OSX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OSX.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		FE3E0DDD70A6476884E69727 /* Pods-OSX.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OSX.xcconfig"; path = "Pods/Pods-OSX.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -64,6 +70,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6869D170D88D43F687C89757 /* libPods-iOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -71,6 +78,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D0B1A810E3574AD991F6A585 /* libPods-OSX.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -81,7 +89,7 @@
 			isa = PBXGroup;
 			children = (
 				4295A2DE18CB68A400A58D8F /* Game.h */,
-				4295A2DF18CB68A400A58D8F /* Game.m */,
+				4295A2DF18CB68A400A58D8F /* Game.mm */,
 				4295A2F618CBBFF100A58D8F /* Fractal.vsh */,
 				4295A2F818CBC00500A58D8F /* Fractal.fsh */,
 				4280D42818E831A900E4CDFB /* Fractal-iOS.fsh */,
@@ -107,6 +115,8 @@
 				080E96DDFE201D6D7F000001 /* GLEssentials */,
 				4280D3EB18E8307A00E4CDFB /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
+				FE3E0DDD70A6476884E69727 /* Pods-OSX.xcconfig */,
+				152FC1C248414F0B90540EC3 /* Pods-iOS.xcconfig */,
 			);
 			name = OSXGLEssentials;
 			sourceTree = "<group>";
@@ -118,6 +128,8 @@
 				4280D3EE18E8307A00E4CDFB /* CoreGraphics.framework */,
 				4280D3F018E8307A00E4CDFB /* UIKit.framework */,
 				4280D40518E8307A00E4CDFB /* XCTest.framework */,
+				6DA27C28573F4442857789CE /* libPods-OSX.a */,
+				5916B6726FF14B41B517EB12 /* libPods-iOS.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -170,9 +182,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 4280D41718E8307A00E4CDFB /* Build configuration list for PBXNativeTarget "iOS" */;
 			buildPhases = (
+				46022C2518FF440FBEA6BFF6 /* Check Pods Manifest.lock */,
 				4280D3E818E8307A00E4CDFB /* Resources */,
 				4280D3E618E8307A00E4CDFB /* Sources */,
 				4280D3E718E8307A00E4CDFB /* Frameworks */,
+				9CC0B0E23C7D478B9EB6C137 /* Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -187,9 +201,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "OSX" */;
 			buildPhases = (
+				BFEF4D0F616E4BE4A94CB5CF /* Check Pods Manifest.lock */,
 				8D1107290486CEB800E47090 /* Resources */,
 				8D11072C0486CEB800E47090 /* Sources */,
 				8D11072E0486CEB800E47090 /* Frameworks */,
+				A4929F994156466998243A8E /* Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -255,6 +271,69 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		46022C2518FF440FBEA6BFF6 /* Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+		9CC0B0E23C7D478B9EB6C137 /* Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Pods-iOS-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		A4929F994156466998243A8E /* Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Pods-OSX-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		BFEF4D0F616E4BE4A94CB5CF /* Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		4280D3E618E8307A00E4CDFB /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -263,7 +342,7 @@
 				4280D43218E8321100E4CDFB /* main.m in Sources */,
 				4280D43318E8321100E4CDFB /* AppDelegate.m in Sources */,
 				4280D43418E8321100E4CDFB /* ViewController.m in Sources */,
-				4280D43118E8321100E4CDFB /* Game.m in Sources */,
+				4280D43118E8321100E4CDFB /* Game.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -275,7 +354,7 @@
 				4295A2CA18CB4E5100A58D8F /* FullscreenWindow.m in Sources */,
 				4295A2CB18CB4E5100A58D8F /* GLView.m in Sources */,
 				4295A2CC18CB4E5100A58D8F /* WindowController.m in Sources */,
-				4295A2E018CB68A400A58D8F /* Game.m in Sources */,
+				4295A2E018CB68A400A58D8F /* Game.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -284,6 +363,7 @@
 /* Begin XCBuildConfiguration section */
 		4280D41318E8307A00E4CDFB /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 152FC1C248414F0B90540EC3 /* Pods-iOS.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-2";
@@ -310,6 +390,7 @@
 		};
 		4280D41418E8307A00E4CDFB /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 152FC1C248414F0B90540EC3 /* Pods-iOS.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-2";
@@ -332,6 +413,7 @@
 		};
 		C01FCF4B08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = FE3E0DDD70A6476884E69727 /* Pods-OSX.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon OSX";
@@ -345,6 +427,7 @@
 		};
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = FE3E0DDD70A6476884E69727 /* Pods-OSX.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon OSX";

BoxCar2D.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1 @@
+<?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:BoxCar2D.xcodeproj'/><FileRef location='group:Pods/Pods.xcodeproj'/></Workspace>

GLEssentials/Game.h

@@ -6,8 +6,8 @@
 //
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
-@import CoreGraphics;
+#import <CoreGraphics/CoreGraphics.h>
 
 @interface Game : NSObject
 - (void)update:(float)dt;

GLEssentials/Game.m → GLEssentials/Game.mm

@@ -7,18 +7,12 @@
 //
 
 #import "Game.h"
-@import GLKit;
+#include <moggle/core/gl.hpp>
-
-#ifdef ESSENTIAL_GL_PRACTICES_IOS
-#define glBindVertexArray glBindVertexArrayOES
-#define glGenVertexArrays glGenVertexArraysOES
-#define glDeleteVertexArrays glDeleteVertexArraysOES
-#endif
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
 
-#ifdef ESSENTIAL_GL_PRACTICES_IOS
+#ifdef TARGET_OS_IPHONE
 NSString * file = @"Fractal-iOS";
 #else
 NSString * file = @"Fractal";

Podfile

@@ -6,12 +6,14 @@ platform :osx, '10.9'
 target 'OSX' do
 	platform :osx, '10.9'
 
-#	pod 'AFNetworking'
+	pod 'box2d'
+	pod 'moggle', :path => '../moggle'
 end
 
 target 'iOS' do
 	platform :ios, '7.0'
 
-#	pod 'AFNetworking'
+	pod 'box2d'
+	pod 'moggle', :path => '../moggle'
 end