From 50331b6d9e29fc92364134ab9c3a5793475fdb93 Mon Sep 17 00:00:00 2001 From: Ufuk Tugay <ufukkaantugay@gmail.com> Date: Thu, 17 Jun 2021 18:58:57 +0200 Subject: [PATCH] Added experimental Layout Skeleton --- .../project.pbxproj | 8 +- .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++ .../WorkspaceSettings.xcsettings | 18 +++++ .../xcdebugger/Breakpoints_v2.xcbkptlist | 24 ++++++ .../Base.lproj/Main.storyboard | 79 +++++++++++++++++-- .../StartScreen.swift | 10 +++ .../ViewController.swift | 5 +- 7 files changed, 142 insertions(+), 10 deletions(-) create mode 100644 Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.xcworkspace/xcuserdata/ufukkaan.xcuserdatad/WorkspaceSettings.xcsettings create mode 100644 Objekterkennung in AR mit ARKit und CoreML.xcodeproj/xcuserdata/ufukkaan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist create mode 100644 Objekterkennung in AR mit ARKit und CoreML/StartScreen.swift diff --git a/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.pbxproj b/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.pbxproj index 76e8065..2365c8d 100644 --- a/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.pbxproj +++ b/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 291C32BE267B6A3400A7A0D3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 291C32BC267B6A3400A7A0D3 /* Main.storyboard */; }; 291C32C0267B6A3600A7A0D3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 291C32BF267B6A3600A7A0D3 /* Assets.xcassets */; }; 291C32C3267B6A3600A7A0D3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 291C32C1267B6A3600A7A0D3 /* LaunchScreen.storyboard */; }; + 291C32CB267B6DD800A7A0D3 /* StartScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291C32CA267B6DD800A7A0D3 /* StartScreen.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -24,6 +25,7 @@ 291C32BF267B6A3600A7A0D3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 291C32C2267B6A3600A7A0D3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; 291C32C4267B6A3600A7A0D3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; + 291C32CA267B6DD800A7A0D3 /* StartScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartScreen.swift; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -59,6 +61,7 @@ 291C32B6267B6A3400A7A0D3 /* AppDelegate.swift */, 291C32B8267B6A3400A7A0D3 /* art.scnassets */, 291C32BA267B6A3400A7A0D3 /* ViewController.swift */, + 291C32CA267B6DD800A7A0D3 /* StartScreen.swift */, 291C32BC267B6A3400A7A0D3 /* Main.storyboard */, 291C32BF267B6A3600A7A0D3 /* Assets.xcassets */, 291C32C1267B6A3600A7A0D3 /* LaunchScreen.storyboard */, @@ -140,6 +143,7 @@ files = ( 291C32BB267B6A3400A7A0D3 /* ViewController.swift in Sources */, 291C32B7267B6A3400A7A0D3 /* AppDelegate.swift in Sources */, + 291C32CB267B6DD800A7A0D3 /* StartScreen.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -287,7 +291,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = H663T9FNDN; + DEVELOPMENT_TEAM = AJ3HG2Z9T5; INFOPLIST_FILE = "Objekterkennung in AR mit ARKit und CoreML/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -306,7 +310,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = H663T9FNDN; + DEVELOPMENT_TEAM = AJ3HG2Z9T5; INFOPLIST_FILE = "Objekterkennung in AR mit ARKit und CoreML/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ +<?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>PreviewsEnabled</key> + <false/> +</dict> +</plist> diff --git a/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.xcworkspace/xcuserdata/ufukkaan.xcuserdatad/WorkspaceSettings.xcsettings b/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.xcworkspace/xcuserdata/ufukkaan.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..379adbe --- /dev/null +++ b/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/project.xcworkspace/xcuserdata/ufukkaan.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,18 @@ +<?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>BuildLocationStyle</key> + <string>UseAppPreferences</string> + <key>CustomBuildLocationType</key> + <string>RelativeToDerivedData</string> + <key>DerivedDataLocationStyle</key> + <string>Default</string> + <key>IssueFilterStyle</key> + <string>ShowActiveSchemeOnly</string> + <key>LiveSourceIssuesEnabled</key> + <true/> + <key>ShowSharedSchemesAutomaticallyEnabled</key> + <true/> +</dict> +</plist> diff --git a/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/xcuserdata/ufukkaan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/xcuserdata/ufukkaan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..9f42b2d --- /dev/null +++ b/Objekterkennung in AR mit ARKit und CoreML.xcodeproj/xcuserdata/ufukkaan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Bucket + uuid = "851DB0DF-F4BD-46D4-870F-7D589CD66DE3" + type = "1" + version = "2.0"> + <Breakpoints> + <BreakpointProxy + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> + <BreakpointContent + uuid = "188EDF62-127E-45BA-9161-D86F56DA47B7" + shouldBeEnabled = "No" + ignoreCount = "0" + continueAfterRunningActions = "No" + filePath = "Objekterkennung in AR mit ARKit und CoreML/ViewController.swift" + startingColumnNumber = "9223372036854775807" + endingColumnNumber = "9223372036854775807" + startingLineNumber = "11" + endingLineNumber = "11" + landmarkName = "unknown" + landmarkType = "0"> + </BreakpointContent> + </BreakpointProxy> + </Breakpoints> +</Bucket> diff --git a/Objekterkennung in AR mit ARKit und CoreML/Base.lproj/Main.storyboard b/Objekterkennung in AR mit ARKit und CoreML/Base.lproj/Main.storyboard index ee86cce..dcc9410 100644 --- a/Objekterkennung in AR mit ARKit und CoreML/Base.lproj/Main.storyboard +++ b/Objekterkennung in AR mit ARKit und CoreML/Base.lproj/Main.storyboard @@ -1,37 +1,102 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BV1-FR-VrT"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="JYM-oL-gHR"> + <device id="ipad10_5" orientation="portrait" layout="fullscreen" appearance="light"/> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/> + <capability name="Safe area layout guides" minToolsVersion="9.0"/> + <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <scenes> + <!--StartingMenu--> + <scene sceneID="bPc-cP-DKY"> + <objects> + <viewController title="StartingMenu" id="JYM-oL-gHR" sceneMemberID="viewController"> + <view key="view" contentMode="scaleToFill" id="Owh-FO-GX2"> + <rect key="frame" x="0.0" y="0.0" width="834" height="1112"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gZn-ez-RhR"> + <rect key="frame" x="0.0" y="0.0" width="834" height="1112"/> + <subviews> + <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DKE-En-LAf"> + <rect key="frame" x="372" y="262" width="253" height="81"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <state key="normal" title="TransitionToARView1"/> + <connections> + <segue destination="BV1-FR-VrT" kind="presentation" modalPresentationStyle="fullScreen" id="iY2-FR-de1"/> + </connections> + </button> + </subviews> + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + </view> + </subviews> + <viewLayoutGuide key="safeArea" id="sSH-U5-j3N"/> + <color key="backgroundColor" systemColor="systemBackgroundColor"/> + <constraints> + <constraint firstItem="gZn-ez-RhR" firstAttribute="top" secondItem="sSH-U5-j3N" secondAttribute="top" id="LJh-7f-3fH"/> + <constraint firstItem="gZn-ez-RhR" firstAttribute="trailing" secondItem="sSH-U5-j3N" secondAttribute="trailing" id="Ujw-Zs-bmI"/> + <constraint firstItem="gZn-ez-RhR" firstAttribute="bottom" secondItem="sSH-U5-j3N" secondAttribute="bottom" id="khg-6d-3wG"/> + <constraint firstItem="gZn-ez-RhR" firstAttribute="leading" secondItem="sSH-U5-j3N" secondAttribute="leading" id="kxj-NO-8eW"/> + </constraints> + </view> + <navigationItem key="navigationItem" id="CcB-7n-HCS"/> + </viewController> + <placeholder placeholderIdentifier="IBFirstResponder" id="yC0-Lw-OcD" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="78.417266187050359" y="17.805755395683455"/> + </scene> <!--View Controller--> <scene sceneID="tXr-a1-R10"> <objects> - <viewController id="BV1-FR-VrT" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController"> + <viewController id="BV1-FR-VrT" customClass="ViewController" customModule="Objekterkennung_in_AR_mit_ARKit_und_CoreML" customModuleProvider="target" sceneMemberID="viewController"> <view key="view" contentMode="scaleToFill" id="U0K-SW-4ec"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="834" height="1112"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <arscnView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BrB-h1-WRS"> - <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <rect key="frame" x="0.0" y="0.0" width="834" height="1112"/> </arscnView> + <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c0q-pK-UW8"> + <rect key="frame" x="180" y="622" width="88" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <state key="normal" title="BackToMenu"/> + <connections> + <segue destination="JYM-oL-gHR" kind="presentation" modalPresentationStyle="fullScreen" id="cDN-nb-bA1"/> + </connections> + </button> </subviews> - <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> + <viewLayoutGuide key="safeArea" id="fQZ-KI-GVf"/> + <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> + <constraint firstItem="BrB-h1-WRS" firstAttribute="bottom" secondItem="fQZ-KI-GVf" secondAttribute="bottom" id="26w-Ql-112"/> <constraint firstItem="BrB-h1-WRS" firstAttribute="leading" secondItem="fQZ-KI-GVf" secondAttribute="leading" id="GsS-dJ-CKf"/> + <constraint firstItem="BrB-h1-WRS" firstAttribute="top" secondItem="fQZ-KI-GVf" secondAttribute="top" id="Hcj-xD-YgA"/> + <constraint firstItem="BrB-h1-WRS" firstAttribute="trailing" secondItem="fQZ-KI-GVf" secondAttribute="trailing" id="P7g-4b-6h5"/> + <constraint firstItem="BrB-h1-WRS" firstAttribute="leading" secondItem="U0K-SW-4ec" secondAttribute="leading" id="RbD-Tz-nGv"/> <constraint firstItem="BrB-h1-WRS" firstAttribute="bottom" secondItem="fQZ-KI-GVf" secondAttribute="bottom" id="VpT-BR-CcM"/> <constraint firstItem="BrB-h1-WRS" firstAttribute="trailing" secondItem="fQZ-KI-GVf" secondAttribute="trailing" id="XyZ-9z-H8e"/> + <constraint firstItem="BrB-h1-WRS" firstAttribute="trailing" secondItem="fQZ-KI-GVf" secondAttribute="trailing" id="Y0j-AT-0ts"/> + <constraint firstItem="BrB-h1-WRS" firstAttribute="top" secondItem="U0K-SW-4ec" secondAttribute="top" id="cHK-o1-Ewb"/> + <constraint firstAttribute="bottom" secondItem="BrB-h1-WRS" secondAttribute="bottom" id="fyC-ey-8FC"/> + <constraint firstItem="BrB-h1-WRS" firstAttribute="leading" secondItem="fQZ-KI-GVf" secondAttribute="leading" id="oqE-tG-7YC"/> <constraint firstItem="BrB-h1-WRS" firstAttribute="top" secondItem="U0K-SW-4ec" secondAttribute="top" id="rJc-2c-zQA"/> </constraints> - <viewLayoutGuide key="safeArea" id="fQZ-KI-GVf"/> </view> + <navigationItem key="navigationItem" id="BKG-QV-U3d"/> <connections> + <outlet property="BackToMenu" destination="c0q-pK-UW8" id="4Kp-ah-X3k"/> <outlet property="sceneView" destination="BrB-h1-WRS" id="5nT-qQ-ynl"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="SZV-WD-TEh" sceneMemberID="firstResponder"/> </objects> + <point key="canvasLocation" x="709" y="18"/> </scene> </scenes> + <resources> + <systemColor name="systemBackgroundColor"> + <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + </systemColor> + </resources> </document> diff --git a/Objekterkennung in AR mit ARKit und CoreML/StartScreen.swift b/Objekterkennung in AR mit ARKit und CoreML/StartScreen.swift new file mode 100644 index 0000000..10cb2a2 --- /dev/null +++ b/Objekterkennung in AR mit ARKit und CoreML/StartScreen.swift @@ -0,0 +1,10 @@ +// +// StartScreen.swift +// Objekterkennung in AR mit ARKit und CoreML +// +// Created by Ufuk Kaan on 17.06.21. +// + +import Foundation +import UIKit + diff --git a/Objekterkennung in AR mit ARKit und CoreML/ViewController.swift b/Objekterkennung in AR mit ARKit und CoreML/ViewController.swift index dc63d3f..bc6db82 100644 --- a/Objekterkennung in AR mit ARKit und CoreML/ViewController.swift +++ b/Objekterkennung in AR mit ARKit und CoreML/ViewController.swift @@ -11,8 +11,11 @@ import ARKit class ViewController: UIViewController, ARSCNViewDelegate { + @IBOutlet var MenuView: UIView! + @IBOutlet var BackToMenu: UIButton! + @IBOutlet var ButtonToFirstARScene: UIButton! @IBOutlet var sceneView: ARSCNView! - + override func viewDidLoad() { super.viewDidLoad() -- GitLab