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

feat: add rotation gizmo

Browse Source
This commit is contained in:
Nick Fisher
2024-12-12 16:28:55 +08:00
parent 0ad73d06e0
commit def85614d8
17 changed files with 4056 additions and 7790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
thermion_dart/native/include/c_api/APIBoundaryTypes.h
View File

@@ -124,6 +124,11 @@ extern "C"
typedef struct Aabb3 Aabb3;
enum TGizmoType {
TRANSLATION,
ROTATION
};
#ifdef __cplusplus
}
#endif

2
thermion_dart/native/include/c_api/TSceneManager.h
View File

@@ -11,7 +11,7 @@ extern "C"
{
#endif
EMSCRIPTEN_KEEPALIVE TGizmo *SceneManager_createGizmo(TSceneManager *tSceneManager, TView *tView, TScene *tScene);
EMSCRIPTEN_KEEPALIVE TGizmo *SceneManager_createGizmo(TSceneManager *tSceneManager, TView *tView, TScene *tScene, TGizmoType tGizmoType);
EMSCRIPTEN_KEEPALIVE TSceneAsset *SceneManager_createGeometry(
TSceneManager *sceneManager,
float *vertices,

1
thermion_dart/native/include/c_api/ThermionDartRenderThreadApi.h
View File

@@ -59,6 +59,7 @@ namespace thermion
TSceneManager *tSceneManager,
TView *tView,
TScene *tScene,
TGizmoType tGizmoType,
void (*onComplete)(TGizmo*)
);

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 156056
.int 78876

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 156056
.int 78876

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

Binary file not shown.

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

File diff suppressed because it is too large Load Diff

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

@@ -36,7 +36,10 @@ namespace thermion
Engine *engine,
View *view,
Scene *scene,
Material *material);
Material *material) noexcept;
Gizmo(Gizmo &&other) noexcept;
~Gizmo() override;
enum Axis
@@ -152,6 +155,8 @@ namespace thermion
View *_view;
Material *_material;
float _scale = 8.0f;
utils::Entity _parent;
std::vector<SceneAsset *> _axes;
std::vector<utils::Entity> _hitTest;
@@ -177,7 +182,7 @@ namespace thermion
return Gizmo::GizmoPickResultType::None;
}
TRACE("Checking picked entity %d against gizmo axes (axis hit test entities are %d %d %d)", entity, _hitTest[0], _hitTest[1], _hitTest[2]);
TRACE("Checking picked entity %d against gizmo axes with (%d axis hit test entities : %d %d %d)", entity, _hitTest.size(), _hitTest[0], _hitTest[1], _hitTest[2]);
if (entity == _parent)
{
@@ -187,7 +192,7 @@ namespace thermion
for (int axisIndex = 0; axisIndex < _axes.size(); axisIndex++)
{
auto axis = _axes[axisIndex];
TRACE("Checking for axisindex %d", axisIndex);
TRACE("Checking for axisindex %d with %d child entities", axisIndex, axis->getChildEntityCount());
GizmoPickResultType result = GizmoPickResultType::None;
if (entity == _hitTest[axisIndex])
{
@@ -196,14 +201,21 @@ namespace thermion
}
else
{
for (int entityIndex = 0; entityIndex < axis->getChildEntityCount(); entityIndex++)
{
auto childEntity = axis->getChildEntities()[entityIndex];
if (entity == childEntity)
if(entity == axis->getEntity()) {
TRACE("MATCHED AXIS HEAD ENTITY");
result = GizmoPickResultType(axisIndex);
} else {
for (int entityIndex = 0; entityIndex < axis->getChildEntityCount(); entityIndex++)
{
TRACE("MATCHED AXIS CHILD ENTITY at index %d", entityIndex);
result = GizmoPickResultType(axisIndex);
break;
auto childEntity = axis->getChildEntities()[entityIndex];
if (entity == childEntity)
{
TRACE("MATCHED AXIS CHILD ENTITY %d (index %d)", childEntity, entityIndex);
result = GizmoPickResultType(axisIndex);
break;
}
TRACE("Failed to match entity %d against axis child entity %d", entity, childEntity);
}
}
}

10
thermion_dart/native/include/scene/SceneManager.hpp
View File

@@ -60,6 +60,11 @@ namespace thermion
OVERLAY = 7,
};
enum GizmoType {
TRANSLATION,
ROTATION
};
////
/// @brief Load the glTF file from the specified path and adds all entities to the scene.
/// @param uri the path to the asset. Should be either asset:// (representing a Flutter asset), or file:// (representing a filesystem file).
@@ -277,7 +282,7 @@ namespace thermion
/// @param view
/// @param scene
/// @return
Gizmo *createGizmo(View *view, Scene *scene);
Gizmo *createGizmo(View *view, Scene *scene, GizmoType type);
/// @brief
@@ -323,7 +328,8 @@ namespace thermion
Material *_unlitFixedSizeMaterial = nullptr;
Material *_gizmoMaterial = nullptr;
SceneAsset *_gizmoGlb;
SceneAsset *_translationGizmoGlb;
SceneAsset *_rotationGizmoGlb;
utils::NameComponentManager *_ncm;