Skip to content

Consume canvas polyfill to enable text support #251

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

Merged
merged 16 commits into from
Jun 29, 2021
Merged

Consume canvas polyfill to enable text support #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5a56736
update babylonnative
Jun 16, 2021
935877a
initialize canvas polyfill
Jun 16, 2021
6dc4c05
support canvas polyfill
Jun 16, 2021
c904e6e
add engine view logic
Jun 16, 2021
0cc37d8
remove no longer needed effect
Jun 17, 2021
6414893
remove unused _native variable
Jun 17, 2021
6063b3f
revert engine view changes in favor of content from babylon.js
Jun 17, 2021
f172d0d
iOS fixes
ryantrem Jun 18, 2021
28d9fb2
move to most recent master branch
Jun 22, 2021
8380c16
Merge branch 'canvas' of https://github.com/chrisfromwork/BabylonReac…
Jun 22, 2021
699f297
Merge branch 'master' of https://github.com/BabylonJS/BabylonReactNat…
Jun 22, 2021
480330f
fix package versions
Jun 22, 2021
f2150b3
Update to latest BabylonNative and bjs npm package 5.0.0-alpha.30
bghgary Jun 28, 2021
7a6051a
Updates from pod install
bghgary Jun 28, 2021
b547d8f
Update to latest BabylonNative submodule 3a8ea03c
bghgary Jun 28, 2021
a0b25f0
Update package-lock.json files in PackageTest
bghgary Jun 29, 2021
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
11,736 changes: 6,840 additions & 4,896 deletions Apps/PackageTest/0.63.1/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Apps/PackageTest/0.63.1/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@babylonjs/core": "^5.0.0-alpha.22",
"@babylonjs/core": "^5.0.0-alpha.30",
"@babylonjs/react-native": "file:../../../Package/Assembled/babylonjs-react-native-0.0.1.tgz",
"react": "16.13.1",
"react-native": "0.63.1",
Expand Down
18,502 changes: 9,687 additions & 8,815 deletions Apps/PackageTest/0.64.0/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Apps/PackageTest/0.64.0/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@babylonjs/core": "^5.0.0-alpha.22",
"@babylonjs/core": "^5.0.0-alpha.30",
"@babylonjs/react-native": "file:../../../Package/Assembled/babylonjs-react-native-0.0.1.tgz",
"@babylonjs/react-native-windows": "file:../../../Package/Assembled-Windows/babylonjs-react-native-windows-0.0.1.tgz",
"react": "^17.0.1",
Expand Down
40 changes: 40 additions & 0 deletions Apps/Playground/ios/Playground.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
00E356EB1AD99517003FC87E /* Frameworks */,
00E356EC1AD99517003FC87E /* Resources */,
4DF74E02309D0674CD39F2F6 /* [CP] Copy Pods Resources */,
6A13610D0DAC0E2C73213A44 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -215,6 +216,7 @@
13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
7673B7292A47C1F4F6B8C9E4 /* [CP] Copy Pods Resources */,
3A005AC06E3079E06824DD42 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -394,6 +396,24 @@
shellPath = /bin/sh;
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
};
3A005AC06E3079E06824DD42 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Playground/Pods-Playground-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Playground/Pods-Playground-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
4DF74E02309D0674CD39F2F6 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -412,6 +432,24 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Playground-PlaygroundTests/Pods-Playground-PlaygroundTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
6A13610D0DAC0E2C73213A44 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Playground-PlaygroundTests/Pods-Playground-PlaygroundTests-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Playground-PlaygroundTests/Pods-Playground-PlaygroundTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
7673B7292A47C1F4F6B8C9E4 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -768,6 +806,7 @@
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -828,6 +867,7 @@
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand Down
8 changes: 4 additions & 4 deletions Apps/Playground/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,17 +467,17 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: cde416483dac037923206447da6e1454df403714
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
FBReactNativeSpec: 5d6dbb11432863ed5cd10461d91baf60af966217
FBReactNativeSpec: 4cf6a7ec72a62c59d9d0cc5b558e55c462203506
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
Permission-Camera: 358081c7b8210849958af181ce9ddeb11932aa82
Expand All @@ -492,7 +492,7 @@ SPEC CHECKSUMS:
React-jsi: 5de8204706bd872b78ea646aee5d2561ca1214b6
React-jsiexecutor: 124e8f99992490d0d13e0649d950d3e1aae06fe9
React-jsinspector: 500a59626037be5b3b3d89c5151bc3baa9abf1a9
react-native-babylon: 67b39de846123d0846b28ce0e38671c7e3c4e04f
react-native-babylon: 858ff09e82f9c3de4f17d66e90d6ca08dd480bb4
Copy link
Contributor Author

@chrisfromwork chrisfromwork Jun 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ryantrem is there more context around what this guid should map to?

Copy link
Member

@ryantrem ryantrem Jun 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is a hash. I just ran pod install in the iOS directory. I'm not totally sure how the hash is generated for local packages.

react-native-slider: e45c8376012e5ace012e5eef62e9c85c68e50a0f
React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675
React-RCTActionSheet: fc376be462c9c8d6ad82c0905442fd77f82a9d2a
Expand Down
22 changes: 11 additions & 11 deletions Apps/Playground/package-lock.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Apps/Playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"postinstall": "node scripts/postinstall.js"
},
"dependencies": {
"@babylonjs/core": "^5.0.0-alpha.22",
"@babylonjs/loaders": "^5.0.0-alpha.22",
"@babylonjs/core": "^5.0.0-alpha.30",
"@babylonjs/loaders": "^5.0.0-alpha.30",
"@babylonjs/react-native": "file:../../Modules/@babylonjs/react-native",
"@babylonjs/react-native-windows": "file:../../Modules/@babylonjs/react-native-windows",
"@react-native-community/slider": "4.0.0-rc.3",
Expand Down
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native-windows/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"licenseFilename": "LICENSE",
"readmeFilename": "README.md",
"peerDependencies": {
"@babylonjs/core": "^5.0.0-alpha.22",
"@babylonjs/core": "^5.0.0-alpha.30",
"@babylonjs/react-native":"version",
"react": "^17.0.1",
"react-native": "^0.64.0",
Expand Down
3 changes: 3 additions & 0 deletions ...les/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
$(BabylonNativeBuildDir)\Plugins\NativeXr\$(Configuration);
$(BabylonNativeBuildDir)\Polyfills\Window\$(Configuration);
$(BabylonNativeBuildDir)\Polyfills\XMLHttpRequest\$(Configuration);
$(BabylonNativeBuildDir)\Polyfills\Canvas\$(Configuration);
$(BabylonNativeBuildDir)\$(Configuration);
%(AdditionalLibraryDirectories);
</AdditionalLibraryDirectories>
Expand Down Expand Up @@ -175,6 +176,7 @@
bgfx.lib;
bimg.lib;
bx.lib;
Canvas.lib;
edtaa3.lib;
etc1.lib;
etc2.lib;
Expand Down Expand Up @@ -231,6 +233,7 @@
bgfx.lib;
bimg.lib;
bx.lib;
Canvas.lib;
edtaa3.lib;
etc1.lib;
etc2.lib;
Expand Down
3 changes: 2 additions & 1 deletion Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ target_link_libraries(BabylonNative
NativeInput
NativeXr
Window
XMLHttpRequest)
XMLHttpRequest
Canvas)

if(DEFINED EXTENSIONS_DIRS)
foreach(extensionDir IN LISTS EXTENSIONS_DIRS)
Expand Down
3 changes: 2 additions & 1 deletion Modules/@babylonjs/react-native/android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,5 @@ target_link_libraries(BabylonNative
NativeInput
NativeXr
Window
XMLHttpRequest)
XMLHttpRequest
Canvas)
3 changes: 2 additions & 1 deletion Modules/@babylonjs/react-native/ios/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ target_link_libraries(BabylonNative
NativeInput
NativeXr
Window
XMLHttpRequest)
XMLHttpRequest
Canvas)

# TODO: For some reason these don't work, so we specify these in the CMake command line args.
set_target_properties(BabylonNative PROPERTIES
Expand Down
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"semver": "^7.3.2"
},
"peerDependencies": {
"@babylonjs/core": "^5.0.0-alpha.22",
"@babylonjs/core": "^5.0.0-alpha.30",
"react": "^16.13.1",
"react-native": "^0.63.1",
"react-native-permissions": "^2.1.4"
Expand Down
1 change: 1 addition & 0 deletions Modules/@babylonjs/react-native/react-native-babylon.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Pod::Spec.new do |s|
'bgfx',
'bimg',
'bx',
'Canvas',
'GenericCodeGen',
'glslang',
'Graphics',
Expand Down
4 changes: 4 additions & 0 deletions Modules/@babylonjs/react-native/shared/BabylonNative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <Babylon/Plugins/NativeXr.h>
#include <Babylon/Polyfills/Window.h>
#include <Babylon/Polyfills/XMLHttpRequest.h>
#include <Babylon/Polyfills/Canvas.h>

#include <DispatchFunction.h>

Expand Down Expand Up @@ -53,6 +54,9 @@ namespace Babylon
// NOTE: React Native's XMLHttpRequest is slow and allocates a lot of memory. This does not override
// React Native's implementation, but rather adds a second one scoped to Babylon and used by WebRequest.ts.
Polyfills::XMLHttpRequest::Initialize(m_env);

// Initialize Canvas polyfill for text support
Polyfills::Canvas::Initialize(m_env);
}

~ReactNativeModule() override
Expand Down
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native/submodules/BabylonNative
Open in desktop
Submodule BabylonNative updated 38 files
+9 −9 .github/jobs/linux.yml
+4 −0 Apps/CMakeLists.txt
+24 −0 Apps/UnitTests/CMakeLists.txt
+27 −0 Apps/UnitTests/UnitTests.cpp
+ − Apps/ValidationTests/ReferenceImages/KernelBlur.png
+ − Apps/ValidationTests/ReferenceImages/RenderingGroupId.png
+ − Apps/ValidationTests/ReferenceImages/edges.png
+ − Apps/ValidationTests/ReferenceImages/fresnel.png
+ − Apps/ValidationTests/ReferenceImages/glTFAlphaBlend.png
+ − Apps/ValidationTests/ReferenceImages/glowlayerandlods.png
+ − Apps/ValidationTests/ReferenceImages/gltfMeshPrimitiveAttribute.png
+ − Apps/ValidationTests/ReferenceImages/gltfMeshPrimitiveVertexColor.png
+ − Apps/ValidationTests/ReferenceImages/gltfNodeAttribute1.png
+ − Apps/ValidationTests/ReferenceImages/instancedBones.png
+ − Apps/ValidationTests/ReferenceImages/nested_BBG.png
+ − Apps/ValidationTests/ReferenceImages/outline.png
+ − Apps/ValidationTests/ReferenceImages/softShadows.png
+ − Apps/ValidationTests/ReferenceImages/softShadowsRightHanded.png
+ − Apps/ValidationTests/ReferenceImages/spherepanel.png
+ − Apps/ValidationTests/ReferenceImages/visibility.png
+77 −0 Apps/ValidationTests/Scripts/config.json
+1 −9 Apps/ValidationTests/Scripts/text_rendering_test.js
+10 −5 Apps/ValidationTests/Scripts/validation_native.js
+2 −3 Apps/ValidationTests/iOS/LibNativeBridge.mm
+94 −20 Apps/package-lock.json
+4 −4 Apps/package.json
+12 −0 Core/Graphics/Source/FrameBuffer.cpp
+2 −0 Core/Graphics/Source/FrameBuffer.h
+1 −0 Core/Graphics/Source/FrameBufferManager.cpp
+1 −0 Dependencies/xr/Source/ARKit/XR.mm
+180 −79 Plugins/NativeEngine/Source/NativeEngine.cpp
+5 −6 Plugins/NativeEngine/Source/NativeEngine.h
+4 −4 Plugins/NativeEngine/Source/ShaderCompilerTraversers.cpp
+53 −11 Plugins/NativeXr/Source/NativeXr.cpp
+13 −2 Polyfills/Canvas/Source/Canvas.cpp
+3 −1 Polyfills/Canvas/Source/Canvas.h
+32 −13 Polyfills/Canvas/Source/Context.cpp
+2 −2 Polyfills/Canvas/Source/Context.h
3 changes: 3 additions & 0 deletions Package/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ Assembled/ios/libs/libOSDependent.a
Assembled/ios/libs/libXMLHttpRequest.a
Assembled/ios/libs/libUrlLib.a
Assembled/ios/libs/libastc-codec.a
Assembled/ios/libs/libCanvas.a
Assembled/ios/libs/libGenericCodeGen.a
Assembled/ios/libs/libspirv-cross-core.a
Assembled/ios/libs/libspirv-cross-msl.a
Expand Down Expand Up @@ -493,6 +494,8 @@ const build = gulp.series(buildIOS, buildAndroid, createIOSUniversalLibs, copyFi
const rebuild = gulp.series(clean, build);
const pack = gulp.series(rebuild, createPackage);

exports.validate = validate;

exports.buildIOS = buildIOS;
exports.buildAndroid = buildAndroid;
exports.createIOSUniversalLibs = createIOSUniversalLibs;
Expand Down
1 change: 1 addition & 0 deletions Package/iOS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ set(PACKAGED_LIBS
bgfx
bimg
bx
Canvas
GenericCodeGen
glslang
Graphics
Expand Down