2f107db...5202af9

2019-03-18 21:42:26 +02:00
parent 58c92888b7
commit 044fd3344b
395 changed files with 27417 additions and 19754 deletions
@@ -1,6 +1,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.IO;
+using System.Threading;
 using Color = Microsoft.Xna.Framework.Color;

 namespace Barotrauma
@@ -48,7 +49,7 @@ namespace Barotrauma
                    var texture = Texture2D.FromStream(_graphicsDevice, fileStream);
                    if (preMultiplyAlpha)
                    {
-                        PreMultiplyAlpha(texture);
+                        PreMultiplyAlpha(ref texture);
                    }
                    return texture;
                }
@@ -66,7 +67,7 @@ namespace Barotrauma
            try
            {
                var texture = Texture2D.FromStream(_graphicsDevice, fileStream);
-                PreMultiplyAlpha(texture);
+                PreMultiplyAlpha(ref texture);
                return texture;
            }
            catch (Exception e)
@@ -76,37 +77,40 @@ namespace Barotrauma
            }
        }

-        private static void PreMultiplyAlpha(Texture2D texture)
+        private static void PreMultiplyAlpha(ref Texture2D texture)
        {
-            // Setup a render target to hold our final texture which will have premulitplied alpha values
-            using (RenderTarget2D renderTarget = new RenderTarget2D(_graphicsDevice, texture.Width, texture.Height))
+            UInt32[] data = new UInt32[texture.Width * texture.Height];
+            texture.GetData(data);
+
+            for (int i = 0; i < data.Length; i++)
            {
-                Viewport viewportBackup = _graphicsDevice.Viewport;
-                _graphicsDevice.SetRenderTarget(renderTarget);
-                _graphicsDevice.Clear(Color.Black);
-
-                // Multiply each color by the source alpha, and write in just the color values into the final texture
-                _spriteBatch.Begin(SpriteSortMode.Immediate, BlendColorBlendState);
-                _spriteBatch.Draw(texture, texture.Bounds, Color.White);
-                _spriteBatch.End();
-
-                // Now copy over the alpha values from the source texture to the final one, without multiplying them
-                _spriteBatch.Begin(SpriteSortMode.Immediate, BlendAlphaBlendState);
-                _spriteBatch.Draw(texture, texture.Bounds, Color.White);
-                _spriteBatch.End();
-
-                // Release the GPU back to drawing to the screen
-                _graphicsDevice.SetRenderTarget(null);
-                _graphicsDevice.Viewport = viewportBackup;
-
-                // Store data from render target because the RenderTarget2D is volatile
-                Color[] data = new Color[texture.Width * texture.Height];
-                renderTarget.GetData(data);
-
-                // Unset texture from graphic device and set modified data back to it
-                _graphicsDevice.Textures[0] = null;
-                texture.SetData(data);
+                uint a = (data[i] & 0xff000000) >> 24;
+                if (a == 0)
+                {
+                    data[i] = 0;
+                    continue;
+                }
+                else if (a == uint.MaxValue)
+                {
+                    continue;
+                }
+                uint r = (data[i] & 0x00ff0000) >> 16;
+                uint g = (data[i] & 0x0000ff00) >> 8;
+                uint b = (data[i] & 0x000000ff);
+                // Monogame 3.7 needs the line below.
+                a *= a; a /= 255;
+                b *= a; b /= 255;
+                g *= a; g /= 255;
+                r *= a; r /= 255;
+                data[i] = (a << 24) | (r << 16) | (g << 8) | b;
            }
+            
+            //not sure why this is needed, but it seems to cut the memory usage of the game almost in half
+            //GetData/SetData might be leaking memory?
+            int width = texture.Width; int height = texture.Height;
+            texture.Dispose();
+            texture = new Texture2D(_graphicsDevice, width, height);
+            texture.SetData(data);
        }
       
        
@@ -10,47 +10,7 @@ namespace Barotrauma
        // Convert an RGB value into an HLS value.
        public static Vector3 RgbToHLS(this Color color)
        {
-            double h, l, s;
-
-            // Convert RGB to a 0.0 to 1.0 range.
-            double double_r = color.R / 255.0;
-            double double_g = color.G / 255.0;
-            double double_b = color.B / 255.0;
-
-            // Get the maximum and minimum RGB components.
-            double max = double_r;
-            if (max < double_g) max = double_g;
-            if (max < double_b) max = double_b;
-
-            double min = double_r;
-            if (min > double_g) min = double_g;
-            if (min > double_b) min = double_b;
-
-            double diff = max - min;
-            l = (max + min) / 2;
-            if (Math.Abs(diff) < 0.00001)
-            {
-                s = 0;
-                h = 0;  // H is really undefined.
-            }
-            else
-            {
-                if (l <= 0.5) s = diff / (max + min);
-                else s = diff / (2 - max - min);
-
-                double r_dist = (max - double_r) / diff;
-                double g_dist = (max - double_g) / diff;
-                double b_dist = (max - double_b) / diff;
-
-                if (double_r == max) h = b_dist - g_dist;
-                else if (double_g == max) h = 2 + r_dist - b_dist;
-                else h = 4 + g_dist - r_dist;
-
-                h = h * 60;
-                if (h < 0) h += 360;
-            }
-
-            return new Vector3((float)h, (float)l, (float)s);
+            return RgbToHLS(color.ToVector3());
        }

        // Convert an HLS value into an RGB value.