Skip to content

Commit

Permalink
StandardCyborgFusion: fix signing issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaron Thompson committed Jun 18, 2022
1 parent 5d63275 commit b95edc8
Show file tree
Hide file tree
Showing 422 changed files with 12,982 additions and 62,861 deletions.
14 changes: 6 additions & 8 deletions StandardCyborgFusion/StandardCyborgFusion.podspec
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
Pod::Spec.new do |s|
s.name = 'StandardCyborgFusion'
s.version = '2.3.1'
s.version = '2.3.2'

This comment has been minimized.

Copy link
@saamerm

saamerm Apr 8, 2023

Was this commit only for signing issues? Is there a more detailed summary @aaptho since there are hundreds of files

This comment has been minimized.

Copy link
@aaptho

aaptho Apr 10, 2023

Collaborator

The new xcframework structure means there are now separate builds for iOS, iOS Simulator, and macOS. So the core changes in this commit are very small, mostly in the podspec. The rest is just moving and duplicating.

s.summary = 'A framework that performs real time 3D reconstruction using the TrueDepth camera'
s.homepage = 'https://github.com/StandardCyborg/StandardCyborgCocoa'
s.social_media_url = 'https://twitter.com/StandardCyborg'
s.documentation_url = 'https://standardcyborg.com/docs/cocoa-api'
s.license = { :type => 'Commercial', :file => 'LICENSE' }
s.author = { 'Standard Cyborg' => '[email protected]' }
s.source = { :http => "https://github.com/StandardCyborg/StandardCyborgCocoa/releases/download/v#{s.version}-StandardCyborgFusion/StandardCyborgFusion.framework.zip" }
s.source = { :http => "https://github.com/StandardCyborg/StandardCyborgCocoa/releases/download/v#{s.version}-StandardCyborgFusion/StandardCyborgFusion.xcframework.tar.gz" }

s.ios.deployment_target = '13.0'
s.ios.vendored_frameworks = 'ios/StandardCyborgFusion.framework'
s.ios.vendored_frameworks = 'StandardCyborgFusion.xcframework'
s.ios.xcconfig = {
'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/StandardCyborgFusion/ios/StandardCyborgFusion.framework/CppHeaders"',
'ONLY_ACTIVE_ARCH' => 'YES',
'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/StandardCyborgFusion/StandardCyborgFusion.xcframework/ios-arm64/StandardCyborgFusion.framework/CppHeaders"',
}

s.osx.deployment_target = '11.0'
s.osx.vendored_frameworks = 'osx/StandardCyborgFusion.framework'
s.osx.vendored_frameworks = 'StandardCyborgFusion.xcframework'
s.osx.xcconfig = {
'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/StandardCyborgFusion/osx/StandardCyborgFusion.framework/Versions/Current/CppHeaders"',
'ONLY_ACTIVE_ARCH' => 'YES',
'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/StandardCyborgFusion/StandardCyborgFusion.xcframework/macos-arm64_x86_64/StandardCyborgFusion.xcframework/Versions/A/CppHeaders"',
}
end

53 changes: 53 additions & 0 deletions StandardCyborgFusion/StandardCyborgFusion.xcframework/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?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>AvailableLibraries</key>
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>StandardCyborgFusion.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>StandardCyborgFusion.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>StandardCyborgFusion.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
<string>XFWK</string>
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ limitations under the License.
#include "standard_cyborg/math/Vec2.hpp"
#include "standard_cyborg/math/Vec4.hpp"

#include "standard_cyborg/util/Pybind11Defs.hpp"

namespace standard_cyborg {
namespace sc3d {

Expand Down Expand Up @@ -59,12 +57,6 @@ class ColorImage {
/** Construct an image with size and data */
ColorImage(int width, int height, const std::vector<math::Vec4>& rgba);

#ifdef PYBIND11_ONLY
ColorImage(int width, int height, const NPFloat& rgba_);
#endif // PYBIND11_ONLY



// // Delete evil constructors in favor of explicitly needing to copy the geometry wat????????????????????????????
// ColorImage(ColorImage&&) = delete;
// ColorImage& operator=(ColorImage&&) = delete;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ limitations under the License.

#include "standard_cyborg/math/Vec2.hpp"
#include "standard_cyborg/util/AssertHelper.hpp"
#include "standard_cyborg/util/Pybind11Defs.hpp"

namespace standard_cyborg {
namespace sc3d {
Expand All @@ -41,10 +40,6 @@ class DepthImage {
/** Construct an image with size and data */
DepthImage(int width, int height, const std::vector<float>& depth);

#ifdef PYBIND11_ONLY
DepthImage(int width, int height, const NPFloat& depth_);
#endif // PYBIND11_ONLY

// // Delete evil constructors in favor of explicitly needing to copy the geometry wat????????????????????????????
// DepthImage(DepthImage&&) = delete;
// DepthImage& operator=(DepthImage&&) = delete;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ limitations under the License.
#include "standard_cyborg/sc3d/VertexSelection.hpp"
#include "standard_cyborg/sc3d/ColorImage.hpp"

#include "standard_cyborg/util/Pybind11Defs.hpp"

namespace standard_cyborg {
namespace sc3d {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ limitations under the License.
#include "standard_cyborg/math/Mat3x4.hpp"
#include "standard_cyborg/math/Vec3.hpp"

#include "standard_cyborg/util/Pybind11Defs.hpp"

namespace standard_cyborg {

namespace math {
Expand Down Expand Up @@ -252,12 +250,6 @@ class Node {
Node* getChild(int i) const;
std::shared_ptr<Node> getChildSharedPtr(int i) const;

#ifdef PYBIND11_ONLY
decltype(children.begin()) begin() { return children.begin(); }
decltype(children.end()) end() { return children.end(); }
#endif // PYBIND11_ONLY


/** Returns the index of the specified child node of this parent node, or -1 if not found */
int indexOfChild(std::shared_ptr<Node> childNode) const;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ FOUNDATION_EXPORT const unsigned char StandardCyborgFusionVersionString[];

#import <StandardCyborgFusion/CVPixelBufferHelpers.h>
#import <StandardCyborgFusion/SCAssimilatedFrameMetadata.h>
#import <StandardCyborgFusion/SCEyewearNode.h>
#import <StandardCyborgFusion/SCEyewearTryOnViewController.h>
#import <StandardCyborgFusion/SCFaceLandmarking3D.h>
#import <StandardCyborgFusion/SCFaceTracking.h>
#import <StandardCyborgFusion/SCFootTracking.h>
Expand All @@ -30,14 +28,11 @@ FOUNDATION_EXPORT const unsigned char StandardCyborgFusionVersionString[];
#import <StandardCyborgFusion/SCMesh+SceneKit.h>
#import <StandardCyborgFusion/SCMeshingOperation.h>
#import <StandardCyborgFusion/SCMeshTexturing.h>
#import <StandardCyborgFusion/SCMetalSimulatorStubs.h>
#import <StandardCyborgFusion/SCPerceptionRecorder.h>
#import <StandardCyborgFusion/SCPointCloud.h>
#import <StandardCyborgFusion/SCPointCloud+FileIO.h>
#import <StandardCyborgFusion/SCPointCloud+Geometry.h>
#import <StandardCyborgFusion/SCPointCloud+Metal.h>
#import <StandardCyborgFusion/SCPointCloud+SceneKit.h>
#import <StandardCyborgFusion/SCPerceptionRecorder.h>
#import <StandardCyborgFusion/SCReconstructionManager.h>
#import <StandardCyborgFusion/SCReconstructionManagerParameters.h>
#import <StandardCyborgFusion/SCScene.h>
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit b95edc8

Please sign in to comment.