[Pkg-cli-apps-commits] [SCM] openbve branch, master, updated. debian/1.4.0.0-1-36-gabcb614

[Paul Sladen]

The following commit has been merged in the master branch:
commit 586514a82ecb7b7e6c73c4304a8cde75628f3a35
Merge: 7ea89d07dcf40a9a23a4170587a7b09c626d9624 f28472a7b84a0c36aa866dbfbf371e2a33caac9b
Author: Paul Sladen <debian at paul.sladen.org>
Date:   Sat Jan 21 21:19:13 2012 +0100

    Merge commit 'upstream/1.4.0.5' into debian-1.4.0.5-merge

diff --combined openBVE/OpenBve/OldCode/Renderer.cs
index bff34ae,205d4d7..362e780
--- a/openBVE/OpenBve/OldCode/Renderer.cs
+++ b/openBVE/OpenBve/OldCode/Renderer.cs
@@@ -276,7 -276,7 +276,7 @@@ namespace OpenBve 
  			Gl.glBlendFunc(Gl.GL_SRC_ALPHA, Gl.GL_ONE_MINUS_SRC_ALPHA);
  			Gl.glDisable(Gl.GL_BLEND); BlendEnabled = false;
  			Gl.glEnable(Gl.GL_DEPTH_TEST);
 -			Gl.glDepthMask(Gl.GL_TRUE);
 +			Gl.glDepthMask(true);
  			Gl.glMaterialfv(Gl.GL_FRONT_AND_BACK, Gl.GL_EMISSION, new float[] { 0.0f, 0.0f, 0.0f, 1.0f }); EmissiveEnabled = false;
  			SetAlphaFunc(Gl.GL_GREATER, 0.9f);
  		}
@@@ -434,7 -434,7 +434,7 @@@
  			SortPolygons(DynamicAlpha);
  			if (Interface.CurrentOptions.TransparencyMode == TransparencyMode.Performance) {
  				Gl.glEnable(Gl.GL_BLEND); BlendEnabled = true;
 -				Gl.glDepthMask(Gl.GL_FALSE);
 +				Gl.glDepthMask(false);
  				SetAlphaFunc(Gl.GL_GREATER, 0.0f);
  				for (int i = 0; i < DynamicAlpha.FaceCount; i++) {
  					RenderFace(ref DynamicAlpha.Faces[i], cx, cy, cz);
@@@ -442,7 -442,7 +442,7 @@@
  			} else {
  				Gl.glDisable(Gl.GL_BLEND); BlendEnabled = false;
  				SetAlphaFunc(Gl.GL_EQUAL, 1.0f);
 -				Gl.glDepthMask(Gl.GL_TRUE);
 +				Gl.glDepthMask(true);
  				for (int i = 0; i < DynamicAlpha.FaceCount; i++) {
  					int r = (int)ObjectManager.Objects[DynamicAlpha.Faces[i].ObjectIndex].Mesh.Faces[DynamicAlpha.Faces[i].FaceIndex].Material;
  					if (ObjectManager.Objects[DynamicAlpha.Faces[i].ObjectIndex].Mesh.Materials[r].BlendMode == World.MeshMaterialBlendMode.Normal & ObjectManager.Objects[DynamicAlpha.Faces[i].ObjectIndex].Mesh.Materials[r].GlowAttenuationData == 0) {
@@@ -453,7 -453,7 +453,7 @@@
  				}
  				Gl.glEnable(Gl.GL_BLEND); BlendEnabled = true;
  				SetAlphaFunc(Gl.GL_LESS, 1.0f);
 -				Gl.glDepthMask(Gl.GL_FALSE);
 +				Gl.glDepthMask(false);
  				bool additive = false;
  				for (int i = 0; i < DynamicAlpha.FaceCount; i++) {
  					int r = (int)ObjectManager.Objects[DynamicAlpha.Faces[i].ObjectIndex].Mesh.Faces[DynamicAlpha.Faces[i].FaceIndex].Material;
@@@ -474,7 -474,7 +474,7 @@@
  			}
  			// motion blur
  			Gl.glDisable(Gl.GL_DEPTH_TEST);
 -			Gl.glDepthMask(Gl.GL_FALSE);
 +			Gl.glDepthMask(false);
  			SetAlphaFunc(Gl.GL_GREATER, 0.0f);
  			if (Interface.CurrentOptions.MotionBlur != Interface.MotionBlurMode.None) {
  				if (LightingEnabled) {
@@@ -492,7 -492,7 +492,7 @@@
  			Glu.gluLookAt(0.0, 0.0, 0.0, dx, dy, dz, ux, uy, uz);
  			if (World.CameraRestriction == World.CameraRestrictionMode.NotAvailable) {
  				// 3d cab
 -				Gl.glDepthMask(Gl.GL_TRUE);
 +				Gl.glDepthMask(true);
  				Gl.glEnable(Gl.GL_DEPTH_TEST);
  				Gl.glClear(Gl.GL_DEPTH_BUFFER_BIT);
  				if (!LightingEnabled) {
@@@ -510,7 -510,7 +510,7 @@@
  				SortPolygons(OverlayAlpha);
  				if (Interface.CurrentOptions.TransparencyMode == TransparencyMode.Performance) {
  					Gl.glEnable(Gl.GL_BLEND); BlendEnabled = true;
 -					Gl.glDepthMask(Gl.GL_FALSE);
 +					Gl.glDepthMask(false);
  					SetAlphaFunc(Gl.GL_GREATER, 0.0f);
  					for (int i = 0; i < OverlayAlpha.FaceCount; i++) {
  						RenderFace(ref OverlayAlpha.Faces[i], cx, cy, cz);
@@@ -518,7 -518,7 +518,7 @@@
  				} else {
  					Gl.glDisable(Gl.GL_BLEND); BlendEnabled = false;
  					SetAlphaFunc(Gl.GL_EQUAL, 1.0f);
 -					Gl.glDepthMask(Gl.GL_TRUE);
 +					Gl.glDepthMask(true);
  					for (int i = 0; i < OverlayAlpha.FaceCount; i++) {
  						int r = (int)ObjectManager.Objects[OverlayAlpha.Faces[i].ObjectIndex].Mesh.Faces[OverlayAlpha.Faces[i].FaceIndex].Material;
  						if (ObjectManager.Objects[OverlayAlpha.Faces[i].ObjectIndex].Mesh.Materials[r].BlendMode == World.MeshMaterialBlendMode.Normal & ObjectManager.Objects[OverlayAlpha.Faces[i].ObjectIndex].Mesh.Materials[r].GlowAttenuationData == 0) {
@@@ -529,7 -529,7 +529,7 @@@
  					}
  					Gl.glEnable(Gl.GL_BLEND); BlendEnabled = true;
  					SetAlphaFunc(Gl.GL_LESS, 1.0f);
 -					Gl.glDepthMask(Gl.GL_FALSE);
 +					Gl.glDepthMask(false);
  					bool additive = false;
  					for (int i = 0; i < OverlayAlpha.FaceCount; i++) {
  						int r = (int)ObjectManager.Objects[OverlayAlpha.Faces[i].ObjectIndex].Mesh.Faces[OverlayAlpha.Faces[i].FaceIndex].Material;
@@@ -557,7 -557,7 +557,7 @@@
  				if (!BlendEnabled) {
  					Gl.glEnable(Gl.GL_BLEND); BlendEnabled = true;
  				}
 -				Gl.glDepthMask(Gl.GL_FALSE);
 +				Gl.glDepthMask(false);
  				Gl.glDisable(Gl.GL_DEPTH_TEST);
  				UnsetAlphaFunc();
  				SortPolygons(OverlayAlpha);
@@@ -2367,7 -2367,7 +2367,7 @@@
  					"=sound",
  					"sound buffers: " + soundBuffersLoaded.ToString(Culture) + " / " + soundBuffersRegistered.ToString(Culture),
  					"sound sources: " + soundSourcesPlaying.ToString(Culture) + " / " + soundSourcesRegistered.ToString(Culture),
- 					"outer radius factor: " + Sounds.OuterRadiusFactor.ToString("0.00", Culture),
+ 					(Interface.CurrentOptions.SoundModel == Sounds.SoundModels.Experimental ? "log clamp factor: " + Sounds.ClampFactorLogarithm.ToString("0.00") : "outer radius factor: " + Sounds.OuterRadiusFactor.ToString("0.00", Culture)),
  					"",
  					"=debug",
  					"train plugin status: " + (TrainManager.PlayerTrain.Plugin != null ? (TrainManager.PlayerTrain.Plugin.PluginValid ? "ok" : "error") : "n/a"),

-- 
openbve