Skip to content

Swift package manager support #24

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
54 changes: 1 addition & 53 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,62 +25,10 @@ Pods
*.xcscmblueprint
OptimizationProfiles


**/.DS_Store
StandardCyborgGeometryTests/TestCases/Scans

node_modules
*.wasm

SceneGraphWebViewer/dist
SceneGraphWebViewer/package-lock.json

# Ignored here; it would make sense to commit these build products in a public release
scsdk/js/dist

SceneGraphWebViewer/package-lock.json

**/*.o
StandardCyborgEmscripten/build/
build-all

## enable local testing without throwing off the diff

ScratchSpace

VisualTesteriOS/AccessSecretKey.h

*.so
StandardCyborgPython/out.gltf
StandardCyborgPython/out.ply

StandardCyborgPython/dist/
StandardCyborgPython/StandardCyborgSDK.egg-info/

__pycache__
.mypy_cache/
*.pyc

StandardCyborgOrbDemo/out.jpeg

src/utils/fusion/components-build
src/utils/fusion/test.ply
src/utils/fusion/ate.png
src/utils/fusion/rpe.png

src/utils/fusion/fusion-ate.png
src/utils/fusion/fusion-rpe.png

src/utils/fusion/gt-ate.png
src/utils/fusion/gt-rpe.png

src/traces/local_traces

.svn/

env/

protoc

.build

temp.tar
24 changes: 0 additions & 24 deletions .gitmodules

This file was deleted.

34 changes: 0 additions & 34 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,32 +1,9 @@
source 'https://github.com/CocoaPods/Specs.git'
source '[email protected]:StandardCyborg/SCCocoaPods.git'

inhibit_all_warnings!

platform :osx, '11.0'

target 'StandardCyborgFusion' do
pod 'SSZipArchive'
pod 'scsdk', :path => 'scsdk/'
pod 'PoissonRecon', :podspec => 'StandardCyborgFusion/PoissonRecon.podspec'
platform :ios, '13.0'
end


# Sadly Cocoapods cant do both osx and ios in same target, so we have to make
# a separate one for OSX.
target 'StandardCyborgFusionOSX' do
pod 'SSZipArchive'
pod 'scsdk', :path => 'scsdk/'
pod 'PoissonRecon', :podspec => 'StandardCyborgFusion/PoissonRecon.podspec'
platform :osx, '11.0'
end

target 'StandardCyborgFusionTests' do
platform :osx, '11.0'
pod 'scsdk', :path => 'scsdk/'
end

target 'TrueDepthFusion' do
platform :ios, '13.0'
end
Expand All @@ -36,17 +13,6 @@ target 'VisualTesterMac' do
pod 'scsdk', :path => 'scsdk/'
end

target 'VisualTesteriOS' do
platform :ios, '13.0'
pod 'scsdk', :path => 'scsdk/'
end

target 'StandardCyborgAlgorithmsTestbed' do
platform :ios, '13.0'
pod 'scsdk', :path => 'scsdk/'
end


post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do | configuration |
Expand Down
23 changes: 4 additions & 19 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,38 +1,23 @@
PODS:
- EigenCPPCocoa (3.4.0)
- PoissonRecon (9.011)
- scsdk (1.0.0):
- EigenCPPCocoa (~> 3.4.0)
- SSZipArchive (2.4.3)

DEPENDENCIES:
- PoissonRecon (from `StandardCyborgFusion/PoissonRecon.podspec`)
- scsdk (from `scsdk/`)
- SSZipArchive

SPEC REPOS:
"[email protected]:StandardCyborg/SCCocoaPods.git":
- EigenCPPCocoa
https://github.com/CocoaPods/Specs.git:
- SSZipArchive
- EigenCPPCocoa

EXTERNAL SOURCES:
PoissonRecon:
:podspec: StandardCyborgFusion/PoissonRecon.podspec
scsdk:
:path: scsdk/

CHECKOUT OPTIONS:
PoissonRecon:
:commit: 9f30316c1b247736654652c72e06b3f0db2e79ed
:git: "[email protected]:StandardCyborg/PoissonRecon.git"

SPEC CHECKSUMS:
EigenCPPCocoa: a4709e53380aeb15f6027f6b3e4190abdbef3897
PoissonRecon: 80674507001fec81666c982732f66d6ceb71d54c
EigenCPPCocoa: 4b79c92db8d6e634c34e28e3cf5e97ba1ab100b5
scsdk: 8bdcc08321923d9b4b0f3766b265c2091e70966b
SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef

PODFILE CHECKSUM: c9158b3a95922262409caf6678703172e1087244
PODFILE CHECKSUM: 855f6d6ef41d7020fd797538aa68a79411810167

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
8 changes: 8 additions & 0 deletions StandardCyborgFusion/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.DS_Store
/.build
/Packages
xcuserdata/
DerivedData/
.swiftpm/configuration/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc
Binary file not shown.
24 changes: 0 additions & 24 deletions StandardCyborgFusion/Info.plist

This file was deleted.

15 changes: 15 additions & 0 deletions StandardCyborgFusion/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 77 additions & 0 deletions StandardCyborgFusion/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
// swift-tools-version: 6.0

import PackageDescription

let package = Package(
name: "StandardCyborgFusion",
platforms: [
.iOS(.v16), .macOS(.v12)
],
products: [
.library(
name: "StandardCyborgFusion",
targets: ["StandardCyborgFusion"]
),
],
dependencies: [
// .package(url: "https://github.com/nlohmann/json.git", from: "3.11.3"),
.package(url: "https://github.com/ZipArchive/ZipArchive.git", from: "2.6.0"),
.package(path: "../scsdk"),
.package(path: "../deps/json"),
.package(path: "../deps/libigl"),
.package(path: "../deps/PoissonRecon"),
],
targets: [
.target(
name: "StandardCyborgFusion",
dependencies: [
"json",
"libigl",
"scsdk",
"PoissonRecon",
"ZipArchive",
],
path: "Sources",
// resources: [
// .process("Models/SCEarLandmarking.mlmodel"),
// .process("Models/SCEarTrackingModel.mlmodel"),
// .process("Models/SCFootTrackingModel.mlmodel"),
// ],
publicHeadersPath: "include",
cxxSettings: [
.define("DEBUG", .when(configuration: .debug)),
// .define("STD_LIB_FLAG"),
// .define("OBJC_OLD_DISPATCH_PROTOTYPES", to: "1"),
.define("IGL_STATIC_LIBRARY"),
.unsafeFlags(["-fobjc-arc"]),
.headerSearchPath("."),
.headerSearchPath("StandardCyborgFusion/Algorithm"),
.headerSearchPath("StandardCyborgFusion/DataStructures"),
.headerSearchPath("StandardCyborgFusion/EarLandmarking"),
.headerSearchPath("StandardCyborgFusion/Helpers"),
.headerSearchPath("StandardCyborgFusion/IO"),
.headerSearchPath("StandardCyborgFusion/MetalDepthProcessor"),
.headerSearchPath("StandardCyborgFusion/Private"),
.headerSearchPath("include/StandardCyborgFusion"),
]
// linkerSettings: [
// .linkedFramework("Foundation"),
// .linkedFramework("Metal")
// ]
),
// .testTarget(
// name: "StandardCyborgFusionTests",
// dependencies: ["StandardCyborgFusion"],
// cSettings: [
// // .headerSearchPath("Include"),
// .define("DEBUG", .when(configuration: .debug)),
// ],
// cxxSettings: [
// // .headerSearchPath("Include"),
// .define("DEBUG", .when(configuration: .debug)),
// ]
// )
],
swiftLanguageModes: [.v5],
cxxLanguageStandard: .cxx17
)
Loading