stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-31 04:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

working on visual mode

Browse source
This commit is contained in:
codeimp 2008-12-17 15:30:50 +00:00
parent 04faf905c1
commit 8192c3c058
6 changed files with 119 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Source/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
View file

@ -75,6 +75,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
public virtual void OnSelectBegin() { }
public virtual void OnSelectEnd() { }
public virtual void OnEditBegin() { }
public virtual void OnMouseMove(MouseEventArgs e) { }
// Edit button released
public virtual void OnEditEnd()

103
Source/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
View file

@ -39,7 +39,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
internal abstract class BaseVisualGeometrySidedef : VisualGeometry, IVisualEventReceiver
{
#region ================== Constants
private const float DRAG_ANGLE_TOLERANCE = 0.02f;
#endregion
#region ================== Variables
@ -49,18 +51,32 @@ namespace CodeImp.DoomBuilder.BuilderModes
protected float top;
protected float bottom;
// UV dragging
private float dragstartanglexy;
private float dragstartanglez;
private Vector3D dragorigin;
private Vector3D deltaxy;
private Vector3D deltaz;
private int startoffsetx;
private int startoffsety;
protected bool uvdragging;
#endregion
#region ================== Properties
public bool IsDraggingUV { get { return uvdragging; } }
#endregion
#region ================== Constructor / Destructor
// Constructor for sidedefs
public BaseVisualGeometrySidedef(BaseVisualMode mode, VisualSector vs, Sidedef sd) : base(vs, sd)
{
this.mode = mode;
this.deltaz = new Vector3D(0.0f, 0.0f, 1.0f);
this.deltaxy = (sd.Line.End.Position - sd.Line.Start.Position) * sd.Line.LengthInv;
}
#endregion
@ -86,19 +102,86 @@ namespace CodeImp.DoomBuilder.BuilderModes
#endregion
#region ================== Events
// Unused
public virtual void OnSelectBegin() { }
public virtual void OnSelectEnd() { }
public virtual void OnEditBegin() { }
// Edit button pressed
public virtual void OnEditBegin()
{
dragstartanglexy = mode.CameraAngleXY;
dragstartanglez = mode.CameraAngleZ;
dragorigin = pickintersect;
startoffsetx = Sidedef.OffsetX;
startoffsety = Sidedef.OffsetY;
}
// Edit button released
public virtual void OnEditEnd()
{
List<Linedef> lines = new List<Linedef>();
lines.Add(this.Sidedef.Line);
DialogResult result = General.Interface.ShowEditLinedefs(lines);
if(result == DialogResult.OK) (this.Sector as BaseVisualSector).Rebuild();
// Was dragging?
if(uvdragging)
{
// Dragging stops now
mode.UnlockTarget();
uvdragging = false;
}
else
{
List<Linedef> lines = new List<Linedef>();
lines.Add(this.Sidedef.Line);
DialogResult result = General.Interface.ShowEditLinedefs(lines);
if(result == DialogResult.OK) (this.Sector as BaseVisualSector).Rebuild();
}
}
// Mouse moves
public virtual void OnMouseMove(MouseEventArgs e)
{
// Dragging UV?
if(uvdragging)
{
UpdateDragUV();
}
else
{
// Check if tolerance is exceeded to start UV dragging
float deltaxy = mode.CameraAngleXY - dragstartanglexy;
float deltaz = mode.CameraAngleZ - dragstartanglez;
if((Math.Abs(deltaxy) + Math.Abs(deltaz)) > DRAG_ANGLE_TOLERANCE)
{
// Start drag now
uvdragging = true;
mode.LockTarget();
UpdateDragUV();
}
}
}
// This is called to update UV dragging
protected virtual void UpdateDragUV()
{
float u_ray;
// Calculate intersection position
Line2D ray = new Line2D(mode.CameraPosition, mode.CameraTarget);
Sidedef.Line.Line.GetIntersection(ray, out u_ray);
Vector3D intersect = mode.CameraPosition + (mode.CameraTarget - mode.CameraPosition) * u_ray;
// Calculate offsets
Vector3D dragdelta = intersect - dragorigin;
Vector3D dragdeltaxy = dragdelta * deltaxy;
Vector3D dragdeltaz = dragdelta * deltaz;
float offsetx = dragdeltaxy.GetLength();
float offsety = dragdeltaz.GetLength();
// Apply offsets
Sidedef.OffsetX = startoffsetx + (int)Math.Round(offsetx);
Sidedef.OffsetY = startoffsety + (int)Math.Round(offsety);
// TODO: Update sidedef geometry
}
#endregion

24
Source/BuilderModes/VisualModes/BaseVisualMode.cs
View file

@ -120,6 +120,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
locktarget = false;
}
// This picks a new target, if not locked
private void PickTargetUnlocked()
{
if(!locktarget) PickTarget();
}
// This picks a new target
private void PickTarget()
{
@ -220,7 +226,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Time to pick a new target?
if(General.Clock.CurrentTime > (lastpicktime + PICK_INTERVAL))
{
if(!locktarget) PickTarget();
PickTargetUnlocked();
lastpicktime = General.Clock.CurrentTime;
}
}
@ -269,13 +275,20 @@ namespace CodeImp.DoomBuilder.BuilderModes
PickTarget();
}
// Mouse moves
public override void OnMouseMove(MouseEventArgs e)
{
base.OnMouseMove(e);
}
#endregion
#region ================== Actions
[BeginAction("visualselect", BaseAction = true)]
public void BeginSelect()
{
PickTargetUnlocked();
if(target.picked != null) (target.picked as IVisualEventReceiver).OnSelectBegin();
}
@ -288,6 +301,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
[BeginAction("visualedit", BaseAction = true)]
public void BeginEdit()
{
PickTargetUnlocked();
if(target.picked != null) (target.picked as IVisualEventReceiver).OnEditBegin();
}
@ -300,24 +314,28 @@ namespace CodeImp.DoomBuilder.BuilderModes
[BeginAction("raisesector8")]
public void RaiseSector8()
{
PickTargetUnlocked();
ChangeTargetHeight(8);
}
[BeginAction("lowersector8")]
public void LowerSector8()
{
PickTargetUnlocked();
ChangeTargetHeight(-8);
}
[BeginAction("raisesector1")]
public void RaiseSector1()
{
PickTargetUnlocked();
ChangeTargetHeight(1);
}
[BeginAction("lowersector1")]
public void LowerSector1()
{
PickTargetUnlocked();
ChangeTargetHeight(-1);
}

1
Source/BuilderModes/VisualModes/BaseVisualThing.cs
View file

@ -331,6 +331,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
public virtual void OnSelectBegin() { }
public virtual void OnSelectEnd() { }
public virtual void OnEditBegin() { }
public virtual void OnMouseMove(MouseEventArgs e) { }
// Edit button released
public virtual void OnEditEnd()

1
Source/BuilderModes/VisualModes/IVisualEventReceiver.cs
View file

@ -43,5 +43,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
void OnSelectEnd();
void OnEditBegin();
void OnEditEnd();
void OnMouseMove(MouseEventArgs e);
}
}

2
Source/VisualModes/VisualMode.cs
View file

@ -93,6 +93,8 @@ namespace CodeImp.DoomBuilder.VisualModes
public Vector3D CameraPosition { get { return campos; } set { campos = value; } }
public Vector3D CameraTarget { get { return camtarget; } }
public float CameraAngleXY { get { return camanglexy; } }
public float CameraAngleZ { get { return camanglez; } }
public Sector CameraSector { get { return camsector; } }
public bool ProcessGeometry { get { return processgeometry; } set { processgeometry = value; } }
public bool ProcessThings { get { return processthings; } set { processthings = value; } }