Updated D3D_ToProjection and Button Improvements

Extended the D3D_ToProjection method to include custom sizes, and improved the Button GUI elements

Author: shivanmodha

src/studios/vanish/engine/Button.java

@@ -23,6 +23,7 @@ public enum ButtonType
 	private int state = 0;
 	private Shape bounds;
 	private boolean down = false;
+	public FillMode FillMode = studios.vanish.engine.FillMode.Solid;
 	Window wnd;
 	public Button(Window wnd, String text)
 	{
@@ -67,6 +68,7 @@ else if (Type == ButtonType.Circle)
 		{
 			bounds = new Circle(BackColor[state], Location, rad);
 		}
+		bounds.FillMode = FillMode;
 	}
 	public void Check(Point MouseLocation, int Button)
 	{

src/studios/vanish/engine/Circle.java

@@ -87,6 +87,13 @@ public Point GetShapeCenter()
 	}
 	public void Render(GraphicsUnit Graphics)
 	{
-		Graphics.FillEllipse(Color, new Point(Center.X - Radius, Center.Y - Radius), new Size(Radius * 2, Radius * 2));
+		if (FillMode == studios.vanish.engine.FillMode.Solid)
+		{
+			Graphics.FillEllipse(Color, new Point(Center.X - Radius, Center.Y - Radius), new Size(Radius * 2, Radius * 2));
+		}
+		else
+		{
+			Graphics.DrawEllipse(Color, new Point(Center.X - Radius, Center.Y - Radius), new Size(Radius * 2, Radius * 2));			
+		}
 	}
 }

src/studios/vanish/engine/GraphicsUnit.java

@@ -193,6 +193,22 @@ public Vertex D3D_ToProjection(Vertex vertex)
 		}
 		return position;
 	}
+	public Vertex D3D_ToProjection(Vertex vertex, Size wndSize, Vertex offset)
+	{
+		Size center = Resolution.half();
+		double factor = FieldOfView / vertex.Z;
+		factor = Math.abs(factor);
+		Vertex position = new Vertex(vertex.X * factor + center.Width, vertex.Y * -factor + center.Height, vertex.Z);
+		position.X = (position.X * wndSize.Width) / Resolution.Width;
+		position.Y = (position.Y * wndSize.Height) / Resolution.Height;
+		if (vertex.Z < 0)
+		{
+			position.X *= center.Width / 2;
+			position.Y *= center.Height / 2;
+		}
+		position = position.add(offset);
+		return position;
+	}
 	public static Vertex D3D_FromProjection(Point point, Size resolution, Size windowSize, double FieldOfView, double CameraZ)
 	{
 		Vertex position = new Vertex((point.X * resolution.Width) / windowSize.Width, (point.Y * resolution.Height) / windowSize.Height, CameraZ);

src/studios/vanish/engine/Rectangle.java

@@ -27,6 +27,13 @@ public Point GetShapeCenter()
 	}
 	public void Render(GraphicsUnit Graphics)
 	{
-		Graphics.FillRectangle(Color, Location, Size);
+		if (FillMode == studios.vanish.engine.FillMode.Solid)
+		{
+			Graphics.FillRectangle(Color, Location, Size);
+		}
+		else
+		{
+			Graphics.DrawRectangle(Color, Location, Size);
+		}
 	}
 }

src/studios/vanish/engine/Shape.java

@@ -6,6 +6,7 @@ public abstract class Shape
 	public Size Size;
 	public int Radius;
 	public Color Color;
+	public FillMode FillMode = studios.vanish.engine.FillMode.Solid;
 	public void Initialize(Color Color, Point Location, Size Size)
 	{
 		this.Color = Color;