replate-camera 0.17.0 → 0.17.2

package/android/src/main/java/com/replatecamera/ReplateCameraView.kt

@@ -34,6 +34,7 @@ import com.google.ar.core.Plane
 import com.google.ar.core.TrackingState
 import com.google.ar.sceneform.*
 import com.google.ar.sceneform.math.Vector3
+import com.google.ar.sceneform.math.Quaternion
 import com.google.ar.sceneform.rendering.Color
 import com.google.ar.sceneform.rendering.Material
 import com.google.ar.sceneform.rendering.MaterialFactory
@@ -84,7 +85,10 @@ class ReplateCameraView @JvmOverloads constructor(
     private const val ANGLE_INCREMENT_DEGREES = 5f
 
     // Initial defaults that match the Swift code
-    private const val DEFAULT_SPHERE_RADIUS = 0.004f
+    private const val DEFAULT_SPHERE_RADIUS = 0.0015f
+    private const val DEFAULT_LINE_HEIGHT = 0.02f   // vertical length
+    private const val DEFAULT_LINE_LENGTH = 0.003f  // thin width
+    private const val GREEN_HEIGHT_SCALE = 0.7f
     private const val DEFAULT_SPHERES_RADIUS = 0.13f
     private const val DEFAULT_SPHERES_HEIGHT = 0.10f
     private const val DEFAULT_DISTANCE_BETWEEN_CIRCLES = 0.10f
@@ -124,6 +128,8 @@ class ReplateCameraView @JvmOverloads constructor(
 
   // Scene geometry
   private var sphereRadius = DEFAULT_SPHERE_RADIUS
+  private var lineHeight = DEFAULT_LINE_HEIGHT
+  private var lineLength = DEFAULT_LINE_LENGTH
   private var spheresRadius = DEFAULT_SPHERES_RADIUS
   private var sphereAngle = ANGLE_INCREMENT_DEGREES  // If you want to “scale angle”
   private var spheresHeight = DEFAULT_SPHERES_HEIGHT
@@ -270,12 +276,19 @@ class ReplateCameraView @JvmOverloads constructor(
   private fun createSphere(position: Vector3) {
     MaterialFactory.makeOpaqueWithColor(context, Color(android.graphics.Color.WHITE))
       .thenAccept { material: Material ->
-        val sphereRenderable = ShapeFactory.makeSphere(sphereRadius, Vector3.zero(), material)
-        val sphereNode = TransformableNode(arFragment.transformationSystem)
-        sphereNode.renderable = sphereRenderable
-        sphereNode.worldPosition = position
-        sphereNode.setParent(anchorNode)
-        spheresModels.add(sphereNode)
+        val center = Vector3.zero()
+        val thickness = sphereRadius * 2
+        // ShapeFactory.makeCube already produces a 6-face box; keep zero corner radius for the flattest look.
+        val lineRenderable = ShapeFactory.makeCube(Vector3(lineLength, lineHeight, thickness), center, material)
+        val lineNode = TransformableNode(arFragment.transformationSystem)
+        lineNode.renderable = lineRenderable
+        lineNode.worldPosition = position
+        // Orient tangentially around the ring
+        val angleRad = Math.atan2(position.z.toDouble(), position.x.toDouble())
+        val angleDeg = Math.toDegrees(angleRad).toFloat() + 90f
+        lineNode.localRotation = Quaternion.axisAngle(Vector3(0f, 1f, 0f), angleDeg)
+        lineNode.setParent(anchorNode)
+        spheresModels.add(lineNode)
       }
   }
 
@@ -510,6 +523,7 @@ class ReplateCameraView @JvmOverloads constructor(
         val material = node.renderable?.material?.makeCopy()
         material?.setFloat4("color", color)
         node.renderable?.material = material
+        node.localScale = Vector3(1f, GREEN_HEIGHT_SCALE, 1f)
     }
   }
 
@@ -790,6 +804,8 @@ class ReplateCameraView @JvmOverloads constructor(
 
       // Reset geometry
       sphereRadius = DEFAULT_SPHERE_RADIUS
+      lineHeight = DEFAULT_LINE_HEIGHT
+      lineLength = DEFAULT_LINE_LENGTH
       spheresRadius = DEFAULT_SPHERES_RADIUS
       sphereAngle = ANGLE_INCREMENT_DEGREES
       spheresHeight = DEFAULT_SPHERES_HEIGHT

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/AppDelegate.swift

@@ -0,0 +1,32 @@
+//
+//  AppDelegate.swift
+//  FocusEntity-Example
+//
+//  Created by Max Cobb on 8/26/19.
+//  Copyright © 2019 Max Cobb. All rights reserved.
+//
+
+import UIKit
+import SwiftUI
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+
+    func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+    ) -> Bool {
+
+        // Create the SwiftUI view that provides the window contents.
+        let contentView = ContentView()
+
+        // Use a UIHostingController as window root view controller.
+        let window = UIWindow(frame: UIScreen.main.bounds)
+        window.rootViewController = UIHostingController(rootView: contentView)
+        self.window = window
+        window.makeKeyAndVisible()
+        return true
+    }
+}

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/Assets.xcassets/Add.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Close.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/Assets.xcassets/Open.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Open.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/Base.lproj/LaunchScreen.storyboard

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/BasicARView.swift

@@ -0,0 +1,31 @@
+//
+//  BasicARView.swift
+//  FocusEntity-Example
+//
+//  Created by Max Cobb on 12/04/2023.
+//  Copyright © 2023 Max Cobb. All rights reserved.
+//
+
+import SwiftUI
+import RealityKit
+import FocusEntity
+import ARKit
+
+struct BasicARView: UIViewRepresentable {
+    typealias UIViewType = ARView
+    func makeUIView(context: Context) -> ARView {
+        let arView = ARView(frame: .zero)
+        let arConfig = ARWorldTrackingConfiguration()
+        arConfig.planeDetection = [.horizontal, .vertical]
+        arView.session.run(arConfig)
+        _ = FocusEntity(on: arView, style: .classic())
+        return arView
+    }
+    func updateUIView(_ uiView: ARView, context: Context) {}
+}
+
+struct BasicARView_Previews: PreviewProvider {
+    static var previews: some View {
+        BasicARView()
+    }
+}

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/ContentView.swift

@@ -0,0 +1,33 @@
+//
+//  ContentView.swift
+//  FocusEntity-Example
+//
+//  Created by Max Cobb on 8/26/19.
+//  Copyright © 2019 Max Cobb. All rights reserved.
+//
+
+import SwiftUI
+import RealityKit
+
+struct ContentView: View {
+    var body: some View {
+        BasicARView().edgesIgnoringSafeArea(.all)
+        // Uncomment the next line for a more complex example
+//        ARViewContainer().edgesIgnoringSafeArea(.all)
+    }
+}
+
+struct ARViewContainer: UIViewRepresentable {
+    func makeUIView(context: Context) -> FocusARView {
+        FocusARView(frame: .zero)
+    }
+    func updateUIView(_ uiView: FocusARView, context: Context) {}
+}
+
+#if DEBUG
+struct ContentView_Previews: PreviewProvider {
+    static var previews: some View {
+        ContentView()
+    }
+}
+#endif

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/FocusARView.swift

@@ -0,0 +1,61 @@
+//
+//  FocusARView.swift
+//  FocusEntity-Example
+//
+//  Created by Max Cobb on 8/26/19.
+//  Copyright © 2019 Max Cobb. All rights reserved.
+//
+
+import RealityKit
+import FocusEntity
+import Combine
+import ARKit
+
+class FocusARView: ARView {
+    enum FocusStyleChoices {
+        case classic
+        case material
+        case color
+    }
+
+    /// Style to be displayed in the example
+    let focusStyle: FocusStyleChoices = .classic
+    var focusEntity: FocusEntity?
+    required init(frame frameRect: CGRect) {
+        super.init(frame: frameRect)
+        self.setupConfig()
+
+        switch self.focusStyle {
+        case .color:
+            self.focusEntity = FocusEntity(on: self, focus: .plane)
+        case .material:
+            do {
+                let onColor: MaterialColorParameter = try .texture(.load(named: "Add"))
+                let offColor: MaterialColorParameter = try .texture(.load(named: "Open"))
+                self.focusEntity = FocusEntity(
+                    on: self,
+                    style: .colored(
+                        onColor: onColor, offColor: offColor,
+                        nonTrackingColor: offColor
+                    )
+                )
+            } catch {
+                self.focusEntity = FocusEntity(on: self, focus: .classic)
+                print("Unable to load plane textures")
+                print(error.localizedDescription)
+            }
+        default:
+            self.focusEntity = FocusEntity(on: self, focus: .classic)
+        }
+    }
+
+    func setupConfig() {
+        let config = ARWorldTrackingConfiguration()
+        config.planeDetection = [.horizontal, .vertical]
+        session.run(config)
+    }
+
+    @objc required dynamic init?(coder decoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/Info.plist

@@ -0,0 +1,50 @@
+<?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>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>FocusEnt-Clone</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>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string></string>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+		<string>arkit</string>
+	</array>
+	<key>UIStatusBarHidden</key>
+	<true/>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

package/ios/FocusEntity/FocusEntity-Example/FocusEntity-Example/Preview Content/Preview Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

package/ios/FocusEntity/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Max Fraser Cobb
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/ios/FocusEntity/LICENSE.origin

@@ -0,0 +1,8 @@
+Copyright © 2018 Apple Inc. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

package/ios/FocusEntity/Package.swift

@@ -0,0 +1,17 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "FocusEntity",
+    platforms: [.iOS(.v13), .macOS(.v10_15)],
+    products: [
+        .library(name: "FocusEntity", targets: ["FocusEntity"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(name: "FocusEntity", dependencies: [])
+    ],
+    swiftLanguageVersions: [.v5]
+)

package/ios/FocusEntity/README.md

@@ -0,0 +1,62 @@
+# FocusEntity
+
+This package is based on [ARKit-FocusNode](https://github.com/maxxfrazer/ARKit-FocusNode), but adapted to work in Apple's framework RealityKit.
+
+<p align="center">
+  <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fmaxxfrazer%2FFocusEntity%2Fbadge%3Ftype%3Dswift-versions"/>
+  <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fmaxxfrazer%2FFocusEntity%2Fbadge%3Ftype%3Dplatforms"/></br>
+  <img src="https://github.com/maxxfrazer/FocusEntity/workflows/swiftlint/badge.svg"/>
+  <img src="https://github.com/maxxfrazer/FocusEntity/workflows/build/badge.svg"/>
+  <img src="https://img.shields.io/github/license/maxxfrazer/FocusEntity"/>
+</p>
+
+<p align="center">
+  <img src="media/focusentity-dali.gif"/>
+</p>
+
+[The Example](./FocusEntity-Example) looks identical to the above GIF, which uses the FocusEntity classic style.
+
+See the [documentation](https://maxxfrazer.github.io/FocusEntity/documentation/focusentity/) for more.
+
+## Minimum Requirements
+  - Swift 5.2
+  - iOS 13.0 (RealityKit)
+  - Xcode 11
+
+If you're unfamiliar with using RealityKit, I would also recommend reading my articles on [Getting Started with RealityKit](https://medium.com/@maxxfrazer/getting-started-with-realitykit-3b401d6f6f).
+
+## Installation
+
+### Swift Package Manager
+
+Add the URL of this repository to your Xcode 11+ Project.
+
+Go to File > Swift Packages > Add Package Dependency, and paste in this link:
+`https://github.com/maxxfrazer/FocusEntity`
+
+---
+## Usage
+
+See the [Example project](./FocusEntity-Example) for a full working example as can be seen in the GIF above
+
+1. Install `FocusEntity` with Swift Package Manager
+
+```
+https://github.com/maxxfrazer/FocusEntity.git
+```
+
+2. Create an instance of FocusEntity, referencing your ARView:
+
+```swift
+let focusSquare = FocusEntity(on: self.arView, focus: .classic)
+```
+
+And that's it! The FocusEntity should already be tracking around your AR scene. There are options to turn the entity off or change its properties.
+Check out [the documentation](https://maxxfrazer.github.io/FocusEntity/documentation/focusentity/) or [example project](FocusEntity-Example) to learn more.
+
+---
+
+Feel free to [send me a tweet](https://twitter.com/maxxfrazer) if you have any problems using FocusEntity, or open an Issue or PR!
+
+
+> The original code to create this repository has been adapted from one of Apple's examples from 2018, [license also included](LICENSE.origin). I have adapted the code to be used and distributed from within a Swift Package, and now further adapted to work with [RealityKit](https://developer.apple.com/documentation/realitykit).