nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

editor: fixed snap to surface transform

Browse Source
This commit is contained in:
Turánszki János
2024-09-02 08:22:10 +02:00
parent 9c52fae224
commit b5f9bc2b14
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/Translator.cpp
+5 -2
View File
@@ -478,8 +478,9 @@ void Translator::Update(const CameraComponent& camera, const XMFLOAT4& currentMo
ObjectComponent* object = scene.objects.GetComponent(x.entity);
if (object == nullptr)
continue;
temp_filters.push_back(object->filterMask);
temp_filters.push_back(uint64_t(object->filterMask) | (uint64_t(object->filterMaskDynamic) << 32ull));
object->filterMask = 0;
object->filterMaskDynamic = 0;
}
Ray ray = wi::renderer::GetPickRay((long)currentMouse.x, (long)currentMouse.y, canvas, camera);
wi::scene::Scene::RayIntersectionResult result = scene.Intersects(ray, wi::enums::FILTER_OBJECT_ALL);
@@ -490,7 +491,9 @@ void Translator::Update(const CameraComponent& camera, const XMFLOAT4& currentMo
ObjectComponent* object = scene.objects.GetComponent(x.entity);
if (object == nullptr)
continue;
object->filterMask = temp_filters[ind++];
uint64_t tmp = temp_filters[ind++];
object->filterMask = uint32_t(tmp);
object->filterMaskDynamic = uint32_t(tmp >> 32ull);
}
}
}
Editor/Translator.h
+1 -1
View File
@@ -11,7 +11,7 @@ private:
float angle = 0;
float angle_start = 0;
bool has_selected_transform = false;
wi::vector<uint32_t> temp_filters;
wi::vector<uint64_t> temp_filters;
public:
void Update(const wi::scene::CameraComponent& camera, const XMFLOAT4& currentMouse, const wi::Canvas& canvas);