stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-07 08:21:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

working on visual mode

Browse source
This commit is contained in:
codeimp 2008-12-05 06:23:24 +00:00
parent 7a081986f2
commit 569c95064c
2 changed files with 75 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Source/Resources/Actions.cfg
View file

@ -380,6 +380,7 @@ moveforward
allowkeys = true; allowkeys = true;
allowmouse = true; allowmouse = true;
allowscroll = true; allowscroll = true;
disregardshift = true;
} }
movebackward movebackward
@ -390,6 +391,7 @@ movebackward
allowkeys = true; allowkeys = true;
allowmouse = true; allowmouse = true;
allowscroll = true; allowscroll = true;
disregardshift = true;
} }
moveleft moveleft
@ -400,6 +402,7 @@ moveleft
allowkeys = true; allowkeys = true;
allowmouse = true; allowmouse = true;
allowscroll = true; allowscroll = true;
disregardshift = true;
} }
moveright moveright
@ -410,6 +413,18 @@ moveright
allowkeys = true; allowkeys = true;
allowmouse = true; allowmouse = true;
allowscroll = true; allowscroll = true;
disregardshift = true;
}
movedoublespeed
{
title = "Double Speed";
category = "visual";
description = "Double the movement speed for the Move actions in visual mode while holding this button.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
disregardshift = true;
} }
testmap testmap

105
Source/VisualModes/VisualMode.cs
View file

@ -48,7 +48,7 @@ namespace CodeImp.DoomBuilder.VisualModes
private const float ANGLE_FROM_MOUSE = 0.0001f; private const float ANGLE_FROM_MOUSE = 0.0001f;
public const float MAX_ANGLEZ_LOW = 100f / Angle2D.PIDEG; public const float MAX_ANGLEZ_LOW = 100f / Angle2D.PIDEG;
public const float MAX_ANGLEZ_HIGH = (360f - 100f) / Angle2D.PIDEG; public const float MAX_ANGLEZ_HIGH = (360f - 100f) / Angle2D.PIDEG;
private const float CAMERA_SPEED = 6f; private const double MOVE_SPEED_MULTIPLIER = 0.001d;
#endregion #endregion
@ -72,6 +72,7 @@ namespace CodeImp.DoomBuilder.VisualModes
private bool keybackward; private bool keybackward;
private bool keyleft; private bool keyleft;
private bool keyright; private bool keyright;
private bool doublespeed;
// Map // Map
protected VisualBlockMap blockmap; protected VisualBlockMap blockmap;
@ -269,6 +270,18 @@ namespace CodeImp.DoomBuilder.VisualModes
{ {
keyright = false; keyright = false;
} }
[BeginAction("movedoublespeed", BaseAction = true)]
public virtual void BeginDoubleSpeed()
{
doublespeed = true;
}
[EndAction("movedoublespeed", BaseAction = true)]
public virtual void EndDoubleSpeed()
{
doublespeed = false;
}
#endregion #endregion
@ -403,50 +416,6 @@ namespace CodeImp.DoomBuilder.VisualModes
#endregion #endregion
#region ================== Processing
// This creates a visual sector
protected abstract VisualSector CreateVisualSector(Sector s);
// This fills the blockmap
protected virtual void FillBlockMap()
{
blockmap.AddLinedefsSet(General.Map.Map.Linedefs);
}
// Processing
public override void OnProcess(double deltatime)
{
Vector3D camvec;
Vector3D camvecstrafe;
base.OnProcess(deltatime);
// Calculate camera direction vectors
camvec = Vector3D.FromAngleXYZ(camanglexy, camanglez);
camvecstrafe = Vector3D.FromAngleXY(camanglexy + Angle2D.PIHALF);
// Move the camera
if(keyforward) campos += camvec * CAMERA_SPEED;
if(keybackward) campos -= camvec * CAMERA_SPEED;
if(keyleft) campos -= camvecstrafe * CAMERA_SPEED;
if(keyright) campos += camvecstrafe * CAMERA_SPEED;
// Target the camera
camtarget = campos + camvec;
// Apply new camera matrices
renderer.PositionAndLookAt(campos, camtarget);
// Visibility culling
DoCulling();
// Now redraw
General.Interface.RedrawDisplay();
}
#endregion
#region ================== Object Picking #region ================== Object Picking
// This picks an object from the scene // This picks an object from the scene
@ -593,6 +562,52 @@ namespace CodeImp.DoomBuilder.VisualModes
#endregion #endregion
#region ================== Processing
// This creates a visual sector
protected abstract VisualSector CreateVisualSector(Sector s);
// This fills the blockmap
protected virtual void FillBlockMap()
{
blockmap.AddLinedefsSet(General.Map.Map.Linedefs);
}
// Processing
public override void OnProcess(double deltatime)
{
Vector3D camvec;
Vector3D camvecstrafe;
double multiplier;
base.OnProcess(deltatime);
// Calculate camera direction vectors
camvec = Vector3D.FromAngleXYZ(camanglexy, camanglez);
camvecstrafe = Vector3D.FromAngleXY(camanglexy + Angle2D.PIHALF);
// Move the camera
if(doublespeed) multiplier = MOVE_SPEED_MULTIPLIER * 2.0f; else multiplier = MOVE_SPEED_MULTIPLIER;
if(keyforward) campos += camvec * (float)((double)General.Settings.MoveSpeed * multiplier * deltatime);
if(keybackward) campos -= camvec * (float)((double)General.Settings.MoveSpeed * multiplier * deltatime);
if(keyleft) campos -= camvecstrafe * (float)((double)General.Settings.MoveSpeed * multiplier * deltatime);
if(keyright) campos += camvecstrafe * (float)((double)General.Settings.MoveSpeed * multiplier * deltatime);
// Target the camera
camtarget = campos + camvec;
// Apply new camera matrices
renderer.PositionAndLookAt(campos, camtarget);
// Visibility culling
DoCulling();
// Now redraw
General.Interface.RedrawDisplay();
}
#endregion
#region ================== Rendering #region ================== Rendering
// Call this to simply render all visible sectors // Call this to simply render all visible sectors