diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-12-22 22:48:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-22 14:48:07 -0700 |
| commit | ce92773a602cca246c44dbec9fb87656fedfa323 (patch) | |
| tree | 19bee63b1ae4ad566eaeb66d83f90257d6407fea /src/engine/editor/ObjectPicker.cpp | |
| parent | 31c2063a61feddb340a48beb7c0376b885c8ce00 (diff) | |
Clean ptr and fix (#610)
* use more unique ptr and fix a shell crash
* remove useless mods folder
* add even more unique_ptr
* Update KoopaTroopaBeach.cpp
* restore a throw
* Update Game.cpp
* automatically create mods folder
* fix oob in external by assuming that all 8 player can make sound
* better texture loading
* add destructor for gameobject
* avoid out of bound in audio sample
* Update FrameInterpolation.cpp
* Update torch
Diffstat (limited to 'src/engine/editor/ObjectPicker.cpp')
| -rw-r--r-- | src/engine/editor/ObjectPicker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/editor/ObjectPicker.cpp b/src/engine/editor/ObjectPicker.cpp index 7fd4cc407..013ad983e 100644 --- a/src/engine/editor/ObjectPicker.cpp +++ b/src/engine/editor/ObjectPicker.cpp @@ -203,7 +203,7 @@ std::pair<GameObject*, float> ObjectPicker::CheckEditorObjectRay(Ray ray) { if (IntersectRayTriangleAndTransform(ray, object->Pos, tri, t)) { if (t < hitDistance) { hitDistance = t; - hitObject = object; + hitObject = object.get(); } } } @@ -222,7 +222,7 @@ std::pair<GameObject*, float> ObjectPicker::CheckEditorObjectRay(Ray ray) { if (QueryCollisionRayActor(&ray.Origin.x, &ray.Direction.x, boxMin, boxMax, &t)) { if (t < hitDistance) { hitDistance = t; - hitObject = object; + hitObject = object.get(); printf("FOUND BOUNDING BOX OBJECT\n"); } break; |
