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

Gizmo Ortho Rotation fixes #6027

Merged
merged 4 commits into from
Jan 30, 2024
Merged

Gizmo Ortho Rotation fixes #6027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84e564b
fixed orthgraphic rotation speed
kpal81xd Jan 30, 2024
3e82b33
modified facing logic or orthographic to mimic camera rotation; added…
kpal81xd Jan 30, 2024
c6ede5c
removed lookAt testing code
kpal81xd Jan 30, 2024
5684374
handled divide by zero edge case
kpal81xd Jan 30, 2024
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
20 changes: 18 additions & 2 deletions examples/src/examples/misc/gizmos.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ function controls({ observer, ReactPCUI, React, jsx, fragment }) {
// @ts-ignore
window.setType = (/** @type {string} */ value) => setType(value);

// @ts-ignore
window.setProj = (/** @type {number} */ value) => setProj(value);

return fragment(
jsx(Panel, { headerText: 'Transform' },
jsx(LabelGroup, { text: 'Type' },
Expand Down Expand Up @@ -211,7 +214,7 @@ function controls({ observer, ReactPCUI, React, jsx, fragment }) {
],
binding: new BindingTwoWay(),
link: { observer, path: 'camera.proj' },
onSelect: value => setProj((parseInt(value) || 0) - 1)
onSelect: value => setProj((parseInt(value) || 1) - 1)
})
),
(proj === pc.PROJECTION_PERSPECTIVE) &&
Expand Down Expand Up @@ -546,14 +549,21 @@ async function example({ pcx, canvas, deviceType, data, glslangPath, twgslPath,
gizmoHandler.add(box);
this.focus();

// Change gizmo mode keybinds
// wrappers for control state changes
const setType = (/** @type {string} */ value) => {
data.set('gizmo.type', value);

// call method from top context (same as controls)
// @ts-ignore
window.top.setType(value);
};
const setProj = (/** @type {number} */ value) => {
data.set('camera.proj', value + 1);

// call method from top context (same as controls)
// @ts-ignore
window.top.setProj(value);
};

const keydown = (/** @type {KeyboardEvent} */ e) => {
gizmoHandler.gizmo.snap = !!e.shiftKey;
Expand All @@ -577,6 +587,12 @@ async function example({ pcx, canvas, deviceType, data, glslangPath, twgslPath,
case '3':
setType('scale');
break;
case 'p':
setProj(pc.PROJECTION_PERSPECTIVE);
break;
case 'o':
setProj(pc.PROJECTION_ORTHOGRAPHIC);
break;
}
};
window.addEventListener('keydown', keydown);
Expand Down
29 changes: 20 additions & 9 deletions extras/gizmo/rotate-gizmo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
PROJECTION_PERSPECTIVE,
math,
Color,
Quat,
Expand Down Expand Up @@ -183,9 +184,8 @@ class RotateGizmo extends TransformGizmo {
});

app.on('update', () => {
const cameraPos = this._camera.entity.getPosition();
this._faceAxisLookAt(cameraPos);
this._xyzAxisLookAt(cameraPos);
this._faceAxisLookAtCamera();
this._xyzAxisLookAtCamera();

if (this._dragging) {
const gizmoPos = this.root.getPosition();
Expand Down Expand Up @@ -283,14 +283,25 @@ class RotateGizmo extends TransformGizmo {
return tmpV1;
}

_faceAxisLookAt(position) {
this._shapes.face.entity.lookAt(position);
this._shapes.face.entity.rotateLocal(90, 0, 0);
_faceAxisLookAtCamera() {
if (this._camera.projection === PROJECTION_PERSPECTIVE) {
this._shapes.face.entity.lookAt(this._camera.entity.getPosition());
this._shapes.face.entity.rotateLocal(90, 0, 0);
} else {
tmpQ1.copy(this._camera.entity.getRotation());
tmpQ1.getEulerAngles(tmpV1);
this._shapes.face.entity.setEulerAngles(tmpV1);
this._shapes.face.entity.rotateLocal(-90, 0, 0);
}
}

_xyzAxisLookAt(position) {
tmpV1.copy(position).sub(this.root.getPosition());
tmpQ1.copy(this.root.getRotation()).invert().transformVector(tmpV1, tmpV1);
_xyzAxisLookAtCamera() {
if (this._camera.projecion === PROJECTION_PERSPECTIVE) {
tmpV1.copy(this._camera.entity.getPosition()).sub(this.root.getPosition());
tmpQ1.copy(this.root.getRotation()).invert().transformVector(tmpV1, tmpV1);
} else {
tmpV1.copy(this._camera.entity.forward).mulScalar(-1);
}
let angle = Math.atan2(tmpV1.z, tmpV1.y) * math.RAD_TO_DEG;
this._shapes.x.entity.setLocalEulerAngles(0, angle - 90, -90);
angle = Math.atan2(tmpV1.x, tmpV1.z) * math.RAD_TO_DEG;
Expand Down
4 changes: 4 additions & 0 deletions extras/gizmo/transform-gizmo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
CULLFACE_NONE,
CULLFACE_BACK,
PROJECTION_PERSPECTIVE,
PROJECTION_ORTHOGRAPHIC,
BLEND_NORMAL,
Color,
StandardMaterial,
Expand Down Expand Up @@ -628,6 +629,9 @@ class TransformGizmo extends Gizmo {
}
} else {
angle = mouseWPos.dot(tmpV2.normalize()) * ROTATE_SCALE;
if (this._camera.projection === PROJECTION_ORTHOGRAPHIC) {
angle /= (this._camera.orthoHeight || 1);
}
}
}

Expand Down