[Client] Quick fixes to shaders and SPR2 save

You will need to resave all sprite piff/iffs with Volcanic!
RHY3756547 · Aug 31, 2016 · 103ee75 · 103ee75
1 parent bcbd1e9
commit 103ee75
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 17 deletions.
diff --git a/TSOClient/before.FreeSO.sln.targets b/TSOClient/before.FreeSO.sln.targets
diff --git a/TSOClient/tso.client/Content/DX/Effects/2DWorldBatch.xnb b/TSOClient/tso.client/Content/DX/Effects/2DWorldBatch.xnb
diff --git a/TSOClient/tso.client/Content/OGL/Effects/2DWorldBatch.xnb b/TSOClient/tso.client/Content/OGL/Effects/2DWorldBatch.xnb
diff --git a/TSOClient/tso.client/ContentSrc/Effects/2DWorldBatch.fx b/TSOClient/tso.client/ContentSrc/Effects/2DWorldBatch.fx
@@ -285,7 +285,9 @@ void psZDepthSprite(ZVertexOut v, out float4 color:COLOR0, out float4 depthB:COL
     if (depthOutMode == true) {
         color = depthB;
     } else {
-        color = pixel * tex2D(ambientSampler, v.roomVec);
+		if (floor(v.roomVec.x * 256) == 254 && floor(v.roomVec.y * 256) == 255) pixel = float4(float3(1.0, 1.0, 1.0) - pixel.xyz, pixel.a);
+		else if (v.roomVec.x != 0.0) pixel *= tex2D(ambientSampler, v.roomVec);
+		color = pixel;
 
         color.rgb *= max(1, v.objectID); //hack - otherwise v.objectID always equals 0 on intel and 1 on nvidia (yeah i don't know)
         color.rgb *= color.a; //"pre"multiply, just here for experimentation

diff --git a/TSOClient/tso.client/Icon.bmp b/TSOClient/tso.client/Icon.bmp
diff --git a/TSOClient/tso.client/TSOGame.cs b/TSOClient/tso.client/TSOGame.cs
@@ -55,9 +55,11 @@ public TSOGame() : base()
         /// </summary>
         protected override void Initialize()
         {
-            Graphics.GraphicsDevice.PresentationParameters.PresentationInterval = PresentInterval.Two;
-            GlobalSettings.Default.GraphicsWidth = GraphicsDevice.Viewport.Width / FSOEnvironment.DPIScaleFactor;
-            GlobalSettings.Default.GraphicsHeight = GraphicsDevice.Viewport.Height / FSOEnvironment.DPIScaleFactor;
+            if (FSOEnvironment.DPIScaleFactor != 1 || FSOEnvironment.SoftwareDepth)
+            {
+                GlobalSettings.Default.GraphicsWidth = GraphicsDevice.Viewport.Width / FSOEnvironment.DPIScaleFactor;
+                GlobalSettings.Default.GraphicsHeight = GraphicsDevice.Viewport.Height / FSOEnvironment.DPIScaleFactor;
+            }
 
             OperatingSystem os = Environment.OSVersion;
             PlatformID pid = os.Platform;

diff --git a/TSOClient/tso.files/formats/iff/chunks/SPR2.cs b/TSOClient/tso.files/formats/iff/chunks/SPR2.cs
@@ -204,7 +204,7 @@ public void Write(IoWriter io)
 
                 var data = sprStream.ToArray();
                 io.WriteUInt32(1001);
-                io.WriteUInt32((uint)data.Length+8);
+                io.WriteUInt32((uint)data.Length);
                 io.WriteBytes(data);
             }
         }