Просмотр исходного кода

Bugfix: Don't render skybox when rendering scene axis gizmos, causing its background not to be fully transparent

BearishSun 7 лет назад
Родитель
Сommit
48fa4c132a

+ 1 - 0
Source/Scripting/MBansheeEditor/Windows/Scene/SceneAxesGUI.cs

@@ -60,6 +60,7 @@ namespace BansheeEditor
             camera.AspectRatio = 1.0f;
             camera.AspectRatio = 1.0f;
             camera.OrthoHeight = 2.0f;
             camera.OrthoHeight = 2.0f;
             camera.RenderSettings.EnableHDR = false;
             camera.RenderSettings.EnableHDR = false;
+            camera.RenderSettings.EnableSkybox = false;
 
 
             renderTextureGUI = new GUIRenderTexture(renderTexture, true);
             renderTextureGUI = new GUIRenderTexture(renderTexture, true);
 
 

+ 14 - 0
Source/Scripting/MBansheeEngine/Generated/RenderSettings.generated.cs

@@ -179,6 +179,16 @@ namespace BansheeEngine
 			set { Internal_setoverlayOnly(mCachedPtr, value); }
 			set { Internal_setoverlayOnly(mCachedPtr, value); }
 		}
 		}
 
 
+		/// <summary>
+		/// If enabled the camera will use the skybox for rendering the background. A skybox has to be present in the scene. When 
+		/// disabled the camera will use the clear color for rendering the background.
+		/// </summary>
+		public bool EnableSkybox
+		{
+			get { return Internal_getenableSkybox(mCachedPtr); }
+			set { Internal_setenableSkybox(mCachedPtr, value); }
+		}
+
 		[MethodImpl(MethodImplOptions.InternalCall)]
 		[MethodImpl(MethodImplOptions.InternalCall)]
 		private static extern void Internal_RenderSettings(RenderSettings managedInstance);
 		private static extern void Internal_RenderSettings(RenderSettings managedInstance);
 		[MethodImpl(MethodImplOptions.InternalCall)]
 		[MethodImpl(MethodImplOptions.InternalCall)]
@@ -253,6 +263,10 @@ namespace BansheeEngine
 		private static extern bool Internal_getoverlayOnly(IntPtr thisPtr);
 		private static extern bool Internal_getoverlayOnly(IntPtr thisPtr);
 		[MethodImpl(MethodImplOptions.InternalCall)]
 		[MethodImpl(MethodImplOptions.InternalCall)]
 		private static extern void Internal_setoverlayOnly(IntPtr thisPtr, bool value);
 		private static extern void Internal_setoverlayOnly(IntPtr thisPtr, bool value);
+		[MethodImpl(MethodImplOptions.InternalCall)]
+		private static extern bool Internal_getenableSkybox(IntPtr thisPtr);
+		[MethodImpl(MethodImplOptions.InternalCall)]
+		private static extern void Internal_setenableSkybox(IntPtr thisPtr, bool value);
 	}
 	}
 
 
 	/** @} */
 	/** @} */

+ 18 - 0
Source/Scripting/SBansheeEngine/Generated/BsScriptRenderSettings.generated.cpp

@@ -58,6 +58,8 @@ namespace bs
 		metaData.scriptClass->addInternalCall("Internal_setenableIndirectLighting", (void*)&ScriptRenderSettings::Internal_setenableIndirectLighting);
 		metaData.scriptClass->addInternalCall("Internal_setenableIndirectLighting", (void*)&ScriptRenderSettings::Internal_setenableIndirectLighting);
 		metaData.scriptClass->addInternalCall("Internal_getoverlayOnly", (void*)&ScriptRenderSettings::Internal_getoverlayOnly);
 		metaData.scriptClass->addInternalCall("Internal_getoverlayOnly", (void*)&ScriptRenderSettings::Internal_getoverlayOnly);
 		metaData.scriptClass->addInternalCall("Internal_setoverlayOnly", (void*)&ScriptRenderSettings::Internal_setoverlayOnly);
 		metaData.scriptClass->addInternalCall("Internal_setoverlayOnly", (void*)&ScriptRenderSettings::Internal_setoverlayOnly);
+		metaData.scriptClass->addInternalCall("Internal_getenableSkybox", (void*)&ScriptRenderSettings::Internal_getenableSkybox);
+		metaData.scriptClass->addInternalCall("Internal_setenableSkybox", (void*)&ScriptRenderSettings::Internal_setenableSkybox);
 
 
 	}
 	}
 
 
@@ -397,4 +399,20 @@ namespace bs
 	{
 	{
 		thisPtr->getInternal()->overlayOnly = value;
 		thisPtr->getInternal()->overlayOnly = value;
 	}
 	}
+
+	bool ScriptRenderSettings::Internal_getenableSkybox(ScriptRenderSettings* thisPtr)
+	{
+		bool tmp__output;
+		tmp__output = thisPtr->getInternal()->enableSkybox;
+
+		bool __output;
+		__output = tmp__output;
+
+		return __output;
+	}
+
+	void ScriptRenderSettings::Internal_setenableSkybox(ScriptRenderSettings* thisPtr, bool value)
+	{
+		thisPtr->getInternal()->enableSkybox = value;
+	}
 }
 }

+ 2 - 0
Source/Scripting/SBansheeEngine/Generated/BsScriptRenderSettings.generated.h

@@ -65,5 +65,7 @@ namespace bs
 		static void Internal_setenableIndirectLighting(ScriptRenderSettings* thisPtr, bool value);
 		static void Internal_setenableIndirectLighting(ScriptRenderSettings* thisPtr, bool value);
 		static bool Internal_getoverlayOnly(ScriptRenderSettings* thisPtr);
 		static bool Internal_getoverlayOnly(ScriptRenderSettings* thisPtr);
 		static void Internal_setoverlayOnly(ScriptRenderSettings* thisPtr, bool value);
 		static void Internal_setoverlayOnly(ScriptRenderSettings* thisPtr, bool value);
+		static bool Internal_getenableSkybox(ScriptRenderSettings* thisPtr);
+		static void Internal_setenableSkybox(ScriptRenderSettings* thisPtr, bool value);
 	};
 	};
 }
 }

+ 1 - 1
Source/bsf

@@ -1 +1 @@
-Subproject commit ee0f6ac588a2c417084361edc63184a22d1da62a
+Subproject commit cef56143a8df39de929caea3895fa3ec074a288f