(8c44620c0) Optimized dynamic font loading (don't get existing texture date with GetData every time a new symbol needs to be rendered, but save the pixel buffer and add to it as needed)

2019-05-16 07:00:33 +03:00
parent 531c572216
commit 674b845e9b
10 changed files with 129 additions and 46 deletions
@@ -152,6 +152,32 @@ namespace Barotrauma

                }

+                if (character.MemLocalState.Count > 120) character.MemLocalState.RemoveRange(0, character.MemLocalState.Count - 120);
+                character.MemState.Clear();
+            }
+        }
+        
+        partial void ImpactProjSpecific(float impact, Body body)
+        {
+            float volume = MathHelper.Clamp(impact - 3.0f, 0.5f, 1.0f);
+
+            if (body.UserData is Limb limb && character.Stun <= 0f)
+            {
+                if (impact > 3.0f) { PlayImpactSound(limb); }
+            }
+            else if (body.UserData is Limb || body == Collider.FarseerBody)
+            {
+                if (!character.IsRemotePlayer && impact > ImpactTolerance)
+                {
+                    SoundPlayer.PlayDamageSound("LimbBlunt", strongestImpact, Collider);
+                }
+            }
+            if (Character.Controlled == character)
+            {
+                GameMain.GameScreen.Cam.Shake = Math.Min(Math.Max(strongestImpact, GameMain.GameScreen.Cam.Shake), 3.0f);
+            }
+        }
+
                if (character.MemState.Count < 1) return;

                overrideTargetMovement = Vector2.Zero;
@@ -23,6 +23,7 @@ namespace Barotrauma

        private Vector2 currentDynamicAtlasCoords;
        private int currentDynamicAtlasNextY;
+        uint[] currentDynamicPixelBuffer;

        public bool DynamicLoading
        {
@@ -264,6 +265,7 @@ namespace Barotrauma
                currentDynamicAtlasCoords.Y = 0;
                currentDynamicAtlasNextY = 0;
                textures.Add(new Texture2D(gd, texDims, texDims, false, SurfaceFormat.Color));
+                currentDynamicPixelBuffer = null;
            }

            GlyphData newData = new GlyphData
@@ -274,19 +276,22 @@ namespace Barotrauma
                drawOffset = new Vector2(face.Glyph.BitmapLeft, baseHeight * 14 / 10 - face.Glyph.BitmapTop)
            };
            texCoords.Add(character, newData);
-            
-            uint[] pixelBuffer = new uint[texDims * texDims];
-            textures[newData.texIndex].GetData<uint>(pixelBuffer, 0, texDims * texDims);
+
+            if (currentDynamicPixelBuffer == null)
+            {
+                currentDynamicPixelBuffer = new uint[texDims * texDims];
+                textures[newData.texIndex].GetData<uint>(currentDynamicPixelBuffer, 0, texDims * texDims);
+            }
            
            for (int y = 0; y < glyphHeight; y++)
            {
                for (int x = 0; x < glyphWidth; x++)
                {
                    byte byteColor = bitmap[x + y * glyphWidth];
-                    pixelBuffer[((int)currentDynamicAtlasCoords.X + x) + ((int)currentDynamicAtlasCoords.Y + y) * texDims] = (uint)(byteColor << 24 | byteColor << 16 | byteColor << 8 | byteColor);
+                    currentDynamicPixelBuffer[((int)currentDynamicAtlasCoords.X + x) + ((int)currentDynamicAtlasCoords.Y + y) * texDims] = (uint)(byteColor << 24 | byteColor << 16 | byteColor << 8 | byteColor);
                }
            }
-            textures[newData.texIndex].SetData<uint>(pixelBuffer);
+            textures[newData.texIndex].SetData<uint>(currentDynamicPixelBuffer);

            currentDynamicAtlasCoords.X += glyphWidth + 2;
        }
@@ -762,6 +762,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

+        private GUILayoutGroup subPreviewContainer;
+
        private GUIButton loadGameButton;
        
        public Action<Submarine, string, string> StartNewGame;
@@ -74,36 +74,6 @@ namespace Barotrauma
            }
        }

-        public override void Update(float deltaTime)
-        {
-            if (objectiveManager.CurrentObjective == this)
-            {
-                if (randomTimer > 0)
-                {
-                    randomTimer -= deltaTime;
-                }
-                else
-                {
-                    SetRandom();
-                }
-            }
-        }
-
-        public override void Update(float deltaTime)
-        {
-            if (objectiveManager.CurrentObjective == this)
-            {
-                if (randomTimer > 0)
-                {
-                    randomTimer -= deltaTime;
-                }
-                else
-                {
-                    SetRandom();
-                }
-            }
-        }
-
        public override bool IsCompleted() => false;
        public override bool CanBeCompleted => true;

@@ -925,6 +925,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {
@@ -1145,6 +1145,15 @@ namespace Barotrauma
                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
            }
            
+            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
+            {
+                //apply some smoothing to the cursor positions of remote players when playing as a client
+                //to make aiming look a little less choppy
+                Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
+                smoothedCursorDiff = NetConfig.InterpolateCursorPositionError(smoothedCursorDiff);
+                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
+            }
+            
            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
            {
                if (speedMultipliers.Count == 0) return 1f;
@@ -772,6 +772,25 @@ namespace Barotrauma.Items.Components
                    }
                }
                
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
+                else
+                {
+                    if (outputContainer.Inventory.Items.All(i => i != null))
+                    {
+                        targetItem.Drop(dropper: null);
+                    }
+                    else
+                    {
+                        outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
+                    }
+                }
+                
                if (targetItem.Prefab.DeconstructItems.Any())
                {
                    inputContainer.Inventory.RemoveItem(targetItem);
@@ -144,17 +144,6 @@ namespace Barotrauma.Items.Components
            }
        }

-        public Vector2 SteeringInput
-        {
-            get { return steeringInput; }
-            set
-            {
-                if (!MathUtils.IsValid(value)) return;
-                steeringInput.X = MathHelper.Clamp(value.X, -100.0f, 100.0f);
-                steeringInput.Y = MathHelper.Clamp(value.Y, -100.0f, 100.0f);
-            }
-        }
-
        public SteeringPath SteeringPath
        {
            if (!CanBeSelected) return false;
@@ -175,6 +164,12 @@ namespace Barotrauma.Items.Components
            set { posToMaintain = value; }
        }

+        public Vector2? PosToMaintain
+        {
+            get { return posToMaintain; }
+            set { posToMaintain = value; }
+        }
+
        struct ObstacleDebugInfo
        {
            public Vector2 Point1;
@@ -1139,6 +1139,38 @@ namespace Barotrauma
            }
        }
                
+        public void UpdateTransform()
+        {
+            Submarine prevSub = Submarine;
+
+            FindHull();
+
+            if (Submarine == null && prevSub != null)
+            {
+                body.SetTransform(body.SimPosition + prevSub.SimPosition, body.Rotation);
+            }
+            else if (Submarine != null && prevSub == null)
+            {
+                body.SetTransform(body.SimPosition - Submarine.SimPosition, body.Rotation);
+            }
+            else if (Submarine != null && prevSub != null && Submarine != prevSub)
+            {
+                body.SetTransform(body.SimPosition + prevSub.SimPosition - Submarine.SimPosition, body.Rotation);
+            }
+
+            Vector2 displayPos = ConvertUnits.ToDisplayUnits(body.SimPosition);
+            rect.X = (int)(displayPos.X - rect.Width / 2.0f);
+            rect.Y = (int)(displayPos.Y + rect.Height / 2.0f);
+
+            if (Math.Abs(body.LinearVelocity.X) > NetConfig.MaxPhysicsBodyVelocity || 
+                Math.Abs(body.LinearVelocity.Y) > NetConfig.MaxPhysicsBodyVelocity)
+            {
+                body.LinearVelocity = new Vector2(
+                    MathHelper.Clamp(body.LinearVelocity.X, -NetConfig.MaxPhysicsBodyVelocity, NetConfig.MaxPhysicsBodyVelocity),
+                    MathHelper.Clamp(body.LinearVelocity.Y, -NetConfig.MaxPhysicsBodyVelocity, NetConfig.MaxPhysicsBodyVelocity));
+            }
+        }
+                
        public void UpdateTransform()
        {
            Submarine prevSub = Submarine;
@@ -15,6 +15,8 @@ namespace Barotrauma
        public static List<Hull> hullList = new List<Hull>();
        public static List<EntityGrid> EntityGrids { get; } = new List<EntityGrid>();

+        public static bool ShowHulls = true;
+
        public static bool EditWater, EditFire;
        public const float OxygenDistributionSpeed = 500.0f;
        public const float OxygenDeteriorationSpeed = 0.3f;
@@ -208,6 +210,25 @@ namespace Barotrauma
            }
        }

+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
        public override Rectangle Rect
        {
            get