Updated Rampastring.XNAUI, fixed duplicate cursor image, lowered FPS …

…to 60 and made all animations / transitions independent of FPS
CnCNet · Dec 20, 2016 · 378b984 · 378b984 · GrantBartlett · Jan 3, 2017
1 parent a1dc10f
commit 378b984
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 15 deletions.
diff --git a/DXMainClient/DXGUI/Generic/GameInProgressWindow.cs b/DXMainClient/DXGUI/Generic/GameInProgressWindow.cs
@@ -16,7 +16,7 @@ namespace DTAClient.DXGUI
     /// </summary>
     public class GameInProgressWindow : XNAPanel
     {
-        private const double FPS = 120.0;
+        private const double FPS = 60.0;
         private const double POWER_SAVING_FPS = 5.0;
 
         public GameInProgressWindow(WindowManager windowManager) : base(windowManager)

diff --git a/DXMainClient/DXGUI/Generic/LoadingScreen.cs b/DXMainClient/DXGUI/Generic/LoadingScreen.cs
@@ -26,11 +26,13 @@ public LoadingScreen(WindowManager windowManager) : base(windowManager)
 
         private static readonly object locker = new object();
 
-        MapLoader mapLoader;
+        private MapLoader mapLoader;
 
-        PrivateMessagingPanel privateMessagingPanel;
+        private PrivateMessagingPanel privateMessagingPanel;
 
-        bool load = false;
+        private bool load = false;
+
+        private bool visibleSpriteCursor = false;
 
         public override void Initialize()
         {
@@ -146,7 +148,7 @@ private void Finish()
 
             WindowManager.RemoveControl(this);
 
-            Cursor.Visible = true;
+            Cursor.Visible = visibleSpriteCursor;
         }
 
         public override void Update(GameTime gameTime)
@@ -161,7 +163,12 @@ public override void Update(GameTime gameTime)
             }
 
             load = true;
-            Cursor.Visible = false;
+
+            if (Cursor.Visible)
+            {
+                Cursor.Visible = false;
+                visibleSpriteCursor = true;
+            }
 
             base.Update(gameTime);
         }

diff --git a/DXMainClient/DXGUI/Generic/TopBar.cs b/DXMainClient/DXGUI/Generic/TopBar.cs
@@ -24,8 +24,8 @@ public class TopBar : XNAPanel
         const double EVENT_DOWN_TIME_WAIT_SECONDS = 2.0;
         const double STARTUP_DOWN_TIME_WAIT_SECONDS = 3.5;
 
-        const double DOWN_MOVEMENT_RATE = 2.0;
-        const double UP_MOVEMENT_RATE = 2.0;
+        const double DOWN_MOVEMENT_RATE = 1.7;
+        const double UP_MOVEMENT_RATE = 1.7;
         const int APPEAR_CURSOR_THRESHOLD_Y = 8;
 
         public TopBar(WindowManager windowManager, CnCNetManager connectionManager) : base(windowManager)
@@ -292,7 +292,7 @@ public override void Update(GameTime gameTime)
             {
                 if (locationY < 0)
                 {
-                    locationY += DOWN_MOVEMENT_RATE;
+                    locationY += DOWN_MOVEMENT_RATE * (gameTime.ElapsedGameTime.TotalMilliseconds / 10.0);
                     ClientRectangle = new Rectangle(ClientRectangle.X, (int)locationY, 
                         ClientRectangle.Width, ClientRectangle.Height);
                 }
@@ -305,7 +305,7 @@ public override void Update(GameTime gameTime)
             {
                 if (locationY > -ClientRectangle.Height - 1)
                 {
-                    locationY -= UP_MOVEMENT_RATE;
+                    locationY -= UP_MOVEMENT_RATE * (gameTime.ElapsedGameTime.TotalMilliseconds / 10.0);
                     ClientRectangle = new Rectangle(ClientRectangle.X, (int)locationY,
                         ClientRectangle.Width, ClientRectangle.Height);
                 }

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/MapPreviewBox.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/MapPreviewBox.cs
@@ -118,7 +118,7 @@ public override void Initialize()
                 indicator.Enabled = false;
                 indicator.AngularVelocity = angularVelocity;
                 indicator.HoverRemapColor = hoverRemapColor;
-                indicator.ReservedAngularVelocity = reservedAngularVelocity;
+                indicator.ReversedAngularVelocity = reservedAngularVelocity;
                 indicator.WaypointTexture = AssetLoader.LoadTexture(string.Format("slocindicator{0}.png", i + 1));
                 indicator.Tag = i;
                 indicator.LeftClick += Indicator_LeftClick;

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/PlayerLocationIndicator.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/PlayerLocationIndicator.cs
@@ -39,7 +39,7 @@ public class PlayerLocationIndicator : XNAControl
         public int FontIndex { get; set; }
 
         public double AngularVelocity = 0.015;
-        public double ReservedAngularVelocity = -0.0075;
+        public double ReversedAngularVelocity = -0.0075;
 
         public Color HoverRemapColor { get; set; }
 
@@ -149,7 +149,9 @@ public override void Update(GameTime gameTime)
         {
             base.Update(gameTime);
 
-            angle += Players.Count > 0 ? ReservedAngularVelocity : AngularVelocity;
+            double frameTimeCoefficient = gameTime.ElapsedGameTime.TotalMilliseconds / 10.0;
+
+            angle += Players.Count > 0 ? ReversedAngularVelocity * frameTimeCoefficient : AngularVelocity * frameTimeCoefficient;
 
             if (Players.Count > 0)
             {

diff --git a/DXMainClient/Properties/AssemblyInfo.cs b/DXMainClient/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.3.2")]
-[assembly: AssemblyFileVersion("2.0.3.2")]
+[assembly: AssemblyVersion("2.0.3.3")]
+[assembly: AssemblyFileVersion("2.0.3.3")]
diff --git a/References/Windows/Rampastring.XNAUI.dll b/References/Windows/Rampastring.XNAUI.dll
diff --git a/References/WindowsGL/Rampastring.XNAUI.dll b/References/WindowsGL/Rampastring.XNAUI.dll
diff --git a/References/XNA/Rampastring.XNAUI.dll b/References/XNA/Rampastring.XNAUI.dll