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.

Sign up for GitHub

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

Enable bitcode + chroma threshold #63

Merged
merged 3 commits into from
Jan 31, 2022
Merged

Enable bitcode + chroma threshold #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6e4eef
Changed chroma_threshold_sensitivity to more sensible default
ramicaza Jan 10, 2022
4f15ff3
Recompile binaries in ios/Libraries with bitcode
ramicaza Jan 11, 2022
5a1b8c9
enable bitcode
ramicaza Jan 11, 2022
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
2 changes: 1 addition & 1 deletion ViroRenderer/VROShaderFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ std::shared_ptr<VROShaderModifier> VROShaderFactory::createChromaKeyModifier(int
std::vector<std::string> modifierCode = {
"uniform highp vec3 color_to_replace;",

"const highp float chroma_threshold_sensitivity = 0.4;",
"const highp float chroma_threshold_sensitivity = 0.1;",
"const highp float smoothing = 0.1;",
"highp float mask_y = 0.2989 * color_to_replace.r + 0.5866 * color_to_replace.g + 0.1145 * color_to_replace.b;",
"highp float mask_cr = 0.7132 * (color_to_replace.r - mask_y);",
Expand Down
Binary file modified ios/Libraries/bullet/armv7_arm64/libBulletCollision.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/bullet/armv7_arm64/libBulletDynamics.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/bullet/armv7_arm64/libBulletSoftBody.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/bullet/armv7_arm64/libLinearMath.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/bullet/x86_64/libBulletCollision.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/bullet/x86_64/libBulletDynamics.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/bullet/x86_64/libBulletSoftBody.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/bullet/x86_64/libLinearMath.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/freetype/armv7_arm64/libfreetype.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/freetype/x86_64/libfreetype.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/protobuf/armv7_arm64/libprotobuf-lite.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/protobuf/x86_64/libprotobuf-lite.a
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ SPEC REPOS:
SPEC CHECKSUMS:
GVRAudioSDK: 302f0a8f190d855868ea07f246ce4f9b44c392ae

PODFILE CHECKSUM: 89c2f1709300d1c1cec2b0716b4cb044211565ba
PODFILE CHECKSUM: 0f1ec9e3d4eddce9b7c7c01d1df31f91c35aa1d4

COCOAPODS: 1.11.2
6 changes: 2 additions & 4 deletions ios/ViroKit.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ Pod::Spec.new do |s|
s.license = {:type => 'Copyright', :text => "Copyright 2018 ViroMedia, Inc" }
s.author = 'Viro Media'
s.requires_arc = true
s.platform = :ios, '9.3'

s.dependency 'GVRSDK', '1.120.0'
s.dependency 'GVRAudioSDK', '1.120.0'
s.platform = :ios, '10.0'
s.dependency 'React'
end
6 changes: 5 additions & 1 deletion ios/ViroRenderer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
13BC8FA821507E2300479BE0 /* VROARFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F1F065A1EF06FBB006FC8C2 /* VROARFrame.h */; settings = {ATTRIBUTES = (Public, ); }; };
13BC8FA921507E4600479BE0 /* VROQuaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F4DCE2E1BFA8D5D00061DD7 /* VROQuaternion.h */; settings = {ATTRIBUTES = (Public, ); }; };
647A0F137242382CD008BE56 /* Pods_ViroSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7A7748CC8659A11C76D30F3 /* Pods_ViroSample.framework */; };
691C503C17159DA15F0DBCE1 /* Pods_ViroKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E0D3E35E404117B89C6BA6E /* Pods_ViroKit.framework */; };
8A11C8F51EF5AB9D0003E829 /* VROARDeclarativePlane.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A11C8F41EF5A8E30003E829 /* VROARDeclarativePlane.h */; settings = {ATTRIBUTES = (Public, ); }; };
8A11C8F81EF5B2270003E829 /* VROARConstraintMatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A11C8F61EF5B2270003E829 /* VROARConstraintMatcher.cpp */; };
8A11C8F91EF5B2270003E829 /* VROARConstraintMatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A11C8F71EF5B2270003E829 /* VROARConstraintMatcher.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -956,6 +957,7 @@
5900241E3CB603B31B8DDDDA /* Pods-ViroSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ViroSample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ViroSample/Pods-ViroSample.debug.xcconfig"; sourceTree = "<group>"; };
5F74787A42D418320F1E3362 /* Pods-ViroKit_static_lib.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ViroKit_static_lib.release.xcconfig"; path = "Pods/Target Support Files/Pods-ViroKit_static_lib/Pods-ViroKit_static_lib.release.xcconfig"; sourceTree = "<group>"; };
69FBDCF89ECBB5500043C227 /* Pods-ViroARKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ViroARKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ViroARKit/Pods-ViroARKit.debug.xcconfig"; sourceTree = "<group>"; };
6E0D3E35E404117B89C6BA6E /* Pods_ViroKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ViroKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6E1141125FCC9320616556D8 /* Pods-ViroKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ViroKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ViroKit/Pods-ViroKit.debug.xcconfig"; sourceTree = "<group>"; };
710AAB43C4650092845EAD81 /* Pods-ViroKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ViroKit.release.xcconfig"; path = "Pods/Target Support Files/Pods-ViroKit/Pods-ViroKit.release.xcconfig"; sourceTree = "<group>"; };
782820C4A876FF888106C852 /* libPods-ViroKit_static_lib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ViroKit_static_lib.a"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -1929,6 +1931,7 @@
8F1664A61E5E43260062EBCE /* Accelerate.framework in Frameworks */,
8FDDE2121CD00F2600674DE2 /* CoreText.framework in Frameworks */,
EAD7E32D2DFA518AEAAB48C2 /* (null) in Frameworks */,
691C503C17159DA15F0DBCE1 /* Pods_ViroKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -3269,6 +3272,7 @@
A5EC65851EB3ECE200FE220E /* libLinearMath.a */,
48567375A658D093284ACEDD /* libPods-ViroARKit.a */,
782820C4A876FF888106C852 /* libPods-ViroKit_static_lib.a */,
6E0D3E35E404117B89C6BA6E /* Pods_ViroKit.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -4751,7 +4755,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = NO;
ENABLE_BITCODE = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Libraries/harfbuzz/armv7_arm64",
Expand Down