* add auto-enable of DX11 fix when DX11 is detected

shadowmage45 · shadowmage45 · commit 24a90afacc72 · 2018-06-05T17:26:29.000-06:00
* update API warning to 'support' DX11; disable warning for DX11/GLCore
* clean up some debug spam
diff --git a/GameData/000_TexturesUnlimited/Plugins/TexturesUnlimited.dll b/GameData/000_TexturesUnlimited/Plugins/TexturesUnlimited.dll
diff --git a/Plugin/SSTUTools/KSPShaderTools/Addon/ReflectionManager.cs b/Plugin/SSTUTools/KSPShaderTools/Addon/ReflectionManager.cs
@@ -49,7 +49,6 @@ public class ReflectionManager : MonoBehaviour
         public bool renderScaled = true;
         public bool renderAtmo = true;
         public bool renderScenery = true;
-        public bool alternateRender = false;
 
         public bool reflectionsEnabled = true;
 
@@ -107,9 +106,9 @@ public void Awake()
                 return;
             }
             ConfigNode node = nodes[0];
-            MonoBehaviour.print("SSTUReflectionManager - Loading reflection configuration: \n" + node.ToString());
+            MonoBehaviour.print("TU-Reflection Manager - Loading reflection configuration: \n" + node.ToString());
+            MonoBehaviour.print("TU-Reflection Manager - Alternate Render Enabled (DX9/DX11 Fix): " + TexturesUnlimitedLoader.alternateRender);
             reflectionsEnabled = node.GetBoolValue("enabled", false);
-            alternateRender = node.GetBoolValue("directXFix", false);
             envMapSize = node.GetIntValue("resolution", envMapSize);
             mapUpdateSpacing = node.GetIntValue("interval", mapUpdateSpacing);
             eveInstalled = node.GetBoolValue("eveInstalled", false);
@@ -186,7 +185,6 @@ public void debugGuiDisable()
 
         public void OnDestroy()
         {
-            MonoBehaviour.print("SSTUReflectionManager OnDestroy()");
             if (instance == this) { instance = null; }
             if (gui != null)
             {
@@ -208,14 +206,12 @@ public void OnDestroy()
 
         private void init()
         {
-            MonoBehaviour.print("SSTUReflectionManager init()");
             if (cameraObject == null)
             {
                 cameraObject = new GameObject("TRReflectionCamera");
                 reflectionCamera = cameraObject.AddComponent<Camera>();
                 eveCameraFix = cameraObject.AddComponent<CameraAlphaFix>();
                 reflectionCamera.enabled = false;
-                MonoBehaviour.print("SSTUReflectionManager created camera: "+reflectionCamera);
             }
             if (skyboxShader == null)
             {
@@ -272,7 +268,7 @@ public void updateReflections()
                     if (probeData.updateTime >= mapUpdateSpacing)
                     {
                         reflectionCamera.gameObject.SetActive(true);
-                        if (alternateRender)
+                        if (TexturesUnlimitedLoader.alternateRender)
                         {
                             renderFaceAlt(probeData.renderedCube, probeData.updateFace, vessel.transform.position, probeData.updatePass);
                         }
diff --git a/Plugin/SSTUTools/KSPShaderTools/Addon/TexturesUnlimitedLoader.cs b/Plugin/SSTUTools/KSPShaderTools/Addon/TexturesUnlimitedLoader.cs
@@ -64,6 +64,8 @@ public class TexturesUnlimitedLoader : MonoBehaviour
         public static int recolorGUISectionHeight = 540;
         public static int recolorGUITotalHeight = 100;
 
+        public static bool alternateRender = false;
+
         #endregion ENDREGION - Config Values loaded from disk
 
         public static TexturesUnlimitedLoader INSTANCE;
@@ -87,8 +89,28 @@ public void Start()
 
             //check the graphics API, popup warning if using unsupported gfx (dx9/11/12/legacy-openGL)
             UnityEngine.Rendering.GraphicsDeviceType graphicsAPI = SystemInfo.graphicsDeviceType;
-            if (graphicsAPI != UnityEngine.Rendering.GraphicsDeviceType.OpenGLCore)
+            if (graphicsAPI == UnityEngine.Rendering.GraphicsDeviceType.OpenGLCore)
+            {
+                //noop, everything is fine
+            }
+            else if (graphicsAPI == UnityEngine.Rendering.GraphicsDeviceType.Direct3D11)
+            {
+                //works, but needs alternate render
+                alternateRender = true;
+            }
+            else if (graphicsAPI == UnityEngine.Rendering.GraphicsDeviceType.Direct3D9)
+            {
+                //has issues -- display warning, and needs alternate render
+                alternateRender = true;
+                if (apiCheckGUI == null)
+                {
+                    apiCheckGUI = this.gameObject.AddComponent<GraphicsAPIGUI>();
+                    apiCheckGUI.openGUI();
+                }
+            }
+            else
             {
+                //unknown API -- display warning
                 if (apiCheckGUI == null)
                 {
                     apiCheckGUI = this.gameObject.AddComponent<GraphicsAPIGUI>();
diff --git a/Plugin/SSTUTools/KSPShaderTools/GUI/GraphicsAPIGUI.cs b/Plugin/SSTUTools/KSPShaderTools/GUI/GraphicsAPIGUI.cs
@@ -40,7 +40,7 @@ private void drawWindow(int id)
             GUILayout.BeginVertical();
             GUILayout.Label("The Graphics API Detected: "+ SystemInfo.graphicsDeviceType);
             GUILayout.Label("Is unsupported by Textures Unlimited, and some graphics may not render correctly.");
-            GUILayout.Label("For best results, use the -force-glcore command line option to start KSP using the OpenGL Core graphics API");
+            GUILayout.Label("For best results, use the -force-d3d11 or -force-glcore command line option to start KSP using either DirectX11 or the OpenGL Core graphics API");
             GUILayout.FlexibleSpace();//push button to bottom of window
             if (GUILayout.Button("Acknowledge & Close"))
             {
diff --git a/Plugin/SSTUTools/KSPShaderTools/GUI/ReflectionDebugGUI.cs b/Plugin/SSTUTools/KSPShaderTools/GUI/ReflectionDebugGUI.cs
@@ -40,7 +40,7 @@ private void updateWindow(int id)
             manager.renderAtmo = addButtonRowToggle("Render Atmo", atmo);
             manager.renderScaled = addButtonRowToggle("Render Scaled", scaled);
             manager.renderScenery = addButtonRowToggle("Render Scenery", scenery);
-            manager.alternateRender = addButtonRowToggle("Alternate Render", manager.alternateRender);
+            TexturesUnlimitedLoader.alternateRender = addButtonRowToggle("Alternate Render", TexturesUnlimitedLoader.alternateRender);
             manager.eveInstalled = addButtonRowToggle("Eve Fix", manager.eveInstalled);
 
             if (GUILayout.Button("Toggle Debug Sphere"))

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ public class ReflectionManager : MonoBehaviour`
`49`	`49`	`public bool renderScaled = true;`
`50`	`50`	`public bool renderAtmo = true;`
`51`	`51`	`public bool renderScenery = true;`
`52`		`- public bool alternateRender = false;`
`53`	`52`
`54`	`53`	`public bool reflectionsEnabled = true;`
`55`	`54`
`@@ -107,9 +106,9 @@ public void Awake()`
`107`	`106`	`return;`
`108`	`107`	`}`
`109`	`108`	`ConfigNode node = nodes[0];`
`110`		`- MonoBehaviour.print("SSTUReflectionManager - Loading reflection configuration: \n" + node.ToString());`
	`109`	`+ MonoBehaviour.print("TU-Reflection Manager - Loading reflection configuration: \n" + node.ToString());`
	`110`	`+ MonoBehaviour.print("TU-Reflection Manager - Alternate Render Enabled (DX9/DX11 Fix): " + TexturesUnlimitedLoader.alternateRender);`
`111`	`111`	`reflectionsEnabled = node.GetBoolValue("enabled", false);`
`112`		`- alternateRender = node.GetBoolValue("directXFix", false);`
`113`	`112`	`envMapSize = node.GetIntValue("resolution", envMapSize);`
`114`	`113`	`mapUpdateSpacing = node.GetIntValue("interval", mapUpdateSpacing);`
`115`	`114`	`eveInstalled = node.GetBoolValue("eveInstalled", false);`
`@@ -186,7 +185,6 @@ public void debugGuiDisable()`
`186`	`185`
`187`	`186`	`public void OnDestroy()`
`188`	`187`	`{`
`189`		`- MonoBehaviour.print("SSTUReflectionManager OnDestroy()");`
`190`	`188`	`if (instance == this) { instance = null; }`
`191`	`189`	`if (gui != null)`
`192`	`190`	`{`
`@@ -208,14 +206,12 @@ public void OnDestroy()`
`208`	`206`
`209`	`207`	`private void init()`
`210`	`208`	`{`
`211`		`- MonoBehaviour.print("SSTUReflectionManager init()");`
`212`	`209`	`if (cameraObject == null)`
`213`	`210`	`{`
`214`	`211`	`cameraObject = new GameObject("TRReflectionCamera");`
`215`	`212`	`reflectionCamera = cameraObject.AddComponent<Camera>();`
`216`	`213`	`eveCameraFix = cameraObject.AddComponent<CameraAlphaFix>();`
`217`	`214`	`reflectionCamera.enabled = false;`
`218`		`- MonoBehaviour.print("SSTUReflectionManager created camera: "+reflectionCamera);`
`219`	`215`	`}`
`220`	`216`	`if (skyboxShader == null)`
`221`	`217`	`{`
`@@ -272,7 +268,7 @@ public void updateReflections()`
`272`	`268`	`if (probeData.updateTime >= mapUpdateSpacing)`
`273`	`269`	`{`
`274`	`270`	`reflectionCamera.gameObject.SetActive(true);`
`275`		`- if (alternateRender)`
	`271`	`+ if (TexturesUnlimitedLoader.alternateRender)`
`276`	`272`	`{`
`277`	`273`	`renderFaceAlt(probeData.renderedCube, probeData.updateFace, vessel.transform.position, probeData.updatePass);`
`278`	`274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ private void drawWindow(int id)`
`40`	`40`	`GUILayout.BeginVertical();`
`41`	`41`	`GUILayout.Label("The Graphics API Detected: "+ SystemInfo.graphicsDeviceType);`
`42`	`42`	`GUILayout.Label("Is unsupported by Textures Unlimited, and some graphics may not render correctly.");`
`43`		`- GUILayout.Label("For best results, use the -force-glcore command line option to start KSP using the OpenGL Core graphics API");`
	`43`	`+ GUILayout.Label("For best results, use the -force-d3d11 or -force-glcore command line option to start KSP using either DirectX11 or the OpenGL Core graphics API");`
`44`	`44`	`GUILayout.FlexibleSpace();//push button to bottom of window`
`45`	`45`	`if (GUILayout.Button("Acknowledge & Close"))`
`46`	`46`	`{`