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

Several improvements in Draw Rectangle mode (rectangles with beveled corners can now be drawn).

Browse source
This commit is contained in:
MaxED 2012-06-06 00:38:28 +00:00
parent 16d068f831
commit 8b31dd2677
3 changed files with 238 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Build/GZBuilder.cfg
View file

@ -151,6 +151,11 @@ shortcuts
buildermodes_classiccopyproperties = 196675;
buildermodes_togglehighlight = 72;
buildermodes_classicpasteproperties = 196694;
buildermodes_drawrectanglemode = 196676;
buildermodes_decreasebevel = 196603;
buildermodes_increasesubdivlevel = 131066;
buildermodes_increasebevel = 196602;
buildermodes_decreasesubdivlevel = 131067;
}

235
Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs
View file

@ -21,13 +21,26 @@ namespace CodeImp.DoomBuilder.BuilderModes.ClassicModes
public class DrawRectangleMode : DrawGeometryMode
{
//private LineLengthLabel hintLabel;
private int bevelWidth;
private int subdivisions;
private const int MAX_SUBDIVISIONS = 16;
private Vector2D start;
private Vector2D end;
private int width;
private int height;
public DrawRectangleMode() : base() {
snaptogrid = true;
}
override protected void Update() {
PixelColor stitchcolor = General.Colors.Highlight;
PixelColor losecolor = General.Colors.Selection;
PixelColor color;
snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
DrawnVertex curp = GetCurrentPosition();
@ -39,23 +52,32 @@ namespace CodeImp.DoomBuilder.BuilderModes.ClassicModes
color = snaptogrid ? stitchcolor : losecolor;
if (points.Count == 1) {
//points[1] = curp; // 2-nd point is opposite corner of rectangle
updateReferencePoints(points[0], curp);
Vector2D[] shape = getShape(start, end);
//calculate positions
Vector2D[] positions = new Vector2D[] { points[0].pos, new Vector2D(curp.pos.x, points[0].pos.y), curp.pos, new Vector2D(points[0].pos.x, curp.pos.y), points[0].pos };
//render shape
for (int i = 1; i < shape.Length; i++)
renderer.RenderLine(shape[i - 1], shape[i], LINE_THICKNESS, color, true);
for (int i = 1; i < positions.Length; i++) {
// Render lines
renderer.RenderLine(positions[i - 1], positions[i], LINE_THICKNESS, color, true);
// And labels
labels[i - 1].Start = positions[i - 1];
labels[i - 1].End = positions[i];
//and labels
Vector2D[] labelCoords = new Vector2D[]{start, new Vector2D(end.x, start.y), end, new Vector2D(start.x, end.y), start};
for (int i = 1; i < 5; i++) {
labels[i - 1].Start = labelCoords[i - 1];
labels[i - 1].End = labelCoords[i];
renderer.RenderText(labels[i - 1].TextLabel);
}
//render hint
/*if (width > 64 * vsize && height > 32 * vsize) {
float vPos = start.y + height / 2.0f;
hintLabel.Start = new Vector2D(start.x, vPos);
hintLabel.End = new Vector2D(end.x, vPos);
renderer.RenderText(hintLabel.TextLabel); //todo: extend LieLengthLabel class
}*/
// Render vertices
for (int i = 0; i < 4; i++)
renderer.RenderRectangleFilled(new RectangleF(positions[i].x - vsize, positions[i].y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
for (int i = 0; i < shape.Length; i++)
renderer.RenderRectangleFilled(new RectangleF(shape[i].x - vsize, shape[i].y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
} else {
// Render vertex at cursor
renderer.RenderRectangleFilled(new RectangleF(curp.pos.x - vsize, curp.pos.y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
@ -69,13 +91,140 @@ namespace CodeImp.DoomBuilder.BuilderModes.ClassicModes
renderer.Present();
}
// Accepted
//update top-left and bottom-right points, which define drawing shape
private void updateReferencePoints(DrawnVertex p1, DrawnVertex p2) {
if (p1.pos.x < p2.pos.x) {
start.x = p1.pos.x;
end.x = p2.pos.x;
} else {
start.x = p2.pos.x;
end.x = p1.pos.x;
}
if (p1.pos.y < p2.pos.y) {
start.y = p1.pos.y;
end.y = p2.pos.y;
} else {
start.y = p2.pos.y;
end.y = p1.pos.y;
}
width = (int)(end.x - start.x);
height = (int)(end.y - start.y);
}
private Vector2D[] getShape(Vector2D pStart, Vector2D pEnd) {
//no shape
if (pEnd.x == pStart.x && pEnd.y == pStart.y)
return new Vector2D[0];
//no corners
if (bevelWidth == 0)
return new Vector2D[] { pStart, new Vector2D((int)pEnd.x, (int)pStart.y), pEnd, new Vector2D((int)pStart.x, (int)pEnd.y), pStart };
//got corners
bool reverse = false;
int bevel = Math.Min(Math.Abs(bevelWidth), Math.Min(width, height) / 2);
if (subdivisions > 0 && bevelWidth < 0) {
bevel *= -1;
reverse = true;
}
List<Vector2D> l_points = new List<Vector2D>();
//top-left corner
l_points.AddRange(getCornerPoints(pStart, bevel, bevel, !reverse));
//top-right corner
l_points.AddRange(getCornerPoints(new Vector2D(pEnd.x, pStart.y), -bevel, bevel, reverse));
//bottom-right corner
l_points.AddRange(getCornerPoints(pEnd, -bevel, -bevel, !reverse));
//bottom-left corner
l_points.AddRange(getCornerPoints(new Vector2D(pStart.x, pEnd.y), bevel, -bevel, reverse));
//closing point
l_points.Add(l_points[0]);
Vector2D[] points = new Vector2D[l_points.Count];
l_points.CopyTo(points);
return points;
}
private Vector2D[] getCornerPoints(Vector2D startPoint, int bevel_width, int bevel_height, bool reverse) {
Vector2D[] points;
if (subdivisions == 0) {
points = new Vector2D[2];
points[0] = new Vector2D(startPoint.x, startPoint.y + bevel_height);
points[1] = new Vector2D(startPoint.x + bevel_width, startPoint.y);
if (!reverse) Array.Reverse(points);
return points;
}
Vector2D center = (bevelWidth > 0 ? new Vector2D(startPoint.x + bevel_width, startPoint.y + bevel_height) : startPoint);
float curAngle = (float)Math.PI;
int steps = subdivisions + 2;
points = new Vector2D[steps];
float stepAngle = (float)Math.PI / 2.0f / (subdivisions + 1);
for (int i = 0; i < steps; i++) {
points[i] = new Vector2D(center.x + (float)Math.Sin(curAngle) * bevel_width, center.y + (float)Math.Cos(curAngle) * bevel_height);
curAngle += stepAngle;
}
if (reverse) Array.Reverse(points);
return points;
}
// This draws a point at a specific location
override public bool DrawPointAt(Vector2D pos, bool stitch, bool stitchline) {
if (pos.x < General.Map.Config.LeftBoundary || pos.x > General.Map.Config.RightBoundary ||
pos.y > General.Map.Config.TopBoundary || pos.y < General.Map.Config.BottomBoundary)
return false;
DrawnVertex newpoint = new DrawnVertex();
newpoint.pos = pos;
newpoint.stitch = true; //stitch
newpoint.stitchline = stitchline;
points.Add(newpoint);
if (points.Count == 1) { //add point and labels
labels.AddRange(new LineLengthLabel[] { new LineLengthLabel(), new LineLengthLabel(), new LineLengthLabel(), new LineLengthLabel() });
//hintLabel = new LineLengthLabel();
Update();
} else if (points[0].pos == points[1].pos) { //nothing is drawn
points = new List<DrawnVertex>();
FinishDraw();
} else {
//create vertices for final shape.
updateReferencePoints(points[0], newpoint);
points = new List<DrawnVertex>(); //clear points
Vector2D[] shape = getShape(start, end);
for (int i = 0; i < shape.Length; i++)
base.DrawPointAt(shape[i], true, true);
FinishDraw();
}
return true;
}
override public void RemovePoint() {
if (points.Count > 0) points.RemoveAt(points.Count - 1);
if (labels.Count > 0) labels = new List<LineLengthLabel>();
Update();
}
//EVENTS
override public void OnAccept() {
Cursor.Current = Cursors.AppStarting;
General.Settings.FindDefaultDrawSettings();
// When we have a rectangle
if (points.Count == 5) {
if (points.Count > 4) {
// Make undo for the draw
General.Map.UndoRedo.CreateUndo("Rectangle draw");
@ -123,46 +272,32 @@ namespace CodeImp.DoomBuilder.BuilderModes.ClassicModes
General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
}
// This draws a point at a specific location
override public bool DrawPointAt(Vector2D pos, bool stitch, bool stitchline) {
if (pos.x < General.Map.Config.LeftBoundary || pos.x > General.Map.Config.RightBoundary ||
pos.y > General.Map.Config.TopBoundary || pos.y < General.Map.Config.BottomBoundary)
return false;
DrawnVertex newpoint = new DrawnVertex();
newpoint.pos = pos;
newpoint.stitch = stitch;
newpoint.stitchline = stitchline;
points.Add(newpoint);
if (points.Count == 1) { //add point and labels
labels.AddRange(new LineLengthLabel[] { new LineLengthLabel(), new LineLengthLabel(), new LineLengthLabel(), new LineLengthLabel() });
//ACTIONS
[BeginAction("increasesubdivlevel")]
private void increaseSubdivLevel() {
if (subdivisions < MAX_SUBDIVISIONS) {
subdivisions++;
Update();
} else if (points[0].pos == points[1].pos) { //nothing is drawn
points = new List<DrawnVertex>();
FinishDraw();
} else {
//recreate vertices for final shape.
//I must be missing something simple here, but just adding new DrawnVertices to points
//produces errors when created sector intersects with already existing ones...
bool stitchFirst = points[0].stitch;
bool stitchLineFirst = points[0].stitchline;
Vector2D[] points2D = new Vector2D[] { points[0].pos, new Vector2D(points[1].pos.x, points[0].pos.y), points[1].pos, new Vector2D(points[0].pos.x, points[1].pos.y), points[0].pos };
points = new List<DrawnVertex>();
base.DrawPointAt(points2D[0], stitchFirst, stitchLineFirst);
for (int i = 1; i < points2D.Length; i++)
base.DrawPointAt(points2D[i], snaptogrid, snaptonearest);
FinishDraw();
}
return true;
}
override public void RemovePoint() {
if (points.Count > 0) points.RemoveAt(points.Count - 1);
if (labels.Count > 0) labels = new List<LineLengthLabel>();
[BeginAction("decreasesubdivlevel")]
private void decreaseSubdivLevel() {
if (subdivisions > 0) {
subdivisions--;
Update();
}
}
[BeginAction("increasebevel")]
private void increaseBevel() {
bevelWidth += General.Map.Grid.GridSize;
Update();
}
[BeginAction("decreasebevel")]
private void decreaseBevel() {
bevelWidth -= General.Map.Grid.GridSize;
Update();
}
}

48
Source/Plugins/BuilderModes/Resources/Actions.cfg
View file

@ -111,6 +111,54 @@ drawrectanglemode
default = 196676;
}
//mxd
increasesubdivlevel
{
title = "Increase Sudivision Level";
category = "drawing";
description = "Increases subdivision level in Rectangle and Ellipse Drawing Modes.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
default = 131066;
}
//mxd
decreasesubdivlevel
{
title = "Decrease Sudivision Level";
category = "drawing";
description = "Decreases subdivision level in Rectangle and Ellipse Drawing Modes.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
default = 131067;
}
//mxd
increasebevel
{
title = "Increase Corners Bevel";
category = "drawing";
description = "Increase corners bevel in Rectangle Drawing Modes. Bevel can be negative.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
default = 196602;
}
//mxd
decreasebevel
{
title = "Decrease Corners Bevel";
category = "drawing";
description = "Decreases corners bevel in Rectangle Drawing Modes. Bevel can be negative.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
default = 196603;
}
drawpoint
{
title = "Draw Vertex";