Skip to content

Commit 9ac288b

Browse files
committed
Fixed transform gizmo sizing in the entity editor
1 parent 92920fd commit 9ac288b

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

IDE/Contents/Source/PolycodeEntityEditor.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,10 @@ SceneRenderTexture *EntityEditorMainView::getRenderTexture() {
818818
void EntityEditorMainView::setEditorMode(int newMode) {
819819
editorMode = newMode;
820820

821+
if(newMode != EDITOR_MODE_3D) {
822+
trackballCamera->setOrbitingCenter(Vector3(0.0, 0.0, 0.0));
823+
}
824+
821825
switch(editorMode) {
822826
case EDITOR_MODE_3D:
823827
mainScene->setSceneType(Scene::SCENE_3D);
@@ -828,6 +832,7 @@ void EntityEditorMainView::setEditorMode(int newMode) {
828832
trackballCamera->disableRotation(false);
829833
break;
830834
case EDITOR_MODE_3D_X:
835+
831836
mainScene->setSceneType(Scene::SCENE_2D);
832837
mainScene->getDefaultCamera()->setOrthoMode(true);
833838
mainScene->getDefaultCamera()->setClippingPlanes(-0.1, 1000);
@@ -838,6 +843,7 @@ void EntityEditorMainView::setEditorMode(int newMode) {
838843
Update();
839844
break;
840845
case EDITOR_MODE_3D_Y:
846+
841847
mainScene->setSceneType(Scene::SCENE_2D);
842848
mainScene->getDefaultCamera()->setOrthoMode(true);
843849
mainScene->getDefaultCamera()->setClippingPlanes(-0.1, 1000);
@@ -1435,6 +1441,7 @@ void EntityEditorMainView::handleEvent(Event *event) {
14351441
focusSelf();
14361442
} else if(event->getDispatcher() == trackballCamera) {
14371443
Update();
1444+
transformGizmo->Update();
14381445
} else if(event->getDispatcher() == viewModeSelector) {
14391446
setEditorMode(viewModeSelector->getSelectedIndex());
14401447
} else if(event->getDispatcher() == globalFrame->assetBrowser) {

IDE/Contents/Source/TransformGizmo.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,14 +1173,12 @@ void TransformGizmo::Update() {
11731173

11741174
Number scale;
11751175
if(gizmoMode != GIZMO_MODE_3D) {
1176-
scale = targetCamera->getPosition().length() * 0.1;
1176+
scale = targetCamera->getOrthoSizeX() * 0.1;
1177+
11771178
} else {
11781179
scale = getPosition().distance(targetCamera->getPosition()) * 0.1;
11791180
}
1180-
1181-
if(scale < 0.0) {
1182-
scale = 0.0;
1183-
}
1181+
11841182
setScale(scale, scale, scale);
11851183
}
11861184

0 commit comments

Comments
 (0)