Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/carthage #44

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# OS X
.DS_Store

## Build generated
build/
DerivedData/

#Build files
app/
.bundle
*.bcsymbolmap
*.dSYM

## Various settings
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint

# Xcode
./build/
*.pbxuser
xcuserdata/

# Intellij
.idea/
*.iml
*.iws

# CocoaPods
Pods

# Carthage
Carthage/Checkouts
Carthage/Build/Mac
Carthage/Build/tvOS
Carthage/Build/watchOS
2 changes: 1 addition & 1 deletion HDAugmentedReality/Classes/ARViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ open class ARViewController: UIViewController, ARTrackingManagerDelegate
//==========================================================================================================================================================
// MARK: Init
//==========================================================================================================================================================
init()
public init()
{
super.init(nibName: nil, bundle: nil)
self.initializeInternal()
Expand Down
21 changes: 21 additions & 0 deletions HDAugmentedReality/HDAugmentedReality.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//
// HDAugmentedReality.h
// HDAugmentedReality
//
// Created by Natalia Osiecka on 28/06/2017.
// Copyright © 2017 Danijel Huis. All rights reserved.
//

#import <UIKit/UIKit.h>
#import <CoreLocation/CoreLocation.h>
#import <CoreMotion/CoreMotion.h>

//! Project version number for HDAugmentedReality.
FOUNDATION_EXPORT double HDAugmentedRealityVersionNumber;

//! Project version string for HDAugmentedReality.
FOUNDATION_EXPORT const unsigned char HDAugmentedRealityVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <HDAugmentedReality/PublicHeader.h>


24 changes: 24 additions & 0 deletions HDAugmentedReality/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
396 changes: 363 additions & 33 deletions HDAugmentedRealityDemo.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4C247A071F03CA1D00D0340B"
BuildableName = "HDAugmentedReality.framework"
BlueprintName = "HDAugmentedReality"
ReferencedContainer = "container:HDAugmentedRealityDemo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4C247A071F03CA1D00D0340B"
BuildableName = "HDAugmentedReality.framework"
BlueprintName = "HDAugmentedReality"
ReferencedContainer = "container:HDAugmentedRealityDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4C247A071F03CA1D00D0340B"
BuildableName = "HDAugmentedReality.framework"
BlueprintName = "HDAugmentedReality"
ReferencedContainer = "container:HDAugmentedRealityDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
6 changes: 3 additions & 3 deletions HDAugmentedRealityDemo/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>2.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSCameraUsageDescription</key>
<string>App uses camera for Augmented Reality.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<key>UIMainStoryboardFile</key>
Expand All @@ -50,7 +52,5 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>NSCameraUsageDescription</key>
<string>App uses camera for Augmented Reality.</string>
</dict>
</plist>
1 change: 1 addition & 0 deletions HDAugmentedRealityDemo/TestARPresenter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import UIKit
import HDAugmentedReality

class TestARPresenter: ARPresenter
{
Expand Down
1 change: 1 addition & 0 deletions HDAugmentedRealityDemo/TestAnnotationView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import UIKit
import HDAugmentedReality

open class TestAnnotationView: ARAnnotationView, UIGestureRecognizerDelegate
{
Expand Down
1 change: 1 addition & 0 deletions HDAugmentedRealityDemo/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import UIKit
import CoreLocation
import HDAugmentedReality

class ViewController: UIViewController, ARDataSource
{
Expand Down
36 changes: 36 additions & 0 deletions HDAugmentedRealityTests/HDAugmentedRealityTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//
// HDAugmentedRealityTests.swift
// HDAugmentedRealityTests
//
// Created by Natalia Osiecka on 28/06/2017.
// Copyright © 2017 Danijel Huis. All rights reserved.
//

import XCTest
@testable import HDAugmentedReality

class HDAugmentedRealityTests: XCTestCase {

override func setUp() {
super.setUp()
// Put setup code here. This method is called before the invocation of each test method in the class.
}

override func tearDown() {
// Put teardown code here. This method is called after the invocation of each test method in the class.
super.tearDown()
}

func testExample() {
// This is an example of a functional test case.
// Use XCTAssert and related functions to verify your tests produce the correct results.
}

func testPerformanceExample() {
// This is an example of a performance test case.
self.measure {
// Put the code you want to measure the time of here.
}
}

}
22 changes: 22 additions & 0 deletions HDAugmentedRealityTests/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>