Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix editor raycast

Browse Source
This commit is contained in:
ExMatics HydrogenC
2024-06-04 08:39:14 +08:00
parent a8dc67a1b2
commit cde3e3d710
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Editor/Viewport/EditorViewport.cs
+3 -3
View File
@@ -1398,9 +1398,9 @@ namespace FlaxEditor.Viewport
Matrix.Multiply(ref v, ref p, out var ivp); Matrix.Multiply(ref v, ref p, out var ivp);
ivp.Invert(); ivp.Invert();
// Create near and far points // Create near and far points, with device depth of 1 and 0 respectively
var nearPoint = new Vector3(mousePosition, _nearPlane); var nearPoint = new Vector3(mousePosition, 1.0f);
var farPoint = new Vector3(mousePosition, _farPlane); var farPoint = new Vector3(mousePosition, 0.0f);
viewport.Unproject(ref nearPoint, ref ivp, out nearPoint); viewport.Unproject(ref nearPoint, ref ivp, out nearPoint);
viewport.Unproject(ref farPoint, ref ivp, out farPoint); viewport.Unproject(ref farPoint, ref ivp, out farPoint);
Source/Engine/Core/Math/Viewport.cs
+5 -7
View File
@@ -296,15 +296,13 @@ namespace FlaxEngine
/// <summary> /// <summary>
/// Converts a screen space point into a corresponding point in world space. /// Converts a screen space point into a corresponding point in world space.
/// </summary> /// </summary>
/// <param name="source">The vector to project.</param> /// <param name="source">The vector to project, screen uv and device depth.</param>
/// <param name="projection">The projection matrix.</param> /// <param name="projection">The projection matrix.</param>
/// <param name="view">The view matrix.</param> /// <param name="view">The view matrix.</param>
/// <param name="world">The world matrix.</param>
/// <returns>The unprojected Vector.</returns> /// <returns>The unprojected Vector.</returns>
public Vector3 Unproject(Vector3 source, Matrix projection, Matrix view, Matrix world) public Vector3 Unproject(Vector3 source, Matrix projection, Matrix view)
{ {
Matrix.Multiply(ref world, ref view, out Matrix matrix); Matrix.Multiply(ref view, ref projection, out Matrix matrix);
Matrix.Multiply(ref matrix, ref projection, out matrix);
Matrix.Invert(ref matrix, out matrix); Matrix.Invert(ref matrix, out matrix);
Unproject(ref source, ref matrix, out Vector3 vector); Unproject(ref source, ref matrix, out Vector3 vector);
@@ -314,8 +312,8 @@ namespace FlaxEngine
/// <summary> /// <summary>
/// Converts a screen space point into a corresponding point in world space. /// Converts a screen space point into a corresponding point in world space.
/// </summary> /// </summary>
/// <param name="source">The vector to project.</param> /// <param name="source">The vector to project, screen uv and device depth.</param>
/// <param name="matrix">An inverted combined WorldViewProjection matrix.</param> /// <param name="matrix">An inverted combined ViewProjection matrix.</param>
/// <param name="vector">The unprojected vector.</param> /// <param name="vector">The unprojected vector.</param>
public void Unproject(ref Vector3 source, ref Matrix matrix, out Vector3 vector) public void Unproject(ref Vector3 source, ref Matrix matrix, out Vector3 vector)
{ {
Source/Shaders/DebugDraw.shader
+1 -1
View File
@@ -43,7 +43,7 @@ float4 PS(VS2PS input) : SV_Target
{ {
float sceneDepthDeviceZ = SceneDepthTexture.Load(int3(input.Position.xy, 0)).r; float sceneDepthDeviceZ = SceneDepthTexture.Load(int3(input.Position.xy, 0)).r;
float interpolatedDeviceZ = input.Position.z; float interpolatedDeviceZ = input.Position.z;
clip(sceneDepthDeviceZ - interpolatedDeviceZ); clip(interpolatedDeviceZ - sceneDepthDeviceZ);
} }
#endif #endif