From aaa469e8385722c398734fc696322e857b283244 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Wed, 20 Sep 2023 02:18:22 +0200
Subject: [PATCH] Fixed some issues with 3D circle rendering, plus UDMF config
 changes: - Added unique sprite sprites for custom rows/circles of items - Set
 default values for hoops and custom rows/circles of items

---
 .../Configurations/Includes/SRB222_things.cfg |  20 +++++++++++++++---
 Build/Sprites/customcircle.png                | Bin 0 -> 582 bytes
 Build/Sprites/customrow.png                   | Bin 0 -> 380 bytes
 Source/Core/GZBuilder/Data/LinksCollector.cs  |  19 ++++++++++++-----
 4 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 Build/Sprites/customcircle.png
 create mode 100644 Build/Sprites/customrow.png

diff --git a/Build/Configurations/Includes/SRB222_things.cfg b/Build/Configurations/Includes/SRB222_things.cfg
index 3eb3fed2..02ea4287 100644
--- a/Build/Configurations/Includes/SRB222_things.cfg
+++ b/Build/Configurations/Includes/SRB222_things.cfg
@@ -2341,7 +2341,7 @@ udmf
 		arrow = 1;
 		title = "Special Placement Patterns";
 		width = 16;
-		height = 384;
+		height = 64;
 		sprite = "RINGA0";
 
 		600
@@ -2349,6 +2349,7 @@ udmf
 			arrow = 0;
 			title = "5 Vertical Rings (Yellow Spring)";
 			sprite = "internal:ringverticalyellow";
+			height = 384;
 		}
 		601
 		{
@@ -2382,6 +2383,7 @@ udmf
 			title = "Circle of Rings (Big)";
 			sprite = "internal:circlebigring";
 			width = 192;
+			height = 384;
 			centerhitbox = true;
 		}
 		606
@@ -2397,6 +2399,7 @@ udmf
 			title = "Circle of Blue Spheres (Big)";
 			sprite = "internal:circlebigsphere";
 			width = 192;
+			height = 384;
 			centerhitbox = true;
 		}
 		608
@@ -2412,23 +2415,29 @@ udmf
 			title = "Circle of Rings and Spheres (Big)";
 			sprite = "internal:circlebigringsphere";
 			width = 192;
+			height = 384;
 			centerhitbox = true;
 		}
 		610
 		{
 			title = "Row of Items";
-			sprite = "RINGA0";
+			sprite = "internal:customrow";
+			width = 32;
+			height = 384;
 			arg0
 			{
 				title = "Number of items";
+				default = 5;
 			}
 			arg1
 			{
 				title = "Horizontal spacing";
+				default = 64;
 			}
 			arg2
 			{
 				title = "Vertical spacing";
+				default = 64;
 			}
 			stringarg0
 			{
@@ -2439,17 +2448,21 @@ udmf
 		611
 		{
 			title = "Circle of Items";
-			sprite = "RINGA0";
+			sprite = "internal:customcircle";
+			width = 32;
+			height = 64;
 			centerhitbox = true;
 			arg0
 			{
 				title = "Number of items";
+				default = 8;
 			}
 			arg1
 			{
 				title = "Radius";
 				renderstyle = "circle";
 				rendercolor = "#6600FF";
+				default = 192;
 			}
 			stringarg0
 			{
@@ -4538,6 +4551,7 @@ udmf
 			arg0
 			{
 				title = "Radius";
+				default = 96;
 			}
 		}
 	}
diff --git a/Build/Sprites/customcircle.png b/Build/Sprites/customcircle.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a0c80d642c998b70e5797b3310ed829034e0100
GIT binary patch
literal 582
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!IMRz8lYq1W5IdMIWc~!C8H<D5
zofy`glX(f`u%tWsIx;Y9?C1WI$O_~u2Ka=y0%?1XGsVUK_t?q)uUG#+o&WzyzW<*X
zo+hgNU#S6<{WkmK1t7&;666>B9}XD2{24(Oa29w(7BevL9R^{><M}I6fR;9Ux;TbJ
zxZj;}Tj-DhhfA>U`v3nAUg}Ui(B@|S>p|hMOB-^6JC^AxiT+>{P7RjIJ0cLpvNQeX
zIf0cwxIAL~YEl%WIkpR=?AY-^nc3DPXMt(Uk+O^v3_RaD?p$yXp4&E|A(&<T*EJoE
z=RY?rGkW0CC|<owNa~GP>3MsD3pF<xOiu`yZQPcBCApWSEQ4W*VBz`y{v}g5ZB2SE
z&v|kFr#SQVnZZk%_AUCkH)Yl?rB-!~yPW%@!Y{Pvb7=d1pL6`8<qEEQXN5PjuA0BB
zavR?+rGxh~7G8ON(eg!?aI?+X$E?k%v0<N1i1S=at?#{|kfmg~qw2Pctq8BB&dqD9
zb*B^u$a6bicidGo<usGnwuxQaPYKkgDa_4$Y$D`-xrWiieTknt^OA`T!7jHOSX+z*
zK7SKi@N7rXq6<b3N*=niRb}K$-&lB*ZJ%RaMxt<bb=>R7mAqE-o|_yIEZJLFGNrR`
zo-}XZajBdKKbAG-D=nJa==|A5)4;@kf)kLj^X?&@vzv1HnM4bxd~(}g1B@dEPgg&e
IbxsLQ08J+IXaE2J

literal 0
HcmV?d00001

diff --git a/Build/Sprites/customrow.png b/Build/Sprites/customrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fb4d7a73f03f3f7119467eb1c43e3fa4c37e794
GIT binary patch
literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!IMRz8lYq1W5IdMIWc~!C8H<D5
zofy`glX(f`u%tWsIx;Y9?C1WI$O_~u2Ka=y0%?1XGsVUK_t?q)uUG#+o&WzyzW<*X
zo+hgNU#S6<{WkmK1t7&;666>B9}XD2{24(Oa29w(7BevL9RguSQ4OyKpx{nV7srqY
z_qS8;@*P&-aJ%^E{crmZ1*zqCpI_2Hy{V-*S@?+yx64cc!#|&S4Rj_I`9(A~Y1dAC
zpccP=g0cPc*-h6OKL`e#xZE4hc|-ex{X~7`yB=&ePtE^uSNMp*Q3J^m$>bSgMG~`h
z_r)o-XKCJOXqpzEoqdBL>3of@^kKIJTSc8NxXV8aa5DI{>zMDs%o|Uf4;qym{TY$K
zwr--%pZAAF^n>^Ku*JIVn%E<uwvEfs$I$28x~b1=7*zN4x#YL5Rt0*3!PC{xWt~$(
F69AqLldJ#$

literal 0
HcmV?d00001

diff --git a/Source/Core/GZBuilder/Data/LinksCollector.cs b/Source/Core/GZBuilder/Data/LinksCollector.cs
index d6949820..2d24b930 100755
--- a/Source/Core/GZBuilder/Data/LinksCollector.cs
+++ b/Source/Core/GZBuilder/Data/LinksCollector.cs
@@ -497,7 +497,10 @@ namespace CodeImp.DoomBuilder.GZBuilder.Data
 				if(tti == null) continue;
 
 				Vector3D pos = t.Position;
-				pos.z += GetCorrectHeight(t, blockmap, false);
+				if (t.AbsoluteZ)
+					pos.z = GetCorrectHeight(t, blockmap, tti.CenterHitbox);
+				else
+					pos.z += GetCorrectHeight(t, blockmap, tti.CenterHitbox);
 
 				for(int i = 0; i < t.Args.Length; i++)
 				{
@@ -1051,10 +1054,16 @@ namespace CodeImp.DoomBuilder.GZBuilder.Data
 		// Required only when called from VisualMode
 		private static double GetCorrectHeight(Thing thing, VisualBlockMap blockmap, bool usethingcenter)
 		{
-			if(blockmap == null) return 0f;
-			double height = (usethingcenter ? thing.Height / 2f : 0f);
-			if(thing.Sector == null) thing.DetermineSector(blockmap);
-			if(thing.Sector != null) height += thing.Sector.FloorHeight;
+			if (blockmap == null) return 0f;
+			double height = (usethingcenter ? 0f : (thing.IsFlipped ? thing.Height : 0f));
+
+			if (thing.AbsoluteZ)
+				height = thing.Position.z + height;
+			else
+			{
+				if (thing.Sector == null) thing.DetermineSector(blockmap);
+				if (thing.Sector != null) height += thing.Sector.FloorHeight;
+			}
 			return height;
 		}