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

feat: more rotation gizmo improvements

Browse Source
This commit is contained in:
Nick Fisher
2024-12-12 22:00:41 +08:00
parent 62cd85c148
commit 7cf1468f38
9 changed files with 7697 additions and 7948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
thermion_dart/native/include/resources/rotation_gizmo_glb.S
View File

@@ -8,5 +8,5 @@ ROTATION_GIZMO_GLB_PACKAGE:
ROTATION_GIZMO_GLB_ROTATION_GIZMO_OFFSET:
.int 0
ROTATION_GIZMO_GLB_ROTATION_GIZMO_SIZE:
.int 163152
.int 156056

2
thermion_dart/native/include/resources/rotation_gizmo_glb.apple.S
View File

@@ -8,5 +8,5 @@ _ROTATION_GIZMO_GLB_PACKAGE:
_ROTATION_GIZMO_GLB_ROTATION_GIZMO_OFFSET:
.int 0
_ROTATION_GIZMO_GLB_ROTATION_GIZMO_SIZE:
.int 163152
.int 156056

BIN
thermion_dart/native/include/resources/rotation_gizmo_glb.bin
View File

Binary file not shown.

15397
thermion_dart/native/include/resources/rotation_gizmo_glb.c
View File

File diff suppressed because it is too large Load Diff

9
thermion_dart/native/include/scene/Gizmo.hpp
View File

@@ -201,14 +201,17 @@ namespace thermion
}
else
{
if(entity == axis->getEntity()) {
if (entity == axis->getEntity())
{
TRACE("MATCHED AXIS HEAD ENTITY");
result = GizmoPickResultType(axisIndex);
} else {
}
else
{
for (int entityIndex = 0; entityIndex < axis->getChildEntityCount(); entityIndex++)
{
auto childEntity = axis->getChildEntities()[entityIndex];
if (entity == childEntity)
{
TRACE("MATCHED AXIS CHILD ENTITY %d (index %d)", childEntity, entityIndex);

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

@@ -25,14 +25,25 @@ namespace thermion
View *view,
Scene *scene,
Material *material) noexcept : _source(sceneAsset),
_engine(engine),
_view(view),
_scene(scene),
_material(material)
_engine(engine),
_view(view),
_scene(scene),
_material(material)
{
auto &entityManager = _engine->getEntityManager();
_parent = entityManager.create();
RenderableManager::Builder(1) // 1 primitive
.boundingBox({{-1, -1, -1}, {1, 1, 1}}) // Set a basic bounding box
.culling(false) // Disable culling since this is a UI element
.castShadows(false) // UI elements typically don't cast shadows
.receiveShadows(false)
.build(*_engine, _parent); // Bu
auto &tm = _engine->getTransformManager();
auto parentTransformInstance = tm.getInstance(_parent);
tm.setTransform(parentTransformInstance, math::mat4f());
TRACE("Created Gizmo parent entity %d", _parent);
_entities.push_back(_parent);
@@ -59,7 +70,7 @@ namespace thermion
other._view = nullptr;
other._scene = nullptr;
other._material = nullptr;
other._parent = {};
other._parent = {};
}
void Gizmo::createAxisInstance(Gizmo::Axis axis)
@@ -71,7 +82,6 @@ namespace thermion
auto instance = _source->createInstance(&materialInstance, 1);
TRACE("Created Gizmo axis glTF instance with head entity %d", instance->getEntity());
materialInstance->setParameter("baseColorFactor", inactiveColors[axis]);
materialInstance->setParameter("scale", _scale);
@@ -109,7 +119,15 @@ namespace thermion
tm.setTransform(transformInstance, transform);
// parent this entity's transform to the Gizmo _parent entity
tm.setParent(transformInstance, tm.getInstance(_parent));
auto parentTransformInstance = tm.getInstance(_parent);
if (parentTransformInstance.isValid())
{
tm.setParent(transformInstance, parentTransformInstance);
}
else
{
TRACE("WARNING: parent transform instance not valid.");
}
_entities.push_back(instance->getEntity());
@@ -120,6 +138,11 @@ namespace thermion
auto entity = instance->getChildEntities()[i];
_entities.push_back(entity);
TRACE("Added entity %d for axis %d", entity, axis);
auto renderable = rm.getInstance(entity);
if (renderable.isValid())
{
rm.setPriority(renderable, 7);
}
}
_axes.push_back(instance);