GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaks again ...

Browse Source
This commit is contained in:
Jean-Baptiste Perrier
2021-03-06 13:19:49 +01:00
parent ae3ce49b92
commit a82c669504
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/Viewport/Cameras/FPSCamera.cs
View File

@@ -147,9 +147,7 @@ namespace FlaxEditor.Viewport.Cameras
if (Viewport.UseOrthographicProjection) if (Viewport.UseOrthographicProjection)
{ {
Vector3 offset = Vector3.Forward * orientation; position = sphere.Center + Vector3.Backward * orientation * (sphere.Radius * 5.0f);
offset.Negate();
position = sphere.Center + offset * (sphere.Radius * 5.0f);
Viewport.OrthographicScale = Vector3.Distance(position, sphere.Center) / 1000; Viewport.OrthographicScale = Vector3.Distance(position, sphere.Center) / 1000;
} }
else else

16
Source/Editor/Viewport/EditorViewport.cs
View File

@@ -544,10 +544,8 @@ namespace FlaxEditor.Viewport
var orient = ViewOrientation; var orient = ViewOrientation;
if (!Editor.Instance.SceneEditing.HasSthSelected) if (!Editor.Instance.SceneEditing.HasSthSelected)
{ {
var invdir = ViewOrientation; var pos = new Vector3(0.0f) + Vector3.Backward * ViewOrientation * 1000.0f;
invdir.Invert(); ((FPSCamera)ViewportCamera).MoveViewport(pos, ViewOrientation);
ViewPosition = new Vector3(0.0f) + Vector3.Forward * orient * 1000.0f;
((FPSCamera)ViewportCamera).MoveViewport(ViewPosition, ViewOrientation);
} }
else else
((FPSCamera)ViewportCamera).ShowActors(Editor.Instance.Windows.EditWin.Viewport.TransformGizmo.SelectedParents, ref orient); ((FPSCamera)ViewportCamera).ShowActors(Editor.Instance.Windows.EditWin.Viewport.TransformGizmo.SelectedParents, ref orient);
@@ -573,10 +571,8 @@ namespace FlaxEditor.Viewport
((FPSCamera)ViewportCamera).ShowActors(Editor.Instance.Windows.EditWin.Viewport.TransformGizmo.SelectedParents, ref orient); ((FPSCamera)ViewportCamera).ShowActors(Editor.Instance.Windows.EditWin.Viewport.TransformGizmo.SelectedParents, ref orient);
else else
{ {
var invdir = (Vector3)button.Tag; var pos = new Vector3(0.0f) + Vector3.Backward * orient * 2000.0f;
invdir.Negate(); ((FPSCamera)ViewportCamera).MoveViewport(pos, orient);
ViewPosition = new Vector3(0.0f) + Vector3.Forward * orient * 1000.0f;
((FPSCamera)ViewportCamera).MoveViewport(ViewPosition, ViewOrientation);
} }
}; };
} }
@@ -1310,8 +1306,8 @@ namespace FlaxEditor.Viewport
private readonly CameraViewpoint[] EditorViewportCameraViewpointValues = private readonly CameraViewpoint[] EditorViewportCameraViewpointValues =
{ {
new CameraViewpoint("Front", new Vector3(0, 0, 0)), new CameraViewpoint("Front", new Vector3(0, 180, 0)),
new CameraViewpoint("Back", new Vector3(0, 180, 0)), new CameraViewpoint("Back", new Vector3(0, 0, 0)),
new CameraViewpoint("Left", new Vector3(0, 90, 0)), new CameraViewpoint("Left", new Vector3(0, 90, 0)),
new CameraViewpoint("Right", new Vector3(0, -90, 0)), new CameraViewpoint("Right", new Vector3(0, -90, 0)),
new CameraViewpoint("Top", new Vector3(90, 0, 0)), new CameraViewpoint("Top", new Vector3(90, 0, 0)),