Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
69c0d32b
Unverified
Commit
69c0d32b
authored
Feb 24, 2019
by
Rémi Verschelde
Committed by
GitHub
Feb 24, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #26240 from eska014/html5-preload-noown
Properly preload files, always use stdout/-err in HTML5 platform
parents
61b41d60
76522624
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
13 deletions
+10
-13
audio_driver_javascript.cpp
platform/javascript/audio_driver_javascript.cpp
+1
-1
detect.py
platform/javascript/detect.py
+0
-4
engine.js
platform/javascript/engine.js
+2
-1
http_request.js
platform/javascript/http_request.js
+3
-3
javascript_eval.cpp
platform/javascript/javascript_eval.cpp
+2
-2
os_javascript.cpp
platform/javascript/os_javascript.cpp
+2
-2
No files found.
platform/javascript/audio_driver_javascript.cpp
View file @
69c0d32b
...
...
@@ -209,7 +209,7 @@ Error AudioDriverJavaScript::capture_start() {
}
function
gotMediaInputError
(
e
)
{
console
.
log
(
e
);
out
(
e
);
}
if
(
navigator
.
mediaDevices
.
getUserMedia
)
{
...
...
platform/javascript/detect.py
View file @
69c0d32b
...
...
@@ -129,10 +129,6 @@ def configure(env):
# us since we don't know requirements at compile-time.
env
.
Append
(
LINKFLAGS
=
[
'-s'
,
'ALLOW_MEMORY_GROWTH=1'
])
# Since we use both memory growth and MEMFS preloading,
# this avoids unnecessary copying on start-up.
env
.
Append
(
LINKFLAGS
=
[
'--no-heap-copy'
])
# This setting just makes WebGL 2 APIs available, it does NOT disable WebGL 1.
env
.
Append
(
LINKFLAGS
=
[
'-s'
,
'USE_WEBGL2=1'
])
...
...
platform/javascript/engine.js
View file @
69c0d32b
...
...
@@ -199,7 +199,8 @@
}
LIBS
.
FS
.
mkdirTree
(
dir
);
}
LIBS
.
FS
.
createDataFile
(
'/'
,
file
.
path
,
new
Uint8Array
(
file
.
buffer
),
true
,
true
,
true
);
// With memory growth, canOwn should be false.
LIBS
.
FS
.
createDataFile
(
file
.
path
,
null
,
new
Uint8Array
(
file
.
buffer
),
true
,
true
,
false
);
},
this
);
preloadedFiles
=
null
;
...
...
platform/javascript/http_request.js
View file @
69c0d32b
...
...
@@ -82,7 +82,7 @@ var GodotHTTPRequest = {
godot_xhr_send_string
:
function
(
xhrId
,
strPtr
)
{
if
(
!
strPtr
)
{
console
.
warn
(
"Failed to send string per XHR: null pointer"
);
err
(
"Failed to send string per XHR: null pointer"
);
return
;
}
GodotHTTPRequest
.
requests
[
xhrId
].
send
(
UTF8ToString
(
strPtr
));
...
...
@@ -90,11 +90,11 @@ var GodotHTTPRequest = {
godot_xhr_send_data
:
function
(
xhrId
,
ptr
,
len
)
{
if
(
!
ptr
)
{
console
.
warn
(
"Failed to send data per XHR: null pointer"
);
err
(
"Failed to send data per XHR: null pointer"
);
return
;
}
if
(
len
<
0
)
{
console
.
warn
(
"Failed to send data per XHR: buffer length less than 0"
);
err
(
"Failed to send data per XHR: buffer length less than 0"
);
return
;
}
GodotHTTPRequest
.
requests
[
xhrId
].
send
(
HEAPU8
.
subarray
(
ptr
,
ptr
+
len
));
...
...
platform/javascript/javascript_eval.cpp
View file @
69c0d32b
...
...
@@ -69,7 +69,7 @@ Variant JavaScript::eval(const String &p_code, bool p_use_global_exec_context) {
eval_ret
=
eval
(
UTF8ToString
(
CODE
));
}
}
catch
(
e
)
{
console
.
warn
(
e
);
err
(
e
);
eval_ret
=
null
;
}
...
...
@@ -97,7 +97,7 @@ Variant JavaScript::eval(const String &p_code, bool p_use_global_exec_context) {
if
(
array_ptr
!==
0
)
{
_free
(
array_ptr
)
}
console
.
warn
(
e
);
err
(
e
);
// fall through
}
break
;
...
...
platform/javascript/os_javascript.cpp
View file @
69c0d32b
...
...
@@ -986,8 +986,8 @@ bool OS_JavaScript::main_loop_iterate() {
if
(
sync_wait_time
<
0
)
{
/* clang-format off */
EM_ASM
(
FS
.
syncfs
(
function
(
err
)
{
if
(
err
)
{
console
.
warn
(
'
Failed
to
save
IDB
file
system
:
'
+
er
r
.
message
);
}
FS
.
syncfs
(
function
(
err
or
)
{
if
(
err
or
)
{
err
(
'
Failed
to
save
IDB
file
system
:
'
+
erro
r
.
message
);
}
});
);
/* clang-format on */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment