vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ItemComponent GUIFrames, functional steering, radar, separate power and signals, improved d.gz, tweak swimming

Browse Source
This commit is contained in:
Regalis
2015-06-29 23:51:01 +03:00
parent 004608acd8
commit b493ed2b39
42 changed files with 473 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/GUI/GUI.cs
+8 -8
View File
@@ -264,15 +264,15 @@ namespace Subsurface
public static void Draw(float deltaTime, SpriteBatch spriteBatch, Camera cam)
{
spriteBatch.DrawString(font,
"FPS: " + (int)Game1.frameCounter.AverageFramesPerSecond
+ " - render: " + Game1.renderTimeElapsed,
new Vector2(10, 10), Color.White);
//spriteBatch.DrawString(font,
// "FPS: " + (int)Game1.frameCounter.AverageFramesPerSecond
// + " - render: " + Game1.renderTimeElapsed,
// new Vector2(10, 10), Color.White);
spriteBatch.DrawString(font,
"Physics: " + Game1.world.UpdateTime
+ " - bodies: " + Game1.world.BodyList.Count,
new Vector2(10, 30), Color.White);
//spriteBatch.DrawString(font,
// "Physics: " + Game1.world.UpdateTime
// + " - bodies: " + Game1.world.BodyList.Count,
// new Vector2(10, 30), Color.White);
if (Character.Controlled != null && cam!=null) Character.Controlled.DrawHud(spriteBatch, cam);
Subsurface/GUI/GUIComponent.cs
+40 -34
View File
@@ -39,6 +39,11 @@ namespace Subsurface
{
get { return parent; }
}
public Vector2 Center
{
get { return new Vector2(rect.Center.X, rect.Center.Y); }
}
public Rectangle Rect
{
@@ -192,43 +197,44 @@ namespace Subsurface
}
}
protected virtual void UpdateDimensions(GUIComponent parent)
protected virtual void UpdateDimensions(GUIComponent parent = null)
{
if (parent!=null)
Rectangle parentRect = (parent==null) ? new Rectangle(0,0,Game1.GraphicsWidth, Game1.GraphicsHeight) : parent.rect;
Vector4 padding = (parent == null) ? Vector4.Zero : parent.padding;
if (rect.Width == 0) rect.Width = parentRect.Width - rect.X
- (int)padding.X - (int)padding.Z;
if (rect.Height == 0) rect.Height = parentRect.Height - rect.Y
- (int)padding.Y - (int)padding.W;
if (alignment.HasFlag(Alignment.CenterX))
{
if (rect.Width == 0) rect.Width = parent.Rect.Width - rect.X
- (int)parent.Padding.X - (int)parent.Padding.Z;
if (rect.Height == 0) rect.Height = parent.Rect.Height - rect.Y
- (int)parent.Padding.Y - (int)parent.Padding.W;
if (alignment.HasFlag(Alignment.CenterX))
{
rect.X += parent.Rect.X + (int)parent.Rect.Width/2 - (int)rect.Width/2;
}
else if (alignment.HasFlag(Alignment.Right))
{
rect.X += parent.Rect.X + (int)parent.Rect.Width - (int)parent.Padding.Z - (int)rect.Width;
}
else
{
rect.X += parent.Rect.X + (int)parent.Padding.X;
}
if (alignment.HasFlag(Alignment.CenterY))
{
rect.Y += parent.Rect.Y + (int)parent.Rect.Height / 2 - (int)rect.Height / 2;
}
else if (alignment.HasFlag(Alignment.Bottom))
{
rect.Y += parent.Rect.Y + (int)parent.Rect.Height - (int)parent.Padding.W - (int)rect.Height;
}
else
{
rect.Y += parent.Rect.Y + (int)parent.Padding.Y;
}
rect.X += parentRect.X + (int)parentRect.Width/2 - (int)rect.Width/2;
}
else if (alignment.HasFlag(Alignment.Right))
{
rect.X += parentRect.X + (int)parentRect.Width - (int)padding.Z - (int)rect.Width;
}
else
{
rect.X += parentRect.X + (int)padding.X;
}
if (alignment.HasFlag(Alignment.CenterY))
{
rect.Y += parentRect.Y + (int)parentRect.Height / 2 - (int)rect.Height / 2;
}
else if (alignment.HasFlag(Alignment.Bottom))
{
rect.Y += parentRect.Y + (int)parentRect.Height - (int)padding.W - (int)rect.Height;
}
else
{
rect.Y += parentRect.Y + (int)padding.Y;
}
}
public virtual void DrawChildren(SpriteBatch spriteBatch)
Subsurface/GUI/GUIFrame.cs
+8 -1
View File
@@ -23,8 +23,15 @@ namespace Subsurface
this.alignment = alignment;
this.color = color;
if (parent!=null)
if (parent != null)
{
parent.AddChild(this);
}
else
{
UpdateDimensions();
}
}
public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch)