Better handling of Surface.Type = BASE1_SOLID (solid color surfaces) (#…

…68) * Updated to .NET6, so compatible with ACE. Handled solid color surfaces better * Update appveyor.yml Co-authored-by: Ty Conner <[email protected]>
ACEmulator · Dec 19, 2022 · 1928d5e · 1928d5e
1 parent 29b266e
commit 1928d5e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/ACViewer/ACViewer.csproj b/ACViewer/ACViewer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon />
     <StartupObject />

diff --git a/ACViewer/ACViewer.csproj.user b/ACViewer/ACViewer.csproj.user
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+  <ItemGroup>
+    <Compile Update="Extensions\ColorDialogEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+  </ItemGroup>
+</Project>
diff --git a/ACViewer/Render/TextureCache.cs b/ACViewer/Render/TextureCache.cs
@@ -453,8 +453,10 @@ public static Texture2D Get(uint fileID, Dictionary<uint, uint> textureChanges =
                     var r = (surface.ColorValue >> 16) & 0xFF;
                     var g = (surface.ColorValue >> 8) & 0xFF;
                     var b = surface.ColorValue & 0xFF;
-                    a = 0;
-                    swatch.SetDataAsync(new Microsoft.Xna.Framework.Color[] { new Microsoft.Xna.Framework.Color(r, g, b, a) });
+
+                    if (surface.Translucency == 1) a = 0;
+
+                    swatch.SetDataAsync(new Microsoft.Xna.Framework.Color[] { new Microsoft.Xna.Framework.Color(Convert.ToByte(r), Convert.ToByte(g), Convert.ToByte(b), Convert.ToByte(a)) });
                     return swatch;
                 }
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,7 +5,7 @@ branches:
   only:
   - master
 skip_tags: true
-image: Visual Studio 2019
+image: Visual Studio 2022
 configuration:
 - Release
 - Debug