Faction Test v1.0.1.0

2023-02-16 15:01:28 +02:00
parent caa5a2f762
commit 2c5a7923b0
309 changed files with 7502 additions and 4335 deletions
@@ -1,5 +1,4 @@
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
@@ -65,15 +64,9 @@ namespace Barotrauma

        public Texture2D WaterTexture { get; }

-        public WaterRenderer(GraphicsDevice graphicsDevice, ContentManager content)
+        public WaterRenderer(GraphicsDevice graphicsDevice)
        {
-#if WINDOWS
-            WaterEffect = content.Load<Effect>("Effects/watershader");
-#endif
-#if LINUX || OSX
-
-            WaterEffect = content.Load<Effect>("Effects/watershader_opengl");
-#endif
+            WaterEffect = EffectLoader.Load("Effects/watershader");

            WaterTexture = TextureLoader.FromFile("Content/Effects/waterbump.png");
            WaterEffect.Parameters["xWaterBumpMap"].SetValue(WaterTexture);