Преглед изворни кода

Fixed editor grid always hiding Y-axis line, fixed undo resetting relative translate position in the transform gizmo

Ivan Safrin пре 12 година
родитељ
комит
e5d65bc2cd

+ 1 - 1
IDE/Contents/Include/SettingsWindow.h

@@ -28,7 +28,7 @@
 #include "OSBasics.h"
 #include "OSBasics.h"
 
 
 #define SETTINGS_WINDOW_WIDTH 400
 #define SETTINGS_WINDOW_WIDTH 400
-#define SETTINGS_WINDOW_HEIGHT 500
+#define SETTINGS_WINDOW_HEIGHT 375
 
 
 using namespace Polycode;
 using namespace Polycode;
 
 

+ 2 - 2
IDE/Contents/Source/EditorGrid.cpp

@@ -109,7 +109,8 @@ EditorGrid::EditorGrid() : Entity() {
     yLine = new SceneLine(Vector3(), Vector3());
     yLine = new SceneLine(Vector3(), Vector3());
     addChild(yLine);
     addChild(yLine);
     yLine->setColor(0.0, 0.8, 0.0, 1.0);
     yLine->setColor(0.0, 0.8, 0.0, 1.0);
-
+    yLine->visible = false;
+    
     xLine = new SceneLine(Vector3(), Vector3());
     xLine = new SceneLine(Vector3(), Vector3());
     addChild(xLine);
     addChild(xLine);
     xLine->setColor(0.8, 0.0, 0.0, 1.0);
     xLine->setColor(0.8, 0.0, 0.0, 1.0);
@@ -192,7 +193,6 @@ void EditorGrid::rebuildGrid() {
     
     
     yLine->setStart(Vector3(0.0, gridSize * gridLen * 0.5, 0.0));
     yLine->setStart(Vector3(0.0, gridSize * gridLen * 0.5, 0.0));
     yLine->setEnd(Vector3(0.0, gridSize * gridLen * -0.5, 0.0));
     yLine->setEnd(Vector3(0.0, gridSize * gridLen * -0.5, 0.0));
-    yLine->visible = false;
 
 
     xLine->setStart(Vector3(gridSize * gridLen * 0.5, 0.0, 0.0));
     xLine->setStart(Vector3(gridSize * gridLen * 0.5, 0.0, 0.0));
     xLine->setEnd(Vector3(gridSize * gridLen * -0.5, 0.0, 0.0));
     xLine->setEnd(Vector3(gridSize * gridLen * -0.5, 0.0, 0.0));

+ 1 - 0
IDE/Contents/Source/PolycodeEntityEditor.cpp

@@ -491,6 +491,7 @@ void EntityEditorMainView::doAction(String actionName, PolycodeEditorActionData
 			selectedEntities[i]->setPosition(sceneData->entries[i].vec3);
 			selectedEntities[i]->setPosition(sceneData->entries[i].vec3);
             }
             }
 		}
 		}
+        transformGizmo->setTransformSelection(selectedEntities);
 	} else if(actionName == "scale") {
 	} else if(actionName == "scale") {
 		for(int i=0; i < selectedEntities.size(); i++) {
 		for(int i=0; i < selectedEntities.size(); i++) {
             if(i < sceneData->entries.size()) {
             if(i < sceneData->entries.size()) {