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

44
thermion_dart/lib/src/input/src/implementations/gizmo_input_handler.dart
View File

@@ -128,6 +128,10 @@ class GizmoInputHandler extends InputHandler {
final InputHandler wrapped;
final ThermionViewer viewer;
late final _Gizmo translationGizmo;
late final _Gizmo rotationGizmo;
_Gizmo get active =>
type == GizmoType.translation ? translationGizmo : rotationGizmo;
GizmoType type = GizmoType.translation;
Stream<({ThermionEntity entity, Matrix4 transform})>
get onEntityTransformUpdated =>
@@ -145,9 +149,12 @@ class GizmoInputHandler extends InputHandler {
}
await viewer.initialized;
final view = await viewer.getViewAt(0);
var translationGizmoAsset =
await viewer.createGizmo(view, GizmoType.translation);
this.translationGizmo = _Gizmo(translationGizmoAsset, viewer);
var tg = await viewer.createGizmo(view, GizmoType.translation);
this.translationGizmo = _Gizmo(tg, viewer);
var rg = await viewer.createGizmo(view, GizmoType.rotation);
this.rotationGizmo = _Gizmo(rg, viewer);
_initialized.complete(true);
}
@@ -156,6 +163,7 @@ class GizmoInputHandler extends InputHandler {
@override
Future dispose() async {
await viewer.removeEntity(rotationGizmo._gizmo);
await viewer.removeEntity(translationGizmo._gizmo);
}
@@ -192,13 +200,13 @@ class GizmoInputHandler extends InputHandler {
await viewer.pick(localPosition.x.toInt(), localPosition.y.toInt(),
(result) async {
if (translationGizmo._gizmo.isNonPickable(result.entity) ||
if (active._gizmo.isNonPickable(result.entity) ||
result.entity == FILAMENT_ENTITY_NULL) {
await translationGizmo.detach();
await active.detach();
return;
}
if (!translationGizmo._gizmo.isGizmoEntity(result.entity)) {
translationGizmo.attach(result.entity);
if (!active._gizmo.isGizmoEntity(result.entity)) {
active.attach(result.entity);
}
});
}
@@ -208,19 +216,19 @@ class GizmoInputHandler extends InputHandler {
if (!_initialized.isCompleted) {
return;
}
translationGizmo.checkHover(
active.checkHover(
localPosition.x.floor(), localPosition.y.floor());
}
@override
Future<void> onPointerMove(
Vector2 localPosition, Vector2 delta, bool isMiddle) async {
if (!isMiddle && translationGizmo._active != null) {
if (!isMiddle && active._active != null) {
final scaledDelta = Vector2(
delta.x,
delta.y,
);
translationGizmo._updateTransform(localPosition, scaledDelta);
active._updateTransform(localPosition, scaledDelta);
return;
}
return wrapped.onPointerMove(localPosition, delta, isMiddle);
@@ -268,21 +276,19 @@ class GizmoInputHandler extends InputHandler {
}
Future detach(ThermionAsset asset) async {
if (translationGizmo._attachedTo == asset.entity) {
await translationGizmo.detach();
if (active._attachedTo == asset.entity) {
await active.detach();
return;
}
final childEntities = await asset.getChildEntities();
for(final childEntity in childEntities) {
if(translationGizmo._attachedTo == childEntity) {
await translationGizmo.detach();
return;
for (final childEntity in childEntities) {
if (active._attachedTo == childEntity) {
await active.detach();
return;
}
}
}
// @override
// Future setCamera(Camera camera) async {
// await wrapped.setCamera(camera);

59
thermion_dart/lib/src/viewer/src/ffi/src/thermion_dart.g.dart
View File

@@ -1388,17 +1388,35 @@ external void remove_skybox_render_thread(
ffi.Pointer<TSceneManager>,
ffi.Pointer<TView>,
ffi.Pointer<TScene>,
ffi.UnsignedInt,
ffi.Pointer<
ffi.NativeFunction<ffi.Void Function(ffi.Pointer<TGizmo>)>>)>(
isLeaf: true)
external ffi.Pointer<TGizmo> SceneManager_createGizmoRenderThread(
symbol: "SceneManager_createGizmoRenderThread", isLeaf: true)
external ffi.Pointer<TGizmo> _SceneManager_createGizmoRenderThread(
ffi.Pointer<TSceneManager> tSceneManager,
ffi.Pointer<TView> tView,
ffi.Pointer<TScene> tScene,
int tGizmoType,
ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<TGizmo>)>>
onComplete,
);
ffi.Pointer<TGizmo> SceneManager_createGizmoRenderThread(
ffi.Pointer<TSceneManager> tSceneManager,
ffi.Pointer<TView> tView,
ffi.Pointer<TScene> tScene,
TGizmoType tGizmoType,
ffi.Pointer<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<TGizmo>)>>
onComplete,
) =>
_SceneManager_createGizmoRenderThread(
tSceneManager,
tView,
tScene,
tGizmoType.value,
onComplete,
);
@ffi.Native<
ffi.Void Function(
ffi.Pointer<TSceneManager>,
@@ -1688,14 +1706,31 @@ external void unproject_texture_render_thread(
);
@ffi.Native<
ffi.Pointer<TGizmo> Function(ffi.Pointer<TSceneManager>, ffi.Pointer<TView>,
ffi.Pointer<TScene>)>(isLeaf: true)
external ffi.Pointer<TGizmo> SceneManager_createGizmo(
ffi.Pointer<TGizmo> Function(
ffi.Pointer<TSceneManager>,
ffi.Pointer<TView>,
ffi.Pointer<TScene>,
ffi.UnsignedInt)>(symbol: "SceneManager_createGizmo", isLeaf: true)
external ffi.Pointer<TGizmo> _SceneManager_createGizmo(
ffi.Pointer<TSceneManager> tSceneManager,
ffi.Pointer<TView> tView,
ffi.Pointer<TScene> tScene,
int tGizmoType,
);
ffi.Pointer<TGizmo> SceneManager_createGizmo(
ffi.Pointer<TSceneManager> tSceneManager,
ffi.Pointer<TView> tView,
ffi.Pointer<TScene> tScene,
TGizmoType tGizmoType,
) =>
_SceneManager_createGizmo(
tSceneManager,
tView,
tScene,
tGizmoType.value,
);
@ffi.Native<
ffi.Pointer<TSceneAsset> Function(
ffi.Pointer<TSceneManager>,
@@ -2487,6 +2522,20 @@ final class Aabb3 extends ffi.Struct {
external double halfExtentZ;
}
enum TGizmoType {
TRANSLATION(0),
ROTATION(1);
final int value;
const TGizmoType(this.value);
static TGizmoType fromValue(int value) => switch (value) {
0 => TRANSLATION,
1 => ROTATION,
_ => throw ArgumentError("Unknown value for TGizmoType: $value"),
};
}
enum TSamplerCompareFunc {
/// !< Less or equal
LE(0),

2
thermion_dart/lib/src/viewer/src/ffi/src/thermion_viewer_ffi.dart
View File

@@ -2066,7 +2066,7 @@ class ThermionViewerFFI extends ThermionViewer {
var scene = View_getScene(view.view);
final gizmo = await withPointerCallback<TGizmo>((cb) {
SceneManager_createGizmoRenderThread(
_sceneManager!, view.view, scene, cb);
_sceneManager!, view.view, scene, TGizmoType.values[gizmoType.index], cb);
});
if (gizmo == nullptr) {
throw Exception("Failed to create gizmo");

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;

4
thermion_dart/native/src/c_api/TSceneManager.cpp
View File

@@ -30,12 +30,12 @@ extern "C"
return reinterpret_cast<TMaterialProvider*>(provider);
}
EMSCRIPTEN_KEEPALIVE TGizmo *SceneManager_createGizmo(TSceneManager *tSceneManager, TView *tView, TScene *tScene)
EMSCRIPTEN_KEEPALIVE TGizmo *SceneManager_createGizmo(TSceneManager *tSceneManager, TView *tView, TScene *tScene, TGizmoType tGizmoType)
{
auto sceneManager = reinterpret_cast<SceneManager *>(tSceneManager);
auto *scene = reinterpret_cast<Scene *>(tScene);
auto *view = reinterpret_cast<View *>(tView);
auto gizmo = sceneManager->createGizmo(view, scene);
auto gizmo = sceneManager->createGizmo(view, scene, static_cast<SceneManager::GizmoType>(tGizmoType));
return reinterpret_cast<TGizmo *>(gizmo);
}

3
thermion_dart/native/src/c_api/TTransformManager.cpp
View File

@@ -81,12 +81,11 @@ extern "C"
const auto child = Entity::import(childId);
const auto parent = Entity::import(parentId);
const auto &childInstance = tm->getInstance(child);
if (!childInstance.isValid())
{
Log("Child instance is not valid");
TRACE("Can't set transform parent, child instance is not valid");
return;
}

3
thermion_dart/native/src/c_api/ThermionDartRenderThreadApi.cpp
View File

@@ -540,12 +540,13 @@ extern "C"
TSceneManager *tSceneManager,
TView *tView,
TScene *tScene,
TGizmoType tGizmoType,
void (*onComplete)(TGizmo*)
) {
std::packaged_task<void()> lambda(
[=]() mutable
{
auto *gizmo = SceneManager_createGizmo(tSceneManager, tView, tScene);
auto *gizmo = SceneManager_createGizmo(tSceneManager, tView, tScene, tGizmoType);
onComplete(gizmo);
});
auto fut = _rl->add_task(lambda);

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

@@ -24,7 +24,7 @@ namespace thermion
Engine *engine,
View *view,
Scene *scene,
Material *material) : _source(sceneAsset),
Material *material) noexcept : _source(sceneAsset),
_engine(engine),
_view(view),
_scene(scene),
@@ -41,6 +41,27 @@ namespace thermion
createAxisInstance(Axis::Z);
}
// move constructor so we don't re-create all entities/materials when moving
Gizmo::Gizmo(Gizmo &&other) noexcept : _source(other._source),
_engine(other._engine),
_view(other._view),
_scene(other._scene),
_material(other._material),
_parent(other._parent),
_scale(other._scale),
_entities(std::move(other._entities)),
_materialInstances(std::move(other._materialInstances)),
_hitTest(std::move(other._hitTest)),
_axes(std::move(other._axes))
{
other._source = nullptr;
other._engine = nullptr;
other._view = nullptr;
other._scene = nullptr;
other._material = nullptr;
other._parent = {};
}
void Gizmo::createAxisInstance(Gizmo::Axis axis)
{
auto &rm = _engine->getRenderableManager();
@@ -52,7 +73,7 @@ namespace thermion
TRACE("Created Gizmo axis glTF instance with head entity %d", instance->getEntity());
materialInstance->setParameter("baseColorFactor", inactiveColors[axis]);
materialInstance->setParameter("scale", 4.0f);
materialInstance->setParameter("scale", _scale);
auto hitTestEntity = instance->findEntityByName("HitTest");
TRACE("Created hit test entity %d for axis %d", hitTestEntity, axis);
@@ -73,8 +94,8 @@ namespace thermion
{
auto *hitTestMaterialInstance = _material->createInstance();
_materialInstances.push_back(hitTestMaterialInstance);
hitTestMaterialInstance->setParameter("baseColorFactor", math::float4{1.0f, 0.0f, 1.0f, 0.5f});
hitTestMaterialInstance->setParameter("scale", 4.0f);
hitTestMaterialInstance->setParameter("baseColorFactor", math::float4{0.0f, 0.0f, 0.0f, 0.0f});
hitTestMaterialInstance->setParameter("scale", _scale);
rm.setMaterialInstanceAt(renderableInstance, 0, hitTestMaterialInstance);
}
}
@@ -86,7 +107,7 @@ namespace thermion
auto &tm = _engine->getTransformManager();
auto transformInstance = tm.getInstance(instance->getEntity());
tm.setTransform(transformInstance, transform);
// parent this entity's transform to the Gizmo _parent entity
tm.setParent(transformInstance, tm.getInstance(_parent));

69
thermion_dart/native/src/scene/SceneManager.cpp
View File

@@ -42,7 +42,8 @@
#include "scene/GeometrySceneAssetBuilder.hpp"
#include "UnprojectTexture.hpp"
#include "resources/gizmo_glb.h"
#include "resources/translation_gizmo_glb.h"
#include "resources/rotation_gizmo_glb.h"
extern "C"
{
@@ -135,7 +136,7 @@ namespace thermion
_engine->destroy(_unlitFixedSizeMaterial);
_engine->destroy(_gizmoMaterial);
_cameras.clear();
_grid = nullptr;
_gltfResourceLoader->asyncCancelLoad();
@@ -152,37 +153,62 @@ namespace thermion
AssetLoader::destroy(&_assetLoader);
}
SceneAsset *SceneManager::createGrid() {
if(!_grid) {
SceneAsset *SceneManager::createGrid()
{
if (!_grid)
{
_grid = std::make_unique<GridOverlay>(*_engine);
}
return _grid.get();
}
bool SceneManager::isGridEntity(utils::Entity entity) {
if(!_grid) {
bool SceneManager::isGridEntity(utils::Entity entity)
{
if (!_grid)
{
return false;
}
if(entity == _grid->getEntity()) {
if (entity == _grid->getEntity())
{
return true;
}
for(int i =0; i < _grid->getChildEntityCount(); i++) {
if(entity == _grid->getChildEntities()[i]) {
for (int i = 0; i < _grid->getChildEntityCount(); i++)
{
if (entity == _grid->getChildEntities()[i])
{
return true;
}
}
return false;
}
Gizmo *SceneManager::createGizmo(View *view, Scene *scene)
Gizmo *SceneManager::createGizmo(View *view, Scene *scene, GizmoType type)
{
if(!_gizmoGlb) {
_gizmoGlb = loadGlbFromBuffer(GIZMO_GLB_GIZMO_DATA, GIZMO_GLB_GIZMO_SIZE, 100, true, 4, 0, false, false);
TRACE("Creating gizmo type %d", type);
Gizmo *raw;
switch (type)
{
case GizmoType::TRANSLATION:
if (!_translationGizmoGlb)
{
TRACE("Translation gizmo source not found, loading");
_translationGizmoGlb = loadGlbFromBuffer(TRANSLATION_GIZMO_GLB_TRANSLATION_GIZMO_DATA, TRANSLATION_GIZMO_GLB_TRANSLATION_GIZMO_SIZE, 100, true, 4, 0, false, false);
}
raw = new Gizmo(_translationGizmoGlb, _engine, view, scene, _unlitFixedSizeMaterial);
TRACE("Built translation gizmo");
break;
case GizmoType::ROTATION:
if (!_rotationGizmoGlb)
{
TRACE("Rotation gizmo source not found, loading");
_rotationGizmoGlb = loadGlbFromBuffer(ROTATION_GIZMO_GLB_ROTATION_GIZMO_DATA, ROTATION_GIZMO_GLB_ROTATION_GIZMO_SIZE, 100, true, 4, 0, false, false);
}
raw = new Gizmo(_rotationGizmoGlb, _engine, view, scene, _unlitFixedSizeMaterial);
TRACE("Built rotation gizmo");
break;
}
auto gizmo = std::make_unique<Gizmo>(_gizmoGlb, _engine, view, scene, _unlitFixedSizeMaterial);
auto *raw = gizmo.get();
_sceneAssets.push_back(std::move(gizmo));
_sceneAssets.push_back(std::unique_ptr<Gizmo>(raw));
return raw;
}
@@ -286,8 +312,7 @@ namespace thermion
asset,
_assetLoader,
_engine,
_ncm
);
_ncm);
auto filamentInstance = asset->getInstance();
size_t entityCount = filamentInstance->getEntityCount();
@@ -375,16 +400,16 @@ namespace thermion
asset,
_assetLoader,
_engine,
_ncm
);
_ncm);
auto sceneAssetInstance = sceneAsset->createInstance();
if(addToScene) {
if (addToScene)
{
sceneAssetInstance->addAllEntities(_scene);
}
sceneAssetInstance->setPriority(_engine->getRenderableManager(), priority);
sceneAssetInstance->setLayer(_engine->getRenderableManager(), layer);
auto *raw = sceneAsset.get();
_sceneAssets.push_back(std::move(sceneAsset));