Skip to content

Commit ce90677

Browse files
ofTheoofTheo
authored
Revert "Emscripten 3.1.65 fix (#8067)"
This reverts commit b7c5147.
1 parent ba02087 commit ce90677

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎addons/ofxEmscripten/src/ofxAppEmscriptenWindow.cpp

+38-38
Original file line numberDiff line numberDiff line change
@@ -28,43 +28,43 @@ ofxAppEmscriptenWindow::~ofxAppEmscriptenWindow() {
2828

2929
//------------------------------------------------------------
3030
void ofxAppEmscriptenWindow::setup(const ofGLESWindowSettings & settings){
31-
setWindowShape(settings.getWidth(),settings.getHeight());
31+
setWindowShape(settings.getWidth(),settings.getHeight());
3232

33-
EmscriptenWebGLContextAttributes attrs;
34-
emscripten_webgl_init_context_attributes(&attrs);
33+
EmscriptenWebGLContextAttributes attrs;
34+
emscripten_webgl_init_context_attributes(&attrs);
3535

3636
/// when setting explicitSwapControl to 0 it is emscripten that is in charge of swapping on each render call.
37-
attrs.explicitSwapControl = 0;
38-
attrs.depth = 1;
39-
attrs.stencil = 1;
40-
attrs.antialias = 1;
41-
attrs.majorVersion = 2;
42-
attrs.minorVersion = 0;
43-
attrs.alpha = 0;
44-
45-
context = emscripten_webgl_create_context("#canvas", &attrs);
46-
assert(context);
37+
attrs.explicitSwapControl = 0;
38+
attrs.depth = 1;
39+
attrs.stencil = 1;
40+
attrs.antialias = 1;
41+
attrs.majorVersion = 2;
42+
attrs.minorVersion = 0;
43+
attrs.alpha = 0;
44+
45+
context = emscripten_webgl_create_context("#canvas", &attrs);
46+
assert(context);
4747

48-
makeCurrent();
48+
makeCurrent();
4949

50-
_renderer = std::make_shared<ofGLProgrammableRenderer>(this);
51-
((ofGLProgrammableRenderer*)_renderer.get())->setup(2,0);
50+
_renderer = std::make_shared<ofGLProgrammableRenderer>(this);
51+
((ofGLProgrammableRenderer*)_renderer.get())->setup(2,0);
5252

53-
emscripten_set_keydown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &keydown_cb);
54-
emscripten_set_keyup_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &keyup_cb);
53+
emscripten_set_keydown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&keydown_cb);
54+
emscripten_set_keyup_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&keyup_cb);
5555

56-
emscripten_set_mousedown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &mousedown_cb);
57-
emscripten_set_mouseup_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &mouseup_cb);
58-
emscripten_set_mousemove_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &mousemoved_cb);
59-
emscripten_set_mouseenter_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &mouseenter_cb);
60-
emscripten_set_mouseleave_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &mouseleave_cb);
61-
62-
emscripten_set_touchstart_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &touch_cb);
63-
emscripten_set_touchend_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &touch_cb);
64-
emscripten_set_touchmove_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &touch_cb);
65-
emscripten_set_touchcancel_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &touch_cb);
56+
emscripten_set_mousedown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&mousedown_cb);
57+
emscripten_set_mouseup_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&mouseup_cb);
58+
emscripten_set_mousemove_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&mousemoved_cb);
59+
emscripten_set_mouseenter_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&mouseenter_cb);
60+
emscripten_set_mouseleave_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&mouseleave_cb);
61+
62+
emscripten_set_touchstart_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&touch_cb);
63+
emscripten_set_touchend_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&touch_cb);
64+
emscripten_set_touchmove_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&touch_cb);
65+
emscripten_set_touchcancel_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&touch_cb);
6666

67-
emscripten_set_wheel_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, &mousescrolled_cb);
67+
emscripten_set_wheel_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW,this,1,&mousescrolled_cb);
6868

6969
// the following locks up the window for some reason.....
7070
//emscripten_set_resize_callback(const char *target, void *userData, EM_BOOL useCapture, em_ui_callback_func callback)
@@ -163,7 +163,7 @@ void ofxAppEmscriptenWindow::display_cb(){
163163
}
164164

165165
//------------------------------------------------------------
166-
EM_BOOL ofxAppEmscriptenWindow::keydown_cb(int eventType, const EmscriptenKeyboardEvent * keyEvent, void * userData) {
166+
int ofxAppEmscriptenWindow::keydown_cb(int eventType, const EmscriptenKeyboardEvent *keyEvent, void *userData){
167167
int key = keyEvent->key[0];
168168
std::string id = keyEvent->key;
169169
if(key == 0){
@@ -254,7 +254,7 @@ EM_BOOL ofxAppEmscriptenWindow::keydown_cb(int eventType, const EmscriptenKeyboa
254254
}
255255

256256
//------------------------------------------------------------
257-
EM_BOOL ofxAppEmscriptenWindow::keyup_cb(int eventType, const EmscriptenKeyboardEvent * keyEvent, void * userData) {
257+
int ofxAppEmscriptenWindow::keyup_cb(int eventType, const EmscriptenKeyboardEvent *keyEvent, void *userData){
258258
int key = keyEvent->key[0];
259259
std::string id = keyEvent->key;
260260
if(key == 0){
@@ -345,7 +345,7 @@ EM_BOOL ofxAppEmscriptenWindow::keyup_cb(int eventType, const EmscriptenKeyboard
345345
}
346346

347347
//------------------------------------------------------------
348-
EM_BOOL ofxAppEmscriptenWindow::mousedown_cb(int eventType, const EmscriptenMouseEvent * mouseEvent, void * userData) {
348+
int ofxAppEmscriptenWindow::mousedown_cb(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData){
349349
float mouseX = mouseEvent->targetX - EM_ASM_INT(return canvas.getBoundingClientRect().left);
350350
float mouseY = mouseEvent->targetY - EM_ASM_INT(return canvas.getBoundingClientRect().top);
351351
int canvasWidth, canvasHeight;
@@ -359,7 +359,7 @@ EM_BOOL ofxAppEmscriptenWindow::mousedown_cb(int eventType, const EmscriptenMous
359359
}
360360

361361
//------------------------------------------------------------
362-
EM_BOOL ofxAppEmscriptenWindow::mouseup_cb(int eventType, const EmscriptenMouseEvent * mouseEvent, void * userData) {
362+
int ofxAppEmscriptenWindow::mouseup_cb(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData){
363363
float mouseX = mouseEvent->targetX - EM_ASM_INT(return canvas.getBoundingClientRect().left);
364364
float mouseY = mouseEvent->targetY - EM_ASM_INT(return canvas.getBoundingClientRect().top);
365365
int canvasWidth, canvasHeight;
@@ -373,7 +373,7 @@ EM_BOOL ofxAppEmscriptenWindow::mouseup_cb(int eventType, const EmscriptenMouseE
373373
}
374374

375375
//------------------------------------------------------------
376-
EM_BOOL ofxAppEmscriptenWindow::mousemoved_cb(int eventType, const EmscriptenMouseEvent * mouseEvent, void * userData) {
376+
int ofxAppEmscriptenWindow::mousemoved_cb(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData){
377377
float mouseX = mouseEvent->targetX - EM_ASM_INT(return canvas.getBoundingClientRect().left);
378378
float mouseY = mouseEvent->targetY - EM_ASM_INT(return canvas.getBoundingClientRect().top);
379379
int canvasWidth, canvasHeight;
@@ -393,13 +393,13 @@ EM_BOOL ofxAppEmscriptenWindow::mousemoved_cb(int eventType, const EmscriptenMou
393393
}
394394

395395
//------------------------------------------------------------
396-
EM_BOOL ofxAppEmscriptenWindow::mousescrolled_cb(int eventType, const EmscriptenWheelEvent * wheelEvent, void * userData) {
396+
int ofxAppEmscriptenWindow::mousescrolled_cb(int eventType, const EmscriptenWheelEvent *wheelEvent, void *userData){
397397
instance->events().notifyMouseScrolled(ofGetMouseX(), ofGetMouseY(), wheelEvent->deltaX / 100, wheelEvent->deltaY / 100);
398398
return 0;
399399
}
400400

401401
//------------------------------------------------------------
402-
EM_BOOL ofxAppEmscriptenWindow::mouseenter_cb(int eventType, const EmscriptenMouseEvent * mouseEvent, void * userData) {
402+
int ofxAppEmscriptenWindow::mouseenter_cb(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData){
403403
float mouseX = mouseEvent->targetX - EM_ASM_INT(return canvas.getBoundingClientRect().left);
404404
float mouseY = mouseEvent->targetY - EM_ASM_INT(return canvas.getBoundingClientRect().top);
405405
int canvasWidth, canvasHeight;
@@ -411,7 +411,7 @@ EM_BOOL ofxAppEmscriptenWindow::mouseenter_cb(int eventType, const EmscriptenMou
411411
}
412412

413413
//------------------------------------------------------------
414-
EM_BOOL ofxAppEmscriptenWindow::mouseleave_cb(int eventType, const EmscriptenMouseEvent * mouseEvent, void * userData) {
414+
int ofxAppEmscriptenWindow::mouseleave_cb(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData){
415415
float mouseX = mouseEvent->targetX - EM_ASM_INT(return canvas.getBoundingClientRect().left);
416416
float mouseY = mouseEvent->targetY - EM_ASM_INT(return canvas.getBoundingClientRect().top);
417417
int canvasWidth, canvasHeight;
@@ -423,7 +423,7 @@ EM_BOOL ofxAppEmscriptenWindow::mouseleave_cb(int eventType, const EmscriptenMou
423423
}
424424

425425
//------------------------------------------------------------
426-
EM_BOOL ofxAppEmscriptenWindow::touch_cb(int eventType, const EmscriptenTouchEvent * e, void * userData) {
426+
int ofxAppEmscriptenWindow::touch_cb(int eventType, const EmscriptenTouchEvent* e, void* userData) {
427427
float boundingX = EM_ASM_INT(return canvas.getBoundingClientRect().left);
428428
float boundingY = EM_ASM_INT(return canvas.getBoundingClientRect().top);
429429
int canvasWidth, canvasHeight;

‎addons/ofxEmscripten/src/ofxAppEmscriptenWindow.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,18 @@ class ofxAppEmscriptenWindow: public ofAppBaseGLESWindow {
8484

8585
// static int getUniqueId();
8686
static void display_cb();
87-
static EM_BOOL keydown_cb(int eventType, const EmscriptenKeyboardEvent * keyEvent, void * userData);
88-
static EM_BOOL keyup_cb(int eventType, const EmscriptenKeyboardEvent * keyEvent, void * userData);
87+
static int keydown_cb(int eventType, const EmscriptenKeyboardEvent *keyEvent, void *userData);
88+
static int keyup_cb(int eventType, const EmscriptenKeyboardEvent *keyEvent, void *userData);
8989

90-
static EM_BOOL mousedown_cb(int eventType, const EmscriptenMouseEvent * mouseEvent, void * userData);
91-
static EM_BOOL mouseup_cb(int eventType, const EmscriptenMouseEvent * mouseEvent, void * userData);
92-
static EM_BOOL mousemoved_cb(int eventType, const EmscriptenMouseEvent * mouseEvent, void * userData);
93-
static EM_BOOL mouseenter_cb(int eventType, const EmscriptenMouseEvent * mouseEvent, void * userData);
94-
static EM_BOOL mouseleave_cb(int eventType, const EmscriptenMouseEvent * mouseEvent, void * userData);
90+
static int mousedown_cb(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData);
91+
static int mouseup_cb(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData);
92+
static int mousemoved_cb(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData);
93+
static int mouseenter_cb(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData);
94+
static int mouseleave_cb(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData);
9595

96-
static EM_BOOL touch_cb(int eventType, const EmscriptenTouchEvent * touchEvent, void * userData);
96+
static int touch_cb(int eventType, const EmscriptenTouchEvent *touchEvent, void *userData);
9797

98-
static EM_BOOL mousescrolled_cb(int eventType, const EmscriptenWheelEvent * wheelEvent, void * userData);
98+
static int mousescrolled_cb(int eventType, const EmscriptenWheelEvent *wheelEvent, void *userData);
9999

100100
static EM_BOOL emscripten_game_window_resized_callback(int eventType, const void *reserved, void *userData);
101101

0 commit comments

Comments
 (0)