|
@@ -146,7 +146,7 @@ class ViewportContext
|
|
|
|
|
|
|
|
cameraPosText = Text();
|
|
cameraPosText = Text();
|
|
|
statusBar.AddChild(cameraPosText);
|
|
statusBar.AddChild(cameraPosText);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
cameraPosText.SetFont(font, 11);
|
|
cameraPosText.SetFont(font, 11);
|
|
|
cameraPosText.color = Color(1, 1, 0);
|
|
cameraPosText.color = Color(1, 1, 0);
|
|
|
cameraPosText.textEffect = TE_SHADOW;
|
|
cameraPosText.textEffect = TE_SHADOW;
|
|
@@ -210,7 +210,7 @@ class ViewportContext
|
|
|
{
|
|
{
|
|
|
SetOrthographic(!camera.orthographic);
|
|
SetOrthographic(!camera.orthographic);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
void SetOrthographic(bool orthographic)
|
|
void SetOrthographic(bool orthographic)
|
|
|
{
|
|
{
|
|
|
// This doesn't work that great
|
|
// This doesn't work that great
|
|
@@ -249,7 +249,7 @@ class ViewportContext
|
|
|
void OpenViewportSettingsWindow()
|
|
void OpenViewportSettingsWindow()
|
|
|
{
|
|
{
|
|
|
UpdateSettingsUI();
|
|
UpdateSettingsUI();
|
|
|
- /* settingsWindow.position = */
|
|
|
|
|
|
|
+ /* settingsWindow.position = */
|
|
|
settingsWindow.visible = true;
|
|
settingsWindow.visible = true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -394,7 +394,7 @@ void CreateCamera()
|
|
|
{
|
|
{
|
|
|
// Set the initial viewport rect
|
|
// Set the initial viewport rect
|
|
|
viewportArea = IntRect(0, 0, graphics.width, graphics.height);
|
|
viewportArea = IntRect(0, 0, graphics.width, graphics.height);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
SetViewportMode(viewportMode);
|
|
SetViewportMode(viewportMode);
|
|
|
SetActiveViewport(viewports[0]);
|
|
SetActiveViewport(viewports[0]);
|
|
|
|
|
|
|
@@ -418,7 +418,7 @@ void CreateViewportUI()
|
|
|
viewportUI = UIElement();
|
|
viewportUI = UIElement();
|
|
|
ui.root.AddChild(viewportUI);
|
|
ui.root.AddChild(viewportUI);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
viewportUI.SetFixedSize(viewportArea.width, viewportArea.height);
|
|
viewportUI.SetFixedSize(viewportArea.width, viewportArea.height);
|
|
|
viewportUI.position = IntVector2(viewportArea.top, viewportArea.left);
|
|
viewportUI.position = IntVector2(viewportArea.top, viewportArea.left);
|
|
|
viewportUI.clipChildren = true;
|
|
viewportUI.clipChildren = true;
|
|
@@ -618,7 +618,7 @@ void SetViewportMode(uint mode = VIEWPORT_SINGLE)
|
|
|
viewports[i].cameraNode.rotation = cameraRotations[src];
|
|
viewports[i].cameraNode.rotation = cameraRotations[src];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
ReacquireCameraYawPitch();
|
|
ReacquireCameraYawPitch();
|
|
|
UpdateViewParameters();
|
|
UpdateViewParameters();
|
|
|
UpdateCameraPreview();
|
|
UpdateCameraPreview();
|
|
@@ -1163,10 +1163,14 @@ void UpdateView(float timeStep)
|
|
|
cameraNode.worldPosition = centerPoint - q * Vector3(0.0, 0.0, d.length);
|
|
cameraNode.worldPosition = centerPoint - q * Vector3(0.0, 0.0, d.length);
|
|
|
orbiting = true;
|
|
orbiting = true;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
FadeUI();
|
|
FadeUI();
|
|
|
|
|
+ input.mouseGrabbed = true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ else
|
|
|
|
|
+ input.mouseGrabbed = false;
|
|
|
|
|
+
|
|
|
if (orbiting && !input.mouseButtonDown[MOUSEB_MIDDLE])
|
|
if (orbiting && !input.mouseButtonDown[MOUSEB_MIDDLE])
|
|
|
orbiting = false;
|
|
orbiting = false;
|
|
|
|
|
|
|
@@ -1378,6 +1382,10 @@ void ViewRaycast(bool mouseClick)
|
|
|
if (ui.HasModalElement())
|
|
if (ui.HasModalElement())
|
|
|
return;
|
|
return;
|
|
|
|
|
|
|
|
|
|
+ // Ignore if mouse is grabbed by other operation
|
|
|
|
|
+ if (input.mouseGrabbed)
|
|
|
|
|
+ return;
|
|
|
|
|
+
|
|
|
IntVector2 pos = ui.cursorPosition;
|
|
IntVector2 pos = ui.cursorPosition;
|
|
|
UIElement@ elementAtPos = ui.GetElementAt(pos, pickMode != PICK_UI_ELEMENTS);
|
|
UIElement@ elementAtPos = ui.GetElementAt(pos, pickMode != PICK_UI_ELEMENTS);
|
|
|
if(editMode==EDIT_SPAWN)
|
|
if(editMode==EDIT_SPAWN)
|
|
@@ -1393,7 +1401,7 @@ void ViewRaycast(bool mouseClick)
|
|
|
|
|
|
|
|
DebugRenderer@ debug = editorScene.debugRenderer;
|
|
DebugRenderer@ debug = editorScene.debugRenderer;
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (pickMode == PICK_UI_ELEMENTS)
|
|
if (pickMode == PICK_UI_ELEMENTS)
|
|
|
{
|
|
{
|
|
|
bool leftClick = mouseClick && input.mouseButtonPress[MOUSEB_LEFT];
|
|
bool leftClick = mouseClick && input.mouseButtonPress[MOUSEB_LEFT];
|