maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ignore pick results directly on axis

Browse Source
This commit is contained in:
Nick Fisher
2024-09-05 22:19:54 +08:00
parent 0798d5c071
commit 4e14bd2396
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
thermion_dart/native/include/Gizmo.hpp
View File

@@ -37,8 +37,11 @@ class Gizmo {
void handle(filament::View::PickingQueryResult const &result) { void handle(filament::View::PickingQueryResult const &result) {
auto x = static_cast<int32_t>(result.fragCoords.x); auto x = static_cast<int32_t>(result.fragCoords.x);
auto y= static_cast<int32_t>(result.fragCoords.y); auto y= static_cast<int32_t>(result.fragCoords.y);
for(int i = 4; i < 7; i++) { for(int i = 0; i < 7; i++) {
if(_gizmo->_entities[i] == result.renderable) { if(_gizmo->_entities[i] == result.renderable) {
if(i < 4) {
return;
}
_gizmo->highlight(_gizmo->_entities[i - 4]); _gizmo->highlight(_gizmo->_entities[i - 4]);
_callback(Entity::smuggle(_gizmo->_entities[i - 4]), x, y); _callback(Entity::smuggle(_gizmo->_entities[i - 4]), x, y);
return; return;
@@ -96,9 +99,9 @@ class Gizmo {
Material* _material; Material* _material;
MaterialInstance* _materialInstances[7]; MaterialInstance* _materialInstances[7];
math::float4 inactiveColors[3] { math::float4 inactiveColors[3] {
math::float4 { 0.75f, 0.0f, 0.0f, 1.0f }, math::float4 { 1.0f, 0.0f, 0.0f, 0.5f },
math::float4 { 0.0f, 0.75f, 0.0f, 1.0f }, math::float4 { 0.0f, 1.0f, 0.0f, 0.5f },
math::float4 { 0.0f, 0.0f, 0.75f, 1.0f }, math::float4 { 0.0f, 0.0f, 1.0f, 0.5f },
}; };
math::float4 activeColors[3] { math::float4 activeColors[3] {
math::float4 { 1.0f, 0.0f, 0.0f, 1.0f }, math::float4 { 1.0f, 0.0f, 0.0f, 1.0f },