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

chore: remove colors from Gizmo

Browse Source
This commit is contained in:
Nick Fisher
2024-12-17 14:07:29 +08:00
parent eb4e70a7cf
commit fc4842ed6d
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
thermion_dart/native/include/Globals.hpp Normal file
View File

@@ -0,0 +1,11 @@
#include "math.h"
namespace thermion {
using namespace filament;
constexpr math::float3 AXIS_COLORS[3] {
math::float3{1.0f, 0.0f, 0.0f}, // X
math::float3{0.0f, 1.0f, 0.0f}, // Y
math::float3{0.0f, 0.0f, 1.0f}, // Z
};
}

18
thermion_dart/native/src/scene/Gizmo.cpp
View File

@@ -7,13 +7,12 @@
#include <gltfio/math.h> #include <gltfio/math.h>
#include "Globals.hpp"
#include "Log.hpp"
#include "material/gizmo.h"
#include "scene/Gizmo.hpp" #include "scene/Gizmo.hpp"
#include "scene/SceneManager.hpp" #include "scene/SceneManager.hpp"
#include "material/gizmo.h"
#include "Log.hpp"
namespace thermion namespace thermion
{ {
@@ -82,7 +81,8 @@ namespace thermion
auto instance = _source->createInstance(&materialInstance, 1); auto instance = _source->createInstance(&materialInstance, 1);
TRACE("Created Gizmo axis glTF instance with head entity %d", instance->getEntity()); TRACE("Created Gizmo axis glTF instance with head entity %d", instance->getEntity());
materialInstance->setParameter("baseColorFactor", inactiveColors[axis]); auto color = filament::math::float4(AXIS_COLORS[axis], 0.5f);
materialInstance->setParameter("baseColorFactor", color);
materialInstance->setParameter("scale", _scale); materialInstance->setParameter("scale", _scale);
auto hitTestEntity = instance->findEntityByName("HitTest"); auto hitTestEntity = instance->findEntityByName("HitTest");
@@ -179,8 +179,8 @@ namespace thermion
if (renderableInstance.isValid()) if (renderableInstance.isValid())
{ {
auto *materialInstance = rm.getMaterialInstanceAt(renderableInstance, 0); auto *materialInstance = rm.getMaterialInstanceAt(renderableInstance, 0);
math::float4 baseColor = activeColors[axis]; auto color = filament::math::float4(AXIS_COLORS[axis], 1.0f);
materialInstance->setParameter("baseColorFactor", baseColor); materialInstance->setParameter("baseColorFactor", color);
} }
} }
} }
@@ -202,8 +202,8 @@ namespace thermion
if (renderableInstance.isValid()) if (renderableInstance.isValid())
{ {
auto *materialInstance = rm.getMaterialInstanceAt(renderableInstance, 0); auto *materialInstance = rm.getMaterialInstanceAt(renderableInstance, 0);
math::float4 baseColor = inactiveColors[axis]; auto color = filament::math::float4(AXIS_COLORS[axis], 0.5f);
materialInstance->setParameter("baseColorFactor", baseColor); materialInstance->setParameter("baseColorFactor", color);
} }
} }
} }