mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-07-10 15:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Editor selects closest object and cleanup

Browse Source
This commit is contained in:
MegaMech
2025-04-24 12:39:01 -06:00
parent 2d25841852
commit 04ff9a117e
3 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/editor/EditorMath.cpp
+1 -1
View File
@@ -301,7 +301,7 @@ bool IntersectRayTriangleAndTransform(const Ray& ray, FVector pos, const Triangl
return t > EPSILON;
}
std::optional<FVector> QueryHandleIntersection(MtxF mtx, Ray ray, Triangle& tri) {
std::optional<FVector> QueryHandleIntersection(MtxF mtx, Ray ray, const Triangle& tri) {
float t;
Ray localRay = RayToLocalSpace(mtx, ray);
if (IntersectRayTriangle(localRay, tri, t)) {
src/engine/editor/EditorMath.h
+2 -2
View File
@@ -43,12 +43,12 @@ FVector TransformVecByMatrix(const FVector& vec, const float mtx[4][4]);
FVector TransformVecDirection(const FVector& dir, const float mtx[4][4]);
Ray RayToLocalSpace(MtxF mtx, const Ray& ray);
bool IntersectRayTriangle(const Ray& ray, const Triangle& tri, float& t); // Uses local space not global space.
bool IntersectRayTriangleAndTransform(const Ray& ray, FVector pos, const Triangle& tri, float& t);
bool IntersectRayTriangleAndTransform(const Ray& ray, FVector pos, const Triangle& tri, float& t); // Uses global space because no access to mtx
bool IntersectRaySphere(const Ray& ray, const FVector& sphereCenter, float radius, float& t);
/**
* optional used here so we can check for successful query and return the click position
*/
std::optional<FVector> QueryHandleIntersection(MtxF mtx, Ray ray, Triangle& tri);
std::optional<FVector> QueryHandleIntersection(MtxF mtx, Ray ray, const Triangle& tri);
void Editor_MatrixIdentity(Mat4 mtx);
void Editor_AddMatrix(Mat4 mtx, int32_t flags);
src/engine/editor/ObjectPicker.cpp
+47 -53
View File
@@ -67,53 +67,46 @@ void ObjectPicker::DragHandle() {
}
// Is the gizmo being dragged?
if (eGizmo.Enabled) {
if (!eGizmo.Enabled) { return; }
float closestDistance = FLT_MAX;
std::optional<FVector> closestClickPos;
Gizmo::GizmoHandle closestHandle = Gizmo::GizmoHandle::None;
// No all_axis grab for rotate
if (static_cast<Gizmo::TranslationMode>(CVarGetInteger("eGizmoMode", 0)) != Gizmo::TranslationMode::Rotate) {
float t;
if (IntersectRaySphere(ray, eGizmo.Pos, eGizmo.AllAxisRadius, t)) {
eGizmo.SelectedHandle = Gizmo::GizmoHandle::All_Axis;
eGizmo._ray = ray.Direction;
FVector clickPosition = ray.Origin + ray.Direction * t;
eGizmo._cursorOffset = eGizmo.Pos - clickPosition;
eGizmo.PickDistance = t;
return;
// All axis grab. Not used in rotate mode rotate
if (static_cast<Gizmo::TranslationMode>(CVarGetInteger("eGizmoMode", 0)) != Gizmo::TranslationMode::Rotate) {
float t;
if (IntersectRaySphere(ray, eGizmo.Pos, eGizmo.AllAxisRadius, t)) {
if (t < closestDistance) {
closestDistance = t;
closestClickPos = ray.Origin + ray.Direction * t;
closestHandle = Gizmo::GizmoHandle::All_Axis;
}
}
}
for (auto tri = eGizmo.RedCollision.Triangles.begin(); tri < eGizmo.RedCollision.Triangles.end(); tri++) {
if (auto clickPos = QueryHandleIntersection(eGizmo.Mtx_RedX, ray, *tri)) {
eGizmo.SelectedHandle = Gizmo::GizmoHandle::Z_Axis;
eGizmo._ray = ray.Direction;
eGizmo._cursorOffset = eGizmo.Pos - *clickPos;
float distance = (*clickPos - ray.Origin).Magnitude();
eGizmo.PickDistance = distance;
return;
// Arrow handles
auto tryHandle = [&](Gizmo::GizmoHandle handle, MtxF mtx, const std::vector<Triangle>& tris) {
for (const auto& tri : tris) {
if (auto clickPos = QueryHandleIntersection(mtx, ray, tri)) {
float dist = (*clickPos - ray.Origin).Magnitude();
if (dist < closestDistance) {
closestDistance = dist;
closestClickPos = *clickPos;
closestHandle = handle;
}
}
}
};
for (auto tri = eGizmo.GreenCollision.Triangles.begin(); tri < eGizmo.GreenCollision.Triangles.end(); tri++) {
if (auto clickPos = QueryHandleIntersection(eGizmo.Mtx_GreenY, ray, *tri)) {
eGizmo.SelectedHandle = Gizmo::GizmoHandle::X_Axis;
eGizmo._ray = ray.Direction;
eGizmo._cursorOffset = eGizmo.Pos - *clickPos;
float distance = (*clickPos - ray.Origin).Magnitude();
eGizmo.PickDistance = distance;
return;
}
}
tryHandle(Gizmo::GizmoHandle::Z_Axis, eGizmo.Mtx_RedX, eGizmo.RedCollision.Triangles);
tryHandle(Gizmo::GizmoHandle::X_Axis, eGizmo.Mtx_GreenY, eGizmo.GreenCollision.Triangles);
tryHandle(Gizmo::GizmoHandle::Y_Axis, eGizmo.Mtx_BlueZ, eGizmo.BlueCollision.Triangles);
for (auto tri = eGizmo.BlueCollision.Triangles.begin(); tri < eGizmo.BlueCollision.Triangles.end(); tri++) {
if (auto clickPos = QueryHandleIntersection(eGizmo.Mtx_BlueZ, ray, *tri)) {
eGizmo.SelectedHandle = Gizmo::GizmoHandle::Y_Axis;
eGizmo._ray = ray.Direction;
eGizmo._cursorOffset = eGizmo.Pos - *clickPos;
float distance = (*clickPos - ray.Origin).Magnitude();
eGizmo.PickDistance = distance;
return;
}
}
if (closestHandle != Gizmo::GizmoHandle::None && closestClickPos.has_value()) {
eGizmo.SelectedHandle = closestHandle;
eGizmo._ray = ray.Direction;
eGizmo._cursorOffset = eGizmo.Pos - *closestClickPos;
eGizmo.PickDistance = closestDistance;
}
}
@@ -140,6 +133,9 @@ void ObjectPicker::Draw() {
void ObjectPicker::FindObject(Ray ray, std::vector<GameObject*> objects) {
bool found = false;
GameObject* closestObject = nullptr;
float closestDistance = FLT_MAX;
for (auto& object : objects) {
float boundingBox = object->BoundingBoxSize;
if (boundingBox == 0.0f) {
@@ -150,11 +146,12 @@ void ObjectPicker::FindObject(Ray ray, std::vector<GameObject*> objects) {
case GameObject::CollisionType::VTX_INTERSECT:
for (const auto& tri : object->Triangles) {
float t;
//Ray localRay = RayToLocalSpace(eGizmo.Mtx_GreenY, ray);
if (IntersectRayTriangleAndTransform(ray, *object->Pos, tri, t)) {
printf("\nSELECTED OBJECT\n\n");
_selected = object;
found = true;
if (t < closestDistance) {
closestDistance = t;
closestObject = object;
printf("SELECTED OBJECT\n");
}
}
}
break;
@@ -170,15 +167,11 @@ void ObjectPicker::FindObject(Ray ray, std::vector<GameObject*> objects) {
object->Pos->z + boundingBox * max };
float t;
if (QueryCollisionRayActor(&ray.Origin.x, &ray.Direction.x, boxMin, boxMax, &t)) {
// if (actor == _selected) {
// _selected = nullptr;
// break;
// }
printf("FOUND BOUNDING BOX OBJECT ray: %f %f %f obj %f %f %f\n", ray.Origin.x, ray.Origin.y, ray.Origin.z, object->Pos->x, object->Pos->y, object->Pos->z);
found = true;
//foundActor = &actor;
//type = object->Type;
_selected = object;
if (t < closestDistance) {
closestDistance = t;
closestObject = object;
printf("FOUND BOUNDING BOX OBJECT\n");
}
break;
}
break;
@@ -188,7 +181,8 @@ void ObjectPicker::FindObject(Ray ray, std::vector<GameObject*> objects) {
break;
}
}
if (found) {
if (closestObject != nullptr) {
_selected = closestObject;
// printf("FOUND COLLISION %d\n", type);
} else {
// printf("NO COLLISION\n");