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

Fix emscripten #452

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix emscripten #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e8b0c9
fix load newer versions of emcc
capocasa Dec 8, 2020
062f58c
halt SDL loop on unhandled exception for easier debugging
capocasa Dec 8, 2020
19f7382
update callback selectors to latest enscripten
capocasa Dec 9, 2020
c8d9f4e
work around debug output
capocasa Dec 9, 2020
b1cce85
fix suspicious log message
capocasa Dec 9, 2020
55df9b5
enable using timestamp-less bindjs
capocasa Dec 9, 2020
19b4116
use expected selector
capocasa Dec 9, 2020
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: 2 additions & 0 deletions nimx/naketools.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,8 @@ proc build*(b: Builder) =
if not b.debugMode:
b.additionalCompilerFlags.add("-Oz")

b.additionalLinkerFlags.add(["-s", "FORCE_FILESYSTEM=1"])

if b.platform == "emscripten":
if not b.disableClosureCompiler:
b.additionalLinkerFlags.add("-Oz")
Expand Down
60 changes: 40 additions & 20 deletions nimx/private/windows/emscripten_window.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ import unicode, times, logging
import jsbind, jsbind/emscripten
import nimx/private/js_vk_map

import system, system/ansi_c

proc globalExceptionHandler(errorMsg: string) =
cstderr.rawWrite(errorMsg)
emscripten_cancel_main_loop()

onUnhandledException = globalExceptionHandler

type EmscriptenWindow* = ref object of Window
ctx: EMSCRIPTEN_WEBGL_CONTEXT_HANDLE
renderingContext: GraphicsContext
Expand Down Expand Up @@ -76,6 +84,10 @@ method `fullscreen=`*(w: EmscriptenWindow, v: bool) =
method animationStateChanged*(w: EmscriptenWindow, flag: bool) =
discard

template sdlNow():uint32 =
let t = getTime()
uint32(t.toUnix * 1000 + t.nanosecond div 1000000)

proc getCanvasDimensions(id: cstring, cssRect: var Rect, virtualSize: var Size) {.inline.} =
discard EM_ASM_INT("""
var c = document.getElementById(UTF8ToString($0));
Expand Down Expand Up @@ -112,7 +124,7 @@ proc onMouseButton(eventType: cint, mouseEvent: ptr EmscriptenMouseEvent, userDa
else: VirtualKey.Unknown

let point = eventLocationFromJSEvent(mouseEvent, w, false)
var evt = newMouseButtonEvent(point, bcFromE(), bs, uint32(mouseEvent.timestamp))
var evt = newMouseButtonEvent(point, bcFromE(), bs, sdlNow())
evt.window = w
if mainApplication().handleEvent(evt): result = 1

Expand Down Expand Up @@ -152,7 +164,7 @@ proc onTouchEnd(eventType: cint, touchEvent: ptr EmscriptenTouchEvent, userData:
proc onMouseMove(eventType: cint, mouseEvent: ptr EmscriptenMouseEvent, userData: pointer): EM_BOOL {.cdecl.} =
let w = cast[EmscriptenWindow](userData)
let point = eventLocationFromJSEvent(mouseEvent, w, false)
var evt = newMouseMoveEvent(point, uint32(mouseEvent.timestamp))
var evt = newMouseMoveEvent(point, sdlNow())
evt.window = w
if mainApplication().handleEvent(evt): result = 1

Expand Down Expand Up @@ -310,34 +322,41 @@ proc initCommon(w: EmscriptenWindow, r: view.Rect) =
attrs.alpha = 0
attrs.antialias = 0
attrs.stencil = 1
w.ctx = emscripten_webgl_create_context(w.canvasId, addr attrs)

# emscripten special selector, keep in sync with EMSCRIPTEN_EVENT_TARGET_DOCUMENT
# and EMSCRIPTEN_EVENT_TARGET_WINDOW in emscripten html.h
const documentSelector = "1"
const windowSelector = "2"
# regular css selector for the canvas
let canvasSelector = "#" & w.canvasId

w.ctx = emscripten_webgl_create_context(canvasSelector, addr attrs)
if w.ctx <= 0:
raise newException(Exception, "Could not create WebGL context: " & $w.ctx)
discard emscripten_webgl_make_context_current(w.ctx)
w.renderingContext = newGraphicsContext()

const docID = "#document"
discard emscripten_set_mousedown_callback(docID, cast[pointer](w), 0, onMouseDown)
discard emscripten_set_mouseup_callback(docID, cast[pointer](w), 0, onMouseUp)
discard emscripten_set_mousemove_callback(docID, cast[pointer](w), 0, onMouseMove)
discard emscripten_set_wheel_callback(w.canvasId, cast[pointer](w), 0, onMouseWheel)
discard emscripten_set_mousedown_callback(documentSelector, cast[pointer](w), 0, onMouseDown)
discard emscripten_set_mouseup_callback(documentSelector, cast[pointer](w), 0, onMouseUp)
discard emscripten_set_mousemove_callback(documentSelector, cast[pointer](w), 0, onMouseMove)
discard emscripten_set_wheel_callback(documentSelector, cast[pointer](w), 0, onMouseWheel)

discard emscripten_set_touchstart_callback(docID, cast[pointer](w), 0, onTouchStart)
discard emscripten_set_touchmove_callback(docID, cast[pointer](w), 0, onTouchMove)
discard emscripten_set_touchend_callback(docID, cast[pointer](w), 0, onTouchEnd)
discard emscripten_set_touchcancel_callback(docID, cast[pointer](w), 0, onTouchEnd)
discard emscripten_set_touchstart_callback(documentSelector, cast[pointer](w), 0, onTouchStart)
discard emscripten_set_touchmove_callback(documentSelector, cast[pointer](w), 0, onTouchMove)
discard emscripten_set_touchend_callback(documentSelector, cast[pointer](w), 0, onTouchEnd)
discard emscripten_set_touchcancel_callback(documentSelector, cast[pointer](w), 0, onTouchEnd)

discard emscripten_set_keydown_callback(docID, cast[pointer](w), 1, onKeyDown)
discard emscripten_set_keyup_callback(docID, cast[pointer](w), 1, onKeyUp)
discard emscripten_set_keydown_callback(documentSelector, cast[pointer](w), 1, onKeyDown)
discard emscripten_set_keyup_callback(documentSelector, cast[pointer](w), 1, onKeyUp)

discard emscripten_set_blur_callback(nil, cast[pointer](w), 1, onBlur)
discard emscripten_set_focus_callback(nil, cast[pointer](w), 1, onFocus)
discard emscripten_set_blur_callback(windowSelector, cast[pointer](w), 1, onBlur)
discard emscripten_set_focus_callback(windowSelector, cast[pointer](w), 1, onFocus)

discard emscripten_set_webglcontextlost_callback(w.canvasId, cast[pointer](w), 0, onContextLost)
discard emscripten_set_webglcontextlost_callback(canvasSelector, cast[pointer](w), 0, onContextLost)

discard emscripten_set_fullscreenchange_callback(docId, cast[pointer](w), 0, onFullscreenChange)
discard emscripten_set_fullscreenchange_callback(documentSelector, cast[pointer](w), 0, onFullscreenChange)

discard emscripten_set_resize_callback(nil, cast[pointer](w), 0, onResize)
discard emscripten_set_resize_callback(windowSelector, cast[pointer](w), 0, onResize)

discard emscripten_set_orientationchange_callback(cast[pointer](w), 0, onOrientationChanged)

Expand Down Expand Up @@ -388,7 +407,8 @@ method onResize*(w: EmscriptenWindow, newSize: Size) =
w.pixelRatio = screenScaleFactor()
glViewport(0, 0, GLSizei(newSize.width * w.pixelRatio), GLsizei(newSize.height * w.pixelRatio))

info "EmscriptenWindow onResize viewport ", newSize.width * w.pixelRatio, " ", newSize.height * w.pixelRatio
#TODO: figure out why info creates UTF8ToString() error and single char garbage output
echo "EmscriptenWindow onResize viewport ", $(newSize.width * w.pixelRatio), " ", $(newSize.height * w.pixelRatio)
procCall w.Window.onResize(newSize)

proc nimx_OnTextInput(wnd: pointer, text: cstring) {.EMSCRIPTEN_KEEPALIVE.} =
Expand Down