stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-27 06:02:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed crosshair in visual mode

Browse source
This commit is contained in:
codeimp 2008-12-04 17:59:34 +00:00
parent 95f6dcee6a
commit 4b81abdb17
1 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Source/Rendering/Renderer3D.cs
View file

@ -43,16 +43,20 @@ namespace CodeImp.DoomBuilder.Rendering
private const int RENDER_PASSES = 4; private const int RENDER_PASSES = 4;
private const float PROJ_NEAR_PLANE = 1f; private const float PROJ_NEAR_PLANE = 1f;
private const float CROSSHAIR_SCALE = 0.1f; private const float CROSSHAIR_SCALE = 0.06f;
#endregion #endregion
#region ================== Variables #region ================== Variables
// Matrices // Matrices
private Matrix projection; private Matrix projection;
private Matrix view; private Matrix view3d;
private Matrix billboard; private Matrix billboard;
private Matrix viewproj; private Matrix viewproj;
private Matrix view2d;
// Window size
private Size windowsize;
// Frustum // Frustum
private ProjectedFrustum2D frustum; private ProjectedFrustum2D frustum;
@ -82,11 +86,12 @@ namespace CodeImp.DoomBuilder.Rendering
{ {
// Initialize // Initialize
CreateProjection(); CreateProjection();
CreateMatrices2D();
// Dummy frustum // Dummy frustum
frustum = new ProjectedFrustum2D(new Vector2D(), 0.0f, 0.0f, PROJ_NEAR_PLANE, frustum = new ProjectedFrustum2D(new Vector2D(), 0.0f, 0.0f, PROJ_NEAR_PLANE,
General.Settings.ViewDistance, Angle2D.DegToRad((float)General.Settings.VisualFOV)); General.Settings.ViewDistance, Angle2D.DegToRad((float)General.Settings.VisualFOV));
// We have no destructor // We have no destructor
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
@ -119,14 +124,15 @@ namespace CodeImp.DoomBuilder.Rendering
// (when resized or display adapter was changed) // (when resized or display adapter was changed)
public override void ReloadResource() public override void ReloadResource()
{ {
CreateMatrices2D();
} }
// This makes screen vertices for display // This makes screen vertices for display
private void CreateCrosshairVerts(Size texturesize) private void CreateCrosshairVerts(Size texturesize)
{ {
// Determine coordinates // Determine coordinates
float width = (float)General.Map.Graphics.Viewport.Width; float width = (float)windowsize.Width;
float height = (float)General.Map.Graphics.Viewport.Height; float height = (float)windowsize.Height;
float size = (float)height * CROSSHAIR_SCALE; float size = (float)height * CROSSHAIR_SCALE;
RectangleF rect = new RectangleF((width - size) / 2, (height - size) / 2, size, size); RectangleF rect = new RectangleF((width - size) / 2, (height - size) / 2, size, size);
@ -179,7 +185,7 @@ namespace CodeImp.DoomBuilder.Rendering
projection = Matrix.PerspectiveFovRH(fovy, aspect, PROJ_NEAR_PLANE, General.Settings.ViewDistance); projection = Matrix.PerspectiveFovRH(fovy, aspect, PROJ_NEAR_PLANE, General.Settings.ViewDistance);
// Apply matrices // Apply matrices
ApplyMatrices(); ApplyMatrices3D();
} }
// This creates matrices for a camera view // This creates matrices for a camera view
@ -198,21 +204,38 @@ namespace CodeImp.DoomBuilder.Rendering
General.Settings.ViewDistance, Angle2D.DegToRad((float)General.Settings.VisualFOV)); General.Settings.ViewDistance, Angle2D.DegToRad((float)General.Settings.VisualFOV));
// Make the view matrix // Make the view matrix
view = Matrix.LookAtRH(D3DDevice.V3(pos), D3DDevice.V3(lookat), new Vector3(0f, 0f, 1f)); view3d = Matrix.LookAtRH(D3DDevice.V3(pos), D3DDevice.V3(lookat), new Vector3(0f, 0f, 1f));
// Make the billboard matrix // Make the billboard matrix
billboard = Matrix.RotationYawPitchRoll(0f, anglexy, anglez - Angle2D.PI); billboard = Matrix.RotationYawPitchRoll(0f, anglexy, anglez - Angle2D.PI);
} }
// This creates 2D view matrix
private void CreateMatrices2D()
{
windowsize = graphics.RenderTarget.ClientSize;
Matrix scaling = Matrix.Scaling((1f / (float)windowsize.Width) * 2f, (1f / (float)windowsize.Height) * -2f, 1f);
Matrix translate = Matrix.Translation(-(float)windowsize.Width * 0.5f, -(float)windowsize.Height * 0.5f, 0f);
view2d = Matrix.Multiply(translate, scaling);
}
// This applies the matrices // This applies the matrices
private void ApplyMatrices() private void ApplyMatrices3D()
{ {
viewproj = view * projection; viewproj = view3d * projection;
graphics.Device.SetTransform(TransformState.World, Matrix.Identity); graphics.Device.SetTransform(TransformState.World, Matrix.Identity);
graphics.Device.SetTransform(TransformState.Projection, projection); graphics.Device.SetTransform(TransformState.Projection, projection);
graphics.Device.SetTransform(TransformState.View, view); graphics.Device.SetTransform(TransformState.View, view3d);
} }
// This sets the appropriate view matrix
public void ApplyMatrices2D()
{
graphics.Device.SetTransform(TransformState.World, Matrix.Identity);
graphics.Device.SetTransform(TransformState.Projection, Matrix.Identity);
graphics.Device.SetTransform(TransformState.View, view2d);
}
#endregion #endregion
#region ================== Start / Finish #region ================== Start / Finish
@ -233,7 +256,7 @@ namespace CodeImp.DoomBuilder.Rendering
graphics.Device.SetRenderState(RenderState.TextureFactor, -1); graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
// Matrices // Matrices
ApplyMatrices(); ApplyMatrices3D();
// Create crosshair vertices // Create crosshair vertices
if(crosshairverts == null) if(crosshairverts == null)
@ -270,6 +293,9 @@ namespace CodeImp.DoomBuilder.Rendering
graphics.Shaders.World3D.Begin(); graphics.Shaders.World3D.Begin();
graphics.Shaders.World3D.WorldViewProj = viewproj; graphics.Shaders.World3D.WorldViewProj = viewproj;
// Matrices
ApplyMatrices3D();
// SOLID PASS // SOLID PASS
graphics.Shaders.World3D.BeginPass(0); graphics.Shaders.World3D.BeginPass(0);
RenderSinglePass((int)RenderPass.Solid); RenderSinglePass((int)RenderPass.Solid);
@ -408,7 +434,7 @@ namespace CodeImp.DoomBuilder.Rendering
graphics.Device.SetRenderState(RenderState.TextureFactor, -1); graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
graphics.Device.SetTransform(TransformState.World, Matrix.Identity); graphics.Device.SetTransform(TransformState.World, Matrix.Identity);
graphics.Device.SetTransform(TransformState.Projection, Matrix.Identity); graphics.Device.SetTransform(TransformState.Projection, Matrix.Identity);
graphics.Device.SetTransform(TransformState.View, Matrix.Identity); ApplyMatrices2D();
// Draw // Draw
graphics.Shaders.Display2D.Begin(); graphics.Shaders.Display2D.Begin();