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

Jump to bottom

Native Validation Tests #60

Merged
merged 32 commits into from
Feb 12, 2020
Merged

Native Validation Tests #60

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
29cb5e6
squash commits
CedricGuillemet Dec 13, 2019
46da65d
validation scripts and config.json
CedricGuillemet Dec 16, 2019
0f2d829
removed 1 test
CedricGuillemet Dec 16, 2019
7f61db8
exit function
CedricGuillemet Dec 17, 2019
48c004a
removed screenshot test in experience.js
CedricGuillemet Dec 17, 2019
355367b
double include removed
CedricGuillemet Dec 17, 2019
a1738fc
Merge branch 'master' of https://github.com/BabylonJS/BabylonNative i…
CedricGuillemet Jan 3, 2020
ccb0ccf
exit testutils
CedricGuillemet Jan 3, 2020
c8336c2
testUtils resize window
CedricGuillemet Jan 3, 2020
9cf24c5
raw texture update
CedricGuillemet Jan 3, 2020
2f97e9e
set window title
CedricGuillemet Jan 3, 2020
9f30120
test write png
CedricGuillemet Jan 3, 2020
f051a0c
removed local tests config
CedricGuillemet Jan 7, 2020
0f000eb
ValidationTests App + reorganized projects
CedricGuillemet Jan 7, 2020
9f69efb
reverted babylon.max.js
CedricGuillemet Jan 7, 2020
6247522
removed irrelevant comment
CedricGuillemet Jan 7, 2020
4339560
Fix compilation errors
CedricGuillemet Jan 7, 2020
efbcbd7
relative path for Android native build
CedricGuillemet Jan 7, 2020
83e34ad
WIP PR feedback addressing
CedricGuillemet Jan 24, 2020
ddf8b55
Merge branch 'master' of https://github.com/BabylonJS/BabylonNative i…
CedricGuillemet Jan 24, 2020
c1ec2fe
static inline
CedricGuillemet Jan 24, 2020
afbcba3
runtimewin32 constructor parameters
CedricGuillemet Jan 24, 2020
dc88698
static_cast
CedricGuillemet Jan 24, 2020
0e4881c
Merge branch 'master' of https://github.com/BabylonJS/BabylonNative i…
CedricGuillemet Jan 28, 2020
fd14a71
merge master + PR feedback
CedricGuillemet Jan 28, 2020
ee0e01d
Merge branch 'canvasCapture' of https://github.com/CedricGuillemet/Ba…
CedricGuillemet Jan 28, 2020
7dde44a
s_ for static
CedricGuillemet Feb 3, 2020
1479e1d
Merge branch 'master' of https://github.com/BabylonJS/BabylonNative i…
CedricGuillemet Feb 4, 2020
5847e85
PR feedback
CedricGuillemet Feb 4, 2020
1d6d173
Merge branch 'master' of https://github.com/BabylonJS/BabylonNative i…
CedricGuillemet Feb 10, 2020
ab72974
BabylonScripts
CedricGuillemet Feb 10, 2020
7aa2cb6
char comparison
CedricGuillemet Feb 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 Apps/Babylonjs/babylon.glTF2FileLoader.js → ...BabylonScripts/babylon.glTF2FileLoader.js
View file
Open in desktop
File renamed without changes.
0 Apps/Babylonjs/babylon.max.js → Apps/BabylonScripts/babylon.max.js
View file
Open in desktop
File renamed without changes.
0 Apps/Babylonjs/babylonjs.materials.js → Apps/BabylonScripts/babylonjs.materials.js
View file
Open in desktop
File renamed without changes.
20 changes: 10 additions & 10 deletions Apps/Playground/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
set(SCRIPTS
"Scripts/experience.js"
"Scripts/playground_runner.js")
set(BABYLONJS
"../Babylonjs/babylon.glTF2FileLoader.js"
"../Babylonjs/babylon.max.js"
"../Babylonjs/babylonjs.materials.js")
set(BABYLONSCRIPTS
"../BabylonScripts/babylon.glTF2FileLoader.js"
"../BabylonScripts/babylon.max.js"
"../BabylonScripts/babylonjs.materials.js")

set(SOURCES
${SCRIPTS}
${BABYLONJS}
${BABYLONSCRIPTS}
"Shared/InputManager.cpp"
"Shared/InputManager.h")
if(WIN32 AND NOT WINDOWS_STORE)
Expand Down Expand Up @@ -75,8 +75,8 @@ elseif(APPLE)
endif()

set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${JSCORE_LIBRARY})
set(JSSCRIPT "${CMAKE_CURRENT_LIST_DIR}/../Babylonjs/babylon.glTF2FileLoader.js"
"${CMAKE_CURRENT_LIST_DIR}/../Babylonjs/babylon.max.js"
set(JSSCRIPT "${CMAKE_CURRENT_LIST_DIR}/../BabylonScripts/babylon.glTF2FileLoader.js"
"${CMAKE_CURRENT_LIST_DIR}/../BabylonScripts/babylon.max.js"
"${CMAKE_CURRENT_LIST_DIR}/Scripts/experience.js"
"${CMAKE_CURRENT_LIST_DIR}/Scripts/playground_runner.js")
set(RESOURCE_FILES ${STORYBOARD} ${JSSCRIPT})
Expand Down Expand Up @@ -150,10 +150,10 @@ if(APPLE)
endif()

if(WINDOWS_STORE)
set_property(SOURCE ${SCRIPTS} ${BABYLONJS} PROPERTY VS_DEPLOYMENT_CONTENT 1)
set_property(SOURCE ${SCRIPTS} ${BABYLONJS} PROPERTY VS_DEPLOYMENT_LOCATION "Scripts")
set_property(SOURCE ${SCRIPTS} ${BABYLONSCRIPTS} PROPERTY VS_DEPLOYMENT_CONTENT 1)
set_property(SOURCE ${SCRIPTS} ${BABYLONSCRIPTS} PROPERTY VS_DEPLOYMENT_LOCATION "Scripts")
else()
foreach(script ${SCRIPTS} ${BABYLONJS})
foreach(script ${SCRIPTS} ${BABYLONSCRIPTS})
get_filename_component(SCRIPT_NAME "${script}" NAME)
add_custom_command(
OUTPUT "Scripts/${SCRIPT_NAME}"
Expand Down
12 changes: 6 additions & 6 deletions Apps/ValidationTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
set(SCRIPTS "Scripts/validation_native.js")
set(BABYLONJS
"../Babylonjs/babylon.glTF2FileLoader.js"
"../Babylonjs/babylon.max.js"
"../Babylonjs/babylonjs.materials.js")
set(BABYLONSCRIPTS
"../BabylonScripts/babylon.glTF2FileLoader.js"
"../BabylonScripts/babylon.max.js"
"../BabylonScripts/babylonjs.materials.js")

set(SOURCES
${SCRIPTS}
${BABYLONJS}
${BABYLONSCRIPTS}
"Shared/TestUtils.h")
if(WIN32 AND NOT WINDOWS_STORE)
set(SOURCES
Expand Down Expand Up @@ -51,7 +51,7 @@ target_include_directories(ValidationTests PRIVATE "Source" "." ${TEST_DEPENDENC

target_link_libraries(ValidationTests PRIVATE Library ${ADDITIONAL_LIBRARIES})

foreach(script ${SCRIPTS} ${BABYLONJS})
foreach(script ${SCRIPTS} ${BABYLONSCRIPTS})
get_filename_component(SCRIPT_NAME "${script}" NAME)
add_custom_command(
OUTPUT "Scripts/${SCRIPT_NAME}"
Expand Down
2 changes: 1 addition & 1 deletion Library/Source/XMLHttpRequest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ namespace Babylon
return m_runtimeImpl.LoadUrlAsync<std::string>(m_url).then(arcana::inline_scheduler, m_runtimeImpl.Cancellation(), [this](const std::string& data)
{
// check UTF-8 BOM encoding
bghgary marked this conversation as resolved.
Show resolved Hide resolved
if (data.size() >= 3 && data[0] == int8_t(0xEF) && data[1] == int8_t(0xBB) && data[2] == int8_t(0xBF))
if (data.size() >= 3 && data[0] == '\xEF' && data[1] == '\xBB' && data[2] == '\xBF')
{
m_responseText = data.substr(3);
}
Expand Down