- Added "LevelTriggers", areas that apply statuseffects and/or damage to entities. Atm can only be attached to background sprites.

- Moved background sprites to the shared project. - The debug textures of physics bodies have a maximum size of 128x128 pixels to prevent large bodies from taking up excessive amounts of memory. - Attacks can be set to only affect humans.
2017-08-23 20:37:30 +03:00
parent 2d1c00546f
commit c2da3a6af4
19 changed files with 467 additions and 225 deletions
@@ -0,0 +1,132 @@
+using Barotrauma.Particles;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+
+namespace Barotrauma
+{
+    partial class BackgroundSprite
+    {
+        public ParticleEmitter ParticleEmitter;
+    }
+
+    partial class BackgroundSpriteManager
+    {
+        private List<BackgroundSprite> visibleSprites = new List<BackgroundSprite>();
+
+        private Rectangle currentGridIndices;
+
+        partial void UpdateProjSpecific(float deltaTime)
+        {
+            foreach (BackgroundSprite s in visibleSprites)
+            {
+                if (s.Prefab.ParticleEmitterPrefab != null)
+                {
+                    Vector2 emitterPos = new Vector2(s.Prefab.EmitterPosition.X, s.Prefab.EmitterPosition.Y) * s.Scale;
+
+                    if (s.Rotation != 0.0f || s.Prefab.SwingAmount != 0.0f)
+                    {
+                        var ca = (float)Math.Cos(s.Rotation + swingState * s.Prefab.SwingAmount);
+                        var sa = (float)Math.Sin(s.Rotation + swingState * s.Prefab.SwingAmount);
+
+                        emitterPos = new Vector2(
+                            ca * emitterPos.X + sa * emitterPos.Y,
+                            -sa * emitterPos.X + ca * emitterPos.Y);
+                    }
+
+                    s.ParticleEmitter.Emit(deltaTime, new Vector2(s.Position.X, s.Position.Y) + emitterPos);
+                }
+            }
+        }
+
+        public void DrawSprites(SpriteBatch spriteBatch, Camera cam)
+        {
+            Rectangle indices = Rectangle.Empty;
+            indices.X = (int)Math.Floor(cam.WorldView.X / (float)GridSize);            
+            if (indices.X >= spriteGrid.GetLength(0)) return;
+            indices.Y = (int)Math.Floor((cam.WorldView.Y - cam.WorldView.Height - Level.Loaded.BottomPos) / (float)GridSize);
+            if (indices.Y >= spriteGrid.GetLength(1)) return;
+
+            indices.Width = (int)Math.Floor(cam.WorldView.Right / (float)GridSize)+1;
+            if (indices.Width < 0) return;
+            indices.Height = (int)Math.Floor((cam.WorldView.Y - Level.Loaded.BottomPos) / (float)GridSize)+1;
+            if (indices.Height < 0) return;
+
+            indices.X = Math.Max(indices.X, 0);
+            indices.Y = Math.Max(indices.Y, 0);
+            indices.Width = Math.Min(indices.Width, spriteGrid.GetLength(0)-1);
+            indices.Height = Math.Min(indices.Height, spriteGrid.GetLength(1)-1);
+
+            float z = 0.0f;
+            if (currentGridIndices != indices)
+            {
+                visibleSprites.Clear();
+
+                for (int x = indices.X; x <= indices.Width; x++)
+                {
+                    for (int y = indices.Y; y <= indices.Height; y++)
+                    {
+                        if (spriteGrid[x, y] == null) continue;
+                        foreach (BackgroundSprite sprite in spriteGrid[x, y])
+                        {
+                            int drawOrderIndex = 0;
+                            for (int i = 0; i < visibleSprites.Count; i++)
+                            {
+                                if (visibleSprites[i] == sprite)
+                                {
+                                    drawOrderIndex = -1;
+                                    break;
+                                }
+
+                                if (visibleSprites[i].Position.Z > sprite.Position.Z)
+                                {
+                                    break;
+                                }
+                                else
+                                {
+                                    drawOrderIndex = i + 1;
+                                }
+                            }
+
+                            if (drawOrderIndex >= 0)
+                            {
+                                visibleSprites.Insert(drawOrderIndex, sprite);
+                            }
+                        }
+                    }
+                }
+
+                currentGridIndices = indices;
+            }
+
+            foreach (BackgroundSprite sprite in visibleSprites)
+            {              
+                Vector2 camDiff = new Vector2(sprite.Position.X, sprite.Position.Y) - cam.WorldViewCenter;
+                camDiff.Y = -camDiff.Y;
+
+                sprite.Prefab.Sprite.Draw(
+                    spriteBatch,
+                    new Vector2(sprite.Position.X, -sprite.Position.Y) - camDiff * sprite.Position.Z / 10000.0f,
+                    Color.Lerp(Color.White, Level.Loaded.BackgroundColor, sprite.Position.Z / 5000.0f),
+                    sprite.Rotation + swingState * sprite.Prefab.SwingAmount,
+                    sprite.Scale,
+                    SpriteEffects.None,
+                    z);
+                
+                if (GameMain.DebugDraw)
+                {
+                    GUI.DrawRectangle(spriteBatch, new Vector2(sprite.Position.X, -sprite.Position.Y), new Vector2(10.0f, 10.0f), Color.Red, true);
+
+                    if (sprite.Trigger != null && sprite.Trigger.PhysicsBody != null)
+                    {
+                        sprite.Trigger.PhysicsBody.UpdateDrawPosition();
+                        sprite.Trigger.PhysicsBody.DebugDraw(spriteBatch, Color.Cyan);
+                    }
+                }
+
+                z += 0.0001f;
+            }
+        }        
+    }
+}
@@ -0,0 +1,10 @@
+using Microsoft.Xna.Framework;
+
+namespace Barotrauma
+{
+    partial class BackgroundSpritePrefab
+    {        
+        public readonly Particles.ParticleEmitterPrefab ParticleEmitterPrefab;
+        public readonly Vector2 EmitterPosition;
+    }
+}
@@ -7,6 +7,8 @@ namespace Barotrauma
    {
        private LevelRenderer renderer;

+        private BackgroundCreatureManager backgroundCreatureManager;
+        
        public void DrawFront(SpriteBatch spriteBatch)
        {
            if (renderer == null) return;
@@ -32,7 +34,7 @@ namespace Barotrauma
            }
        }

-        public void DrawBack(GraphicsDevice graphics, SpriteBatch spriteBatch, Camera cam, BackgroundCreatureManager backgroundSpriteManager = null)
+        public void DrawBack(GraphicsDevice graphics, SpriteBatch spriteBatch, Camera cam, BackgroundCreatureManager backgroundCreatureManager = null)
        {
            float brightness = MathHelper.Clamp(50.0f + (cam.Position.Y - Size.Y) / 2000.0f, 10.0f, 40.0f);

@@ -42,7 +44,7 @@ namespace Barotrauma
            graphics.Clear(backgroundColor);

            if (renderer == null) return;
-            renderer.DrawBackground(spriteBatch, cam, backgroundSpriteManager);
+            renderer.DrawBackground(spriteBatch, cam, backgroundSpriteManager, backgroundCreatureManager);
        }
    }
 }
@@ -13,8 +13,6 @@ namespace Barotrauma
        private static Sprite dustParticles;
        private static Texture2D shaftTexture;

-        private static BackgroundSpriteManager backgroundSpriteManager;
-
        Vector2 dustOffset;

        private Level level;
@@ -57,31 +55,13 @@ namespace Barotrauma
                };
                wallCenterEffect.CurrentTechnique = wallCenterEffect.Techniques["BasicEffect_Texture"];
            }
-
-            
-            if (backgroundSpriteManager==null)
-            {
-
-                var files = GameMain.SelectedPackage.GetFilesOfType(ContentType.BackgroundSpritePrefabs);
-                if (files.Count > 0)
-                    backgroundSpriteManager = new BackgroundSpriteManager(files);
-                else
-                    backgroundSpriteManager = new BackgroundSpriteManager("Content/BackgroundSprites/BackgroundSpritePrefabs.xml");
-            }
-
+                
            this.level = level;
        }
-
-        public void PlaceSprites(int amount)
-        {
-            backgroundSpriteManager.PlaceSprites(level, amount);
-        }
-
+        
        public void Update(float deltaTime)
        {
            dustOffset -= Vector2.UnitY * 10.0f * deltaTime;
-
-            backgroundSpriteManager.Update(deltaTime);
        }

        public static VertexPositionColorTexture[] GetColoredVertices(VertexPositionTexture[] vertices, Color color)
@@ -118,7 +98,9 @@ namespace Barotrauma
            bodyVertices.SetData(vertices);
        }

-        public void DrawBackground(SpriteBatch spriteBatch, Camera cam, BackgroundCreatureManager backgroundCreatureManager = null)
+        public void DrawBackground(SpriteBatch spriteBatch, Camera cam, 
+            BackgroundSpriteManager backgroundSpriteManager = null, 
+            BackgroundCreatureManager backgroundCreatureManager = null)
        {
            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.LinearWrap);

@@ -152,11 +134,9 @@ namespace Barotrauma
                SamplerState.LinearWrap, DepthStencilState.Default, null, null,
                cam.Transform);

-            backgroundSpriteManager.DrawSprites(spriteBatch, cam);
-
-            if (backgroundCreatureManager!=null) backgroundCreatureManager.Draw(spriteBatch);
-
-
+            if (backgroundSpriteManager != null) backgroundSpriteManager.DrawSprites(spriteBatch, cam);
+            if (backgroundCreatureManager != null) backgroundCreatureManager.Draw(spriteBatch);
+            
            for (int i = 0; i < 4; i++)
            {
                float scale = 1.0f - i * 0.2f;