Emscripten support #7510
Closed
Emscripten support #7510
+466
−127
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
It's hidden in the commit-checker log but |
glx22
reviewed
Apr 14, 2019
LordAro
previously requested changes
Apr 14, 2019
| @@ -14,8 +14,16 @@ | |||
|
|
|||
| #include "video_driver.hpp" | |||
|
|
|||
| #ifdef __EMSCRIPTEN__ | |||
| void em_loop(void *arg); | |||
There was a problem hiding this comment.
is there a particular reason not to make this a (conditional) class method? would save the duplicate friend definition
There was a problem hiding this comment.
It is called by function pointer by emscripten. Is it safe to assume that calling convention would match?
| @@ -42,6 +52,12 @@ class VideoDriver_SDL : public VideoDriver { | |||
| int PollEvent(); | |||
| bool CreateMainSurface(uint w, uint h); | |||
| void SetupKeyboard(); | |||
|
|
|||
| uint32 cur_ticks; | |||
There was a problem hiding this comment.
I don't like that these are necessary at all...
|
waiting for #7086 to merge both sdl1 and sdl2 emscripten changes at same time |
Milek7
force-pushed
the
ems1
branch
2 times, most recently
from
b6a5634 to
2280b2e
Compare
type macro from Squirrel code clashes with Emscripten math.h. This is likely Emscripten fault because it shouldn't define own identifiers without __ prefix, but, eh.
This reverts commit aa35052.
…'t call SDL_SetColors for 32bpp as it confuses Emscripten
9 tasks
|
Superseded by #8355 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is currently WIP, but I would appreciate feedback on it.
Libtimidity is restored with mixer output, Emscripten support is added and various fixes for Emscripten quirks are applied.
Dockerfile for build environment is here: https://github.com/Milek7/openttd-emscripten-dockerfile/tree/sdl1
It currently works on SDL1 on 32bpp blitter (8bpp blitter doesn't work, I suspect broken SDL palette support in emscripten shim). It doesn't look correct though, because html provides BGRA buffer and all blitters assume RGBA. Modifying
union Colourworks, but this is hacky solution.It works too on SDL2 branch, with significantly better performance, both on 8bpp (with correct colors) and 32bpp (same BGRA issue, but it is faster than 8bpp). Maybe this PR should wait on SDL2, as it works much better on it.
Network is handled by emscripten as WebSockets, both UDP and TCP. It requires proxy, like this one: https://gist.github.com/Milek7/b921ec9f8d875fe2d5a8b06bfd533834
sockaddr sizes and NetworkAddress comparing needs to be investigated, current workaround is to delete domain name after resolving, and comparing generated hostnames by strcmp. Using original code caused duplicated entries in gamelist as UDP queries received weren't matched to correct entry.