Skip to content

Fix InUseAttributeError in pointer lock #2170

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

Open
PANDAKO-GitHub wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix InUseAttributeError in pointer lock #2170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
225 changes: 222 additions & 3 deletions extensions/reviewed/MousePointerLock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"author": "PANDAKO-GitHub",
"category": "Input",
"dimension": "2D/3D",
"extensionNamespace": "",
"fullName": "Mouse Pointer Lock",
"gdevelopVersion": ">=5.5.222",
Expand All @@ -9,7 +10,7 @@
"name": "MousePointerLock",
"previewIconUrl": "https://resources.gdevelop-app.com/assets/Icons/Line Hero Pack/Master/SVG/Virtual Reality/Virtual Reality_360_rotate_vr_movement.svg",
"shortDescription": "Lock and hide mouse pointer for unlimited movement (e.g., FPS mouse look).",
"version": "0.3.0",
"version": "0.3.1",
"description": [
"This behavior removes the limit on the distance the mouse can move and hides the cursor.",
"",
Expand Down Expand Up @@ -68,6 +69,7 @@
"sentence": "",
"events": [
{
"disabled": true,
"type": "BuiltinCommonInstructions::JsCode",
"inlineCode": [
"class PointerLockHandler {",
Expand Down Expand Up @@ -130,6 +132,86 @@
],
"parameterObjects": "",
"useStrict": true,
"eventsSheetExpanded": false
},
{
"type": "BuiltinCommonInstructions::JsCode",
"inlineCode": [
"class PointerLockHandler {",
" movementX = 0;",
" movementY = 0;",
" pending = false;",
" retried = false;",
" /** @type {gdjs.RuntimeGame} */",
" game;",
"",
" /** @param {gdjs.RuntimeGame} game */",
" constructor(game) {",
" this.game = game;",
" const canvas = game.getRenderer().getCanvas();",
"",
" canvas.addEventListener(\"pointermove\", event => {",
" if (document.pointerLockElement) {",
" this.movementX += event.movementX || 0;",
" this.movementY += event.movementY || 0;",
" }",
" }, false);",
"",
" document.addEventListener(\"pointerlockchange\", () => {",
" this.pending = false;",
" });",
"",
" document.addEventListener(\"pointerlockerror\", () => {",
" this.pending = false;",
" if (!this.retried && !document.pointerLockElement) {",
" this.retried = true;",
" this._doLock(false);",
" }",
" });",
" }",
"",
" _doLock(unadjusted) {",
" const canvas = this.game.getRenderer().getCanvas();",
" if (!canvas.requestPointerLock) return;",
" if (document.pointerLockElement === canvas || this.pending) return;",
"",
" this.pending = true;",
" const result = unadjusted",
" ? canvas.requestPointerLock({ unadjustedMovement: true })",
" : canvas.requestPointerLock();",
"",
" if (result && typeof result.then === \"function\") {",
" result",
" .then(() => { this.pending = false; })",
" .catch(() => { this.pending = false; });",
" }",
" }",
"",
" requestPointerLock() {",
" this.retried = false;",
" this._doLock(true);",
" }",
"",
" exitPointerLock() {",
" if (document.exitPointerLock) {",
" document.exitPointerLock();",
" }",
" }",
"",
" isPointerLocked() {",
" return !!document.pointerLockElement;",
" }",
"",
" resetMovement() {",
" this.movementX = 0;",
" this.movementY = 0;",
" }",
"}",
"",
"gdjs._MousePointerLockExtension = { handler: new PointerLockHandler(runtimeScene.getGame()) };"
],
"parameterObjects": "",
"useStrict": true,
"eventsSheetExpanded": true
}
],
Expand Down Expand Up @@ -778,12 +860,68 @@
"objectGroups": []
}
],
"eventsFunctionsFolderStructure": {
"folderName": "__ROOT",
"children": [
{
"functionName": "onFirstSceneLoaded"
},
{
"functionName": "onScenePostEvents"
},
{
"functionName": "RequestPointerLock"
},
{
"functionName": "ExitPointerLock"
},
{
"functionName": "isPointerLocked"
},
{
"functionName": "isPointerActuallyLocked"
},
{
"functionName": "isEmulatingPointerLock"
},
{
"functionName": "IsMoving"
},
{
"functionName": "MovementX"
},
{
"functionName": "SetMovementX"
},
{
"functionName": "MovementY"
},
{
"functionName": "SetMovementY"
},
{
"functionName": "TouchX"
},
{
"functionName": "TouchY"
},
{
"functionName": "TouchSpeedFactor"
},
{
"functionName": "SetTouchSpeedFactor"
}
]
},
"eventsBasedBehaviors": [
{
"description": "Control camera rotations with a mouse.",
"fullName": "First person camera mouse mapper",
"helpPath": "",
"iconUrl": "",
"name": "FirstPersonPointerMapper",
"objectType": "",
"previewIconUrl": "",
"eventsFunctions": [
{
"fullName": "",
Expand Down Expand Up @@ -1058,6 +1196,7 @@
"fullName": "",
"functionType": "ActionWithOperator",
"getterName": "HorizontalSpeed",
"group": "First person camera mouse mapper configuration",
"name": "SetHorizontalSpeed",
"sentence": "",
"events": [
Expand Down Expand Up @@ -1138,6 +1277,7 @@
"fullName": "",
"functionType": "ActionWithOperator",
"getterName": "VerticalSpeed",
"group": "First person camera mouse mapper configuration",
"name": "SetVerticalSpeed",
"sentence": "",
"events": [
Expand Down Expand Up @@ -1218,6 +1358,7 @@
"fullName": "",
"functionType": "ActionWithOperator",
"getterName": "VerticalAngleMin",
"group": "First person camera mouse mapper configuration",
"name": "SetVerticalAngleMin",
"sentence": "",
"events": [
Expand Down Expand Up @@ -1298,6 +1439,7 @@
"fullName": "",
"functionType": "ActionWithOperator",
"getterName": "VerticalAngleMax",
"group": "First person camera mouse mapper configuration",
"name": "SetVerticalAngleMax",
"sentence": "",
"events": [
Expand Down Expand Up @@ -1378,6 +1520,7 @@
"fullName": "",
"functionType": "ActionWithOperator",
"getterName": "OffsetZ",
"group": "First person camera mouse mapper configuration",
"name": "SetOffsetZ",
"sentence": "",
"events": [
Expand Down Expand Up @@ -1414,6 +1557,57 @@
"objectGroups": []
}
],
"eventsFunctionsFolderStructure": {
"folderName": "__ROOT",
"children": [
{
"functionName": "doStepPreEvents"
},
{
"folderName": "Layers and cameras",
"children": [
{
"functionName": "LookFromObjectEyes"
}
]
},
{
"folderName": "First person camera mouse mapper configuration",
"children": [
{
"functionName": "HorizontalSpeed"
},
{
"functionName": "SetHorizontalSpeed"
},
{
"functionName": "VerticalSpeed"
},
{
"functionName": "SetVerticalSpeed"
},
{
"functionName": "VerticalAngleMin"
},
{
"functionName": "SetVerticalAngleMin"
},
{
"functionName": "VerticalAngleMax"
},
{
"functionName": "SetVerticalAngleMax"
},
{
"functionName": "OffsetZ"
},
{
"functionName": "SetOffsetZ"
}
]
}
]
},
"propertyDescriptors": [
{
"value": "",
Expand Down Expand Up @@ -1467,8 +1661,33 @@
"name": "ShouldLock"
}
],
"sharedPropertyDescriptors": []
"propertiesFolderStructure": {
"folderName": "__ROOT",
"children": [
{
"propertyName": "Object3D"
},
{
"propertyName": "HorizontalSpeed"
},
{
"propertyName": "VerticalSpeed"
},
{
"propertyName": "VerticalAngleMin"
},
{
"propertyName": "VerticalAngleMax"
},
{
"propertyName": "OffsetZ"
},
{
"propertyName": "ShouldLock"
}
]
}
}
],
"eventsBasedObjects": []
}
}