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.

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

mouse-click support in core_basic_screen_manager #23

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
29 changes: 27 additions & 2 deletions raylib.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class RaylibJs {
this.currentPressedKeyState = new Set();
this.currentMouseWheelMoveState = 0;
this.currentMousePosition = {x: 0, y: 0};
this.currentGestureState = 0;
this.quit = false;
}

Expand Down Expand Up @@ -59,6 +60,10 @@ class RaylibJs {
env: make_environment(this)
});

canvas.oncontextmenu = function(e) {
e.preventDefault();
};

const keyDown = (e) => {
this.currentPressedKeyState.add(glfwKeyMapping[e.code]);
};
Expand All @@ -71,10 +76,15 @@ class RaylibJs {
const mouseMove = (e) => {
this.currentMousePosition = {x: e.clientX, y: e.clientY};
};
const gestureTap = (e) => {
if (e.target.id === 'game')
this.currentGestureState = gestureMapping.GESTURE_TAP;
};
window.addEventListener("keydown", keyDown);
window.addEventListener("keyup", keyUp);
window.addEventListener("wheel", wheelMove);
window.addEventListener("mousemove", mouseMove);
window.addEventListener("mousedown", gestureTap);
tpby2005 marked this conversation as resolved.
Show resolved Hide resolved

this.wasm.instance.exports.main();
const next = (timestamp) => {
Expand Down Expand Up @@ -131,6 +141,7 @@ class RaylibJs {
this.prevPressedKeyState.clear();
this.prevPressedKeyState = new Set(this.currentPressedKeyState);
this.currentMouseWheelMoveState = 0.0;
this.currentGestureState = 0;
}

DrawCircleV(center_ptr, radius, color_ptr) {
Expand Down Expand Up @@ -178,8 +189,8 @@ class RaylibJs {
GetMouseWheelMove() {
return this.currentMouseWheelMoveState;
}
IsGestureDetected() {
return false;
IsGestureDetected(gesture) {
return this.currentGestureState === gesture;
}

TextFormat(... args){
Expand Down Expand Up @@ -364,6 +375,20 @@ const glfwKeyMapping = {
// GLFW_KEY_LAST GLFW_KEY_MENU
}

const gestureMapping = {
GESTURE_NONE: 0,
GESTURE_TAP: 1,
GESTURE_DOUBLETAP: 2,
GESTURE_HOLD: 4,
GESTURE_DRAG: 8,
GESTURE_SWIPE_RIGHT: 16,
GESTURE_SWIPE_LEFT: 32,
GESTURE_SWIPE_UP: 64,
GESTURE_SWIPE_DOWN: 128,
GESTURE_PINCH_IN: 256,
GESTURE_PINCH_OUT: 512
}

function cstrlen(mem, ptr) {
let len = 0;
while (mem[ptr] != 0) {
Expand Down