natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement action for transform keys

Browse Source
This commit is contained in:
T1ti
2024-04-24 21:35:08 +02:00
parent d4d69ca5c7
commit c838db7f7f
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/noggit/Action.hpp
View File

@@ -53,7 +53,10 @@ namespace Noggit
eRMB = 0x20,
eMMB = 0x40,
eSCROLL = 0x80,
eNUM = 0x100
eNUM = 0x100,
eSCALE = 0x200,
eROTATE = 0x400,
eTRANSLATE = 0x800
};
enum class ActionObjectTypes

13
src/noggit/MapView.cpp
View File

@@ -3429,6 +3429,12 @@ void MapView::tick (float dt)
action_modality |= Noggit::ActionModalityControllers::eRMB;
if (MoveObj)
action_modality |= Noggit::ActionModalityControllers::eMMB;
if (keys)
action_modality |= Noggit::ActionModalityControllers::eSCALE;
if (keyr)
action_modality |= Noggit::ActionModalityControllers::eROTATE;
// if (keyx != 0 || keyy != 0 || keyz != 0)
// action_modality |= Noggit::ActionModalityControllers::eTRANSLATE;
NOGGIT_ACTION_MGR->endActionOnModalityMismatch(action_modality);
@@ -3519,14 +3525,15 @@ void MapView::tick (float dt)
if (keys != 0.f)
{
NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_TRANSFORMED);
NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_TRANSFORMED,
Noggit::ActionModalityControllers::eSCALE);
_world->scale_selected_models(keys*numpad_moveratio / 50.f, World::m2_scaling_type::add);
// NOGGIT_ACTION_MGR->endAction();
_rotation_editor_need_update = true;
}
if (keyr != 0.f)
{
NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_TRANSFORMED);
NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_TRANSFORMED,
Noggit::ActionModalityControllers::eROTATE);
_world->rotate_selected_models( math::degrees(0.f)
, math::degrees(keyr * numpad_moveratio * 5.f)
, math::degrees(0.f)

6
src/noggit/World.cpp
View File

@@ -937,9 +937,11 @@ void World::rotate_selected_models(math::degrees rx, math::degrees ry, math::deg
}
else
{
math::degrees::vec3& dir = obj->dir;
dir += dir_change;
// math::degrees::vec3& dir = obj->dir;
// dir += dir_change;
}
math::degrees::vec3& dir = obj->dir;
dir += dir_change;
obj->recalcExtents();