maelstrom/openblocks
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

misc(editor): slightly cleaned up code from previous commit

Browse source
This commit is contained in:
maelstrom 2025-03-31 02:28:48 +02:00
parent 4a50ed159b
commit 375d6c89b9
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
editor/mainglwidget.cpp
View file

@ -138,14 +138,20 @@ void MainGLWidget::handleObjectDrag(QMouseEvent* evt) {
if (!rayHit) return;
Data::Vector3 vec = rayHit->worldPoint;
Data::CFrame targetFrame = partFromBody(rayHit->body)->cframe.Rotation();
Data::CFrame targetFrame = partFromBody(rayHit->body)->cframe;
Data::Vector3 surfaceNormal = targetFrame.Inverse().Rotation() * rayHit->worldNormal;
// The part being dragged's frame local to the hit target's frame, but without its position component
Data::CFrame localFrame = (targetFrame.Inverse() * draggingObject->lock()->cframe).Rotation();
// Snap axis
localFrame = snapCFrame(localFrame);
localFrame = localFrame;
Data::CFrame newFrame = targetFrame * localFrame;
draggingObject->lock()->cframe = newFrame + vec + localFrame.Rotation() * ((localFrame.Inverse().Rotation() * rayHit->worldNormal) * draggingObject->lock()->size / 2);
// Unsink the object
// Get the normal of the surface relative to the part's frame, and get the size along that vector
Data::Vector3 partOffset = localFrame * ((localFrame.Inverse() * rayHit->worldNormal) * draggingObject->lock()->size / 2);
Data::CFrame newFrame = targetFrame.Rotation() * localFrame;
draggingObject->lock()->cframe = newFrame + vec + partOffset;
syncPartPhysics(draggingObject->lock());
}