[Pkg-cli-apps-commits] [SCM] openbve branch, master, updated. debian/1.4.0.7-2-2-g770fa3e
Paul Sladen
debian at paul.sladen.org
Wed Feb 8 22:51:56 UTC 2012
The following commit has been merged in the master branch:
commit 770fa3edbe915dbc7d9254bada5f6dbaa91e4ca7
Merge: 67e89763cb3496992b112997343a75022037db74 61176347a8aca693be17c0e71d53cfa6fcb75800
Author: Paul Sladen <debian at paul.sladen.org>
Date: Wed Feb 8 22:47:32 2012 +0000
New upstream stable release (1.4.0.9)
Merge commit 'upstream/1.4.0.9'
diff --combined debian/changelog
index bf82495,0000000..3cc0d9c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,293 -1,0 +1,299 @@@
++openbve (1.4.0.9-1) UNRELEASED; urgency=low
++
++ * New upstream stable release (1.4.0.9)
++
++ -- Paul Sladen <debian at paul.sladen.org> Wed, 08 Feb 2012 22:44:00 +0000
++
+openbve (1.4.0.7-2) unstable; urgency=low
+
+ * debian/openbve.desktop: Add generic name, and [de] name (Closes: #657599)
+ * debian/openbve.desktop: Disable StartupNotify=false (Closes: #657599)
+ (Thanks to Ronny Standtke)
+
+ -- Paul Sladen <debian at paul.sladen.org> Sat, 04 Feb 2012 17:17:17 +0000
+
+openbve (1.4.0.7-1) unstable; urgency=low
+
+ * New upstream stable release (1.4.0.7)
+ * Delete extranous 'licence-background.txt' previously merged into
+ debian/copyright in commit 9ae7ec26.
+ * routes-and-trains.txt: refresh/cull list of third-party content websites
+
+ -- Paul Sladen <debian at paul.sladen.org> Sat, 04 Feb 2012 16:16:16 +0000
+
+openbve (1.4.0.5-1) unstable; urgency=low
+
+ * Openbve ITP (Closes: #522854)
+ * New upstream stable release (1.4.0.5)
+
+ -- Paul Sladen <debian at paul.sladen.org> Sat, 21 Jan 2012 21:00:00 +0100
+
+openbve (1.4.0.0-2) UNRELEASED; urgency=low
+
+ [Paul Sladen]
+ * Openbve ITP (Closes: #522854)
+ * debian/filesystem.cfg: use 'SpecialFolder.LocalApplicationData'
+ + emulate behaviour until upstream allows LocalApplicationData
+ * debian/README.source: document 'mask.bin'
+ * debian/rules+control: convert to minimal debhelper 7 + bumps build-dep
+ * debian/rules: use --with=cli
+ + restore '--exclude-moduleref=AtsPluginProxy.dll'
+ (removed >= 1.2.10.0-0ubuntu2) to stop errors
+ * Provide more context for licensing discussions with upstream
+ * Drop lynx dependency now that 'dh_installchangelogs' is used
+ * Merge 'known-issues.txt' into main 'README.Debian'
+
+ -- Paul Sladen <debian at paul.sladen.org> Fri, 13 Jan 2012 23:00:00 +0100
+
+openbve (1.4.0.0-1) experimental; urgency=low
+
+ * Initial Debian upload
+ * New upstream stable release (1.4.0.0)
+ + update upstream URL to 'trainsimframework.org/*'
+ + credits file as part of docs too
+ + update 'changelog.html' and 'credits.html'
+ + install new modular plugins to '/usr/lib/openbve/Plugins'
+ + bump openbve-data (>= 1.4.0.0) hard dependency
+ * debian/changelog: DEP5 and bump copyright to latest upstream wording
+ * debian/source/format: '3.0 (quilt)'
+ * debian/source/options: single-debian-patch
+
+ -- Iain Lane <laney at debian.org> Wed, 11 Jan 2012 23:00:00 +0100
+
+openbve (1.2.10.0-0ubuntu3) precise; urgency=low
+
+ * debian/control: Add missing dependency (libmono-i18n4.0-all) and remove
+ dependency on libmono-i18n4.0-cil as the latter is a dependency of the
+ first. Thanks to Paul Childs for the fix and to Paul Sladen for finding a
+ dependency simplification. (LP: #877776)
+ Adding also ${misc:Depends} to the Depends field and bumping the
+ Standards-Version to 3.9.2 (current version).
+ * debian/rules: Add build-arch and build-indep recommended targets.
+
+ -- Alessandro Menti <alessandro.menti at hotmail.it> Sat, 29 Oct 2011 19:40:10 +0200
+
+openbve (1.2.10.0-0ubuntu2) oneiric; urgency=low
+
+ * debian/rules: Skip AtsPluginProxy.dll modulrefs, these are Win32 only.
+ * openBVE/OpenBveApi/OpenBveApi.csproj,
+ openBVE/OpenBve/OpenBve.csproj: set TargetFrameworkVersion to v4.0.
+ * debian/control: Tweak dependencies and build-dependencies for 4.0.
+
+ -- Jo Shields <directhex at apebox.org> Sat, 02 Jul 2011 22:11:00 +0100
+
+openbve (1.2.10.0-0ubuntu1) natty; urgency=low
+
+ * New upstream stable version (1.2.10.0)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Tue, 28 Dec 2010 04:12:00 +0000
+
+openbve (1.2.7.3-0ubuntu3) natty; urgency=low
+
+ * debian/control: Fixed typo in first line of third paragraph of
+ the package description-missing 's' in 'based' (LP: #628758)
+
+ -- Arvind S Raj <sraj.arvind at gmail.com> Fri, 24 Dec 2010 07:46:07 +0530
+
+openbve (1.2.7.3-0ubuntu2) maverick; urgency=low
+
+ * debian/control: fix minor spelling mistakes (LP: #628758)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Sat, 9 Oct 2010 02:29:00 +0100
+
+openbve (1.2.7.3-0ubuntu1) maverick; urgency=low
+
+ * New upstream stable version (1.2.7.3)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Wed, 11 Aug 2010 23:07:00 +0100
+
+openbve (1.2.7.0-0ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream stable version (1.2.7.0)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Sun, 11 Jul 2010 11:49:00 +0100
+
+openbve (1.2.6.106-0ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream development version (1.2.6.106)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Tue, 6 Jul 2010 02:45:00 +0100
+
+openbve (1.2.6.105-0ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream development version (1.2.6.105)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Sun, 4 Jul 2010 15:05:00 +0100
+
+openbve (1.2.6.3-0ubuntu1) maverick; urgency=low
+
+ * New upstream stable version (1.2.6.3)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Wed, 5 May 2010 11:20:00 +0100
+
+openbve (1.2.5.2-0ubuntu1) lucid; urgency=low
+
+ * New upstream stable version (1.2.5.2)
+ * Tweak build-deps to use newer tao*-cil-dev packages
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Tue, 16 Feb 2010 14:03:00 +0000
+
+openbve (1.2.5.1-0ubuntu1) lucid; urgency=low
+
+ * New upstream stable version (1.2.5.1)
+ fixes (LP: #505299)
+ * changelog.html: update (1.2.5.1)
+ * rules: explicitly pass 'OpenBve.csproj' to xbuild
+ * rules: use xbuild /t:Clean target now that it works
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Mon, 15 Feb 2010 18:28:00 +0000
+
+openbve (1.2.4.5-0ubuntu1) unreleased; urgency=low
+
+ * New upstream development version (1.2.4.5)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Sat, 9 Jan 2010 02:03:00 +0000
+
+openbve (1.2.4.4-0ubuntu1) lucid; urgency=low
+
+ * New upstream development version (1.2.4.4)
+ + fixes autoscaling (LP: #503913)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Thu, 7 Jan 2010 15:18:00 +0000
+
+openbve (1.2.4.1-0ubuntu1) lucid; urgency=low
+
+ * New upstream development version (1.2.4.1) (LP: #444934)
+ fixes (LP: #419523) (LP: #419525) (LP: #419530) (LP: #444462)
+ * changelog.html: update (1.2.3.3)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Wed, 6 Jan 2010 07:58:00 +0000
+
+openbve (1.2.2.0-0ubuntu1) unreleased; urgency=low
+
+ * New upstream stable version (1.2.2.0) (LP: #444934)
+ * changelog.html: update (1.2.2.0)
+ * releasenotes.html: update (1.2.1.3)
+ * Add NEWS.Debian to docs
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Tue, 1 Sep 2009 00:11:00 +0100
+
+openbve (1.2.0.3-0ubuntu1) karmic; urgency=low
+
+ * New upstream stable version (1.2.0.3)
+ * debian/copyright: update to reflect minor wording changes
+ * debian/rules: "./rules fetch-html" for {changelog,releasenotes}.html
+ * changelog.html: update (1.2.0.3)
+ * releasenotes.html: update (1.2.0.0)
+ * debian/rules: DEBUG_CONFIGURATION=Release to switch codepaths used
+ * debian/control: openbve-data (>= 1.2.0.3+dfsg)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Thu, 6 Aug 2009 02:05:00 +0100
+
+openbve (1.1.1.0-0ubuntu1) unreleased; urgency=low
+
+ * New upstream development version (1.1.1.0)
+ * debian/control: rev 'openbve-data' dependency (new strings)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Sun, 05 Jul 2009 21:10:00 +0000
+
+openbve (1.0.7.2-0ubuntu1) karmic; urgency=low
+
+ * New upstream version (1.0.7.2)
+ * Update changelog.html (1.0.7.2)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Tue, 23 Jun 2009 20:20:00 +0000
+
+openbve (1.0.6.7-0ubuntu1) unreleased; urgency=low
+
+ * Add WatchdogExit() to take care of deadlocks in library shutdown
+ * New upstream version (1.0.6.7)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Sun, 7 Jun 2009 02:54:00 +0000
+
+openbve (1.0.6.2-0ubuntu1) unreleased; urgency=low
+
+ * New upstream version (1.0.6.2)
+ * Update 'debian/known-issues.txt'
+ * Update 'openbve-data' Depends: >= 1.0.6.0+dfsg
+ * Drop try..catch around saving of logs (should be handled by
+ separate patch applied by upstream.
+ * Update changelog.html (1.0.6.2)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Fri, 29 May 2009 15:12:03 +0000
+
+openbve (1.0.6.0-0ubuntu1) unreleased; urgency=low
+
+ * New upstream version (1.0.6.0)
+ * Make dropping out of full-screen *very* first priority
+ * Update changelog.html (1.0.6.0) and releasenotes.html (1.0.5.0)
+ * Update known-issues.txt
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Thu, 28 May 2009 06:53:10 +0000
+
+openbve (1.0.2.0-0ubuntu2) jaunty; urgency=low
+
+ * Explicitly depend on 'libmono-i18n2.0-cil' (LP: #356487)
+ * Backport homepage update to 'http://openbve.trainsimcentral.co.uk/'
+ + and fix packaging to reflect
+ * Expand debian/copyright based on feedback for acceptance into Debian
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Wed, 15 Apr 2009 02:56:20 +0000
+
+openbve (1.0.2.0-0ubuntu1) jaunty; urgency=low
+
+ * New upstream version (bugfix release) (LP: #356344)
+ * debian/rules: tweak to allow easy building of Debug or Release target
+ * pass '/fhs' from the mono wrapper instead of hardcoding
+ * overload GetSettingsFolder() to create the config directory before return it
+ * Load first-use Keyboard mapping from GetDataFolder("Controls") not ~/
+ * Default first-use game data from /usr/share/games/bve/{Railway/Route,Train}
+ * Update 'openbve-data' Depends: >= 1.0.2.0+dfsg
+ * Load timetables relative to route directory, not trainpath
+ + disable spurious Train folder warning, as existance is not required later
+ * Don't display hidden .files and .folders in ListViews
+ * Include 'changelog.html' and 'releasenotes.html' downloaded from the website
+ * Fix case in manpage documentation for '~/.config/OpenBve/'
+ * Add README.Debian covering Debian-centric patches
+ * Update 'known-issues.txt'
+ * Print + try...except{} around path used in LoadOptions() (debugging)
+ * Pacify lintian checker
+ * Leave fullscreen before deinitialisation to reduce risk of leaving a mess
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Sun, 05 Apr 2009 12:33:10 +0000
+
+openbve (0.9.5.5-0ubuntu3) unreleased; urgency=low
+
+ * Tweak manpage
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Thu, 23 Feb 2009 12:48:27 +0000
+
+openbve (0.9.5.5-0ubuntu2) jaunty; urgency=low
+
+ * Fix FTBFS: 'libtaoframework-openal1.1-cil' and 'libmono-winforms2.0-cil'
+ plus move 'mono-xbuild' from -Indep (for clean target).
+ * Use optimised compiler target (Release, instead of Debug)
+ * Use '/usr/share/games/bve/' as default train/route location
+ * Only whinge about plugins not being available if 'ats.cfg' exists
+ * Don't display hidden .files and .folders in ListViews
+ * Update manpage with initial tab options
+ * Disable spurious Train folder warning message,
+ as existance is not required later
+ * Handle ll-CC default langauge selection and fall back to just ll.
+ * Use Sdl_WM_SetIcon() on all platforms
+ * Bump openbve-data (>= 0.9.5.5+dfsg-0ubuntu3) dependency
+ * Load timetables relative to route directory, not trainpath
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Thu, 19 Feb 2009 18:49:21 +0000
+
+openbve (0.9.5.5-0ubuntu1) jaunty; urgency=low
+
+ * New upstream release 0.9.5.5, dated 20090217-2228
+ * Initial release (LP: #331188)
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Wed, 18 Feb 2009 23:23:30 +0200
+
+openbve (0.9.5.0-0ubuntu1) unreleased; urgency=low
+
+ * import 0.9.5.0, dated 20090201-1953
+
+ -- Paul Sladen <ubuntu at paul.sladen.org> Fri, 15 Feb 2009 11:51:30 +0100
diff --combined openBVE/OpenBve/OldCode/Renderer.cs
index 362e780,0028889..c2096c3
--- a/openBVE/OpenBve/OldCode/Renderer.cs
+++ b/openBVE/OpenBve/OldCode/Renderer.cs
@@@ -82,6 -82,7 +82,7 @@@ namespace OpenBve
internal int ObjectIndex;
internal int FaceIndex;
internal double Distance;
+ internal Textures.OpenGlTextureWrapMode Wrap;
}
private class ObjectList {
internal ObjectFace[] Faces;
@@@ -276,7 -277,7 +277,7 @@@
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 -435,7 +435,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 -443,7 +443,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 -454,7 +454,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 -475,7 +475,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 -493,7 +493,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 -511,7 +511,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 -519,7 +519,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 -530,7 +530,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 -558,7 +558,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);
@@@ -622,22 -623,11 +623,11 @@@
}
}
int r = (int)ObjectManager.Objects[Face.ObjectIndex].Mesh.Faces[Face.FaceIndex].Material;
- RenderFace(ref ObjectManager.Objects[Face.ObjectIndex].Mesh.Materials[r], ObjectManager.Objects[Face.ObjectIndex].Mesh.Vertices, ref ObjectManager.Objects[Face.ObjectIndex].Mesh.Faces[Face.FaceIndex], CameraX, CameraY, CameraZ);
+ RenderFace(ref ObjectManager.Objects[Face.ObjectIndex].Mesh.Materials[r], ObjectManager.Objects[Face.ObjectIndex].Mesh.Vertices, Face.Wrap, ref ObjectManager.Objects[Face.ObjectIndex].Mesh.Faces[Face.FaceIndex], CameraX, CameraY, CameraZ);
}
- private static void RenderFace(ref World.MeshMaterial Material, World.Vertex[] Vertices, ref World.MeshFace Face, double CameraX, double CameraY, double CameraZ) {
+ private static void RenderFace(ref World.MeshMaterial Material, World.Vertex[] Vertices, Textures.OpenGlTextureWrapMode wrap, ref World.MeshFace Face, double CameraX, double CameraY, double CameraZ) {
// texture
- Textures.OpenGlTextureWrapMode wrap = Textures.OpenGlTextureWrapMode.ClampClamp;
if (Material.DaytimeTexture != null) {
- // HACK //
- for (int v = 0; v < Vertices.Length; v++) {
- if (Vertices[v].TextureCoordinates.X < 0.0 | Vertices[v].TextureCoordinates.X > 1.0) {
- wrap |= Textures.OpenGlTextureWrapMode.RepeatClamp;
- }
- if (Vertices[v].TextureCoordinates.Y < 0.0 | Vertices[v].TextureCoordinates.Y > 1.0) {
- wrap |= Textures.OpenGlTextureWrapMode.ClampRepeat;
- }
- }
- // end HACK //
if (Textures.LoadTexture(Material.DaytimeTexture, wrap)) {
if (!TexturingEnabled) {
Gl.glEnable(Gl.GL_TEXTURE_2D);
@@@ -2759,18 -2749,26 +2749,26 @@@
for (int i = 0; i < f; i++) {
bool alpha = false;
int k = ObjectManager.Objects[ObjectIndex].Mesh.Faces[i].Material;
+ Textures.OpenGlTextureWrapMode wrap = Textures.OpenGlTextureWrapMode.ClampClamp;
if (ObjectManager.Objects[ObjectIndex].Mesh.Materials[k].DaytimeTexture != null | ObjectManager.Objects[ObjectIndex].Mesh.Materials[k].NighttimeTexture != null) {
- // HACK //
- Textures.OpenGlTextureWrapMode wrap = Textures.OpenGlTextureWrapMode.ClampClamp;
- for (int v = 0; v < ObjectManager.Objects[ObjectIndex].Mesh.Vertices.Length; v++) {
- if (ObjectManager.Objects[ObjectIndex].Mesh.Vertices[v].TextureCoordinates.X < 0.0 | ObjectManager.Objects[ObjectIndex].Mesh.Vertices[v].TextureCoordinates.X > 1.0) {
- wrap |= Textures.OpenGlTextureWrapMode.RepeatClamp;
- }
- if (ObjectManager.Objects[ObjectIndex].Mesh.Vertices[v].TextureCoordinates.Y < 0.0 | ObjectManager.Objects[ObjectIndex].Mesh.Vertices[v].TextureCoordinates.Y > 1.0) {
- wrap |= Textures.OpenGlTextureWrapMode.ClampRepeat;
+
+ // HACK: Objects do not store information on the texture wrapping mode.
+ // Let's determine the best wrapping mode now and then save it
+ // so we can quickly access it in the rendering loop.
+
+ if (ObjectManager.Objects[ObjectIndex].Dynamic) {
+ wrap = Textures.OpenGlTextureWrapMode.RepeatRepeat;
+ } else {
+ for (int v = 0; v < ObjectManager.Objects[ObjectIndex].Mesh.Vertices.Length; v++) {
+ if (ObjectManager.Objects[ObjectIndex].Mesh.Vertices[v].TextureCoordinates.X < 0.0f | ObjectManager.Objects[ObjectIndex].Mesh.Vertices[v].TextureCoordinates.X > 1.0f) {
+ wrap |= Textures.OpenGlTextureWrapMode.RepeatClamp;
+ }
+ if (ObjectManager.Objects[ObjectIndex].Mesh.Vertices[v].TextureCoordinates.Y < 0.0f | ObjectManager.Objects[ObjectIndex].Mesh.Vertices[v].TextureCoordinates.Y > 1.0f) {
+ wrap |= Textures.OpenGlTextureWrapMode.ClampRepeat;
+ }
}
}
- // end HACK //
+
if (ObjectManager.Objects[ObjectIndex].Mesh.Materials[k].DaytimeTexture != null) {
if (Textures.LoadTexture(ObjectManager.Objects[ObjectIndex].Mesh.Materials[k].DaytimeTexture, wrap)) {
OpenBveApi.Textures.TextureTransparencyType type = ObjectManager.Objects[ObjectIndex].Mesh.Materials[k].DaytimeTexture.Transparency;
@@@ -2850,6 -2848,10 +2848,10 @@@
list.Faces[newIndex].ObjectListIndex = ObjectCount;
list.Faces[newIndex].ObjectIndex = ObjectIndex;
list.Faces[newIndex].FaceIndex = i;
+
+ // HACK: Let's store the wrapping mode.
+ list.Faces[newIndex].Wrap = wrap;
+
StaticOpaque[groupIndex].Update = true;
Objects[ObjectCount].FaceListReferences[i] = new ObjectListReference(listType, newIndex);
Game.InfoStaticOpaqueFaceCount++;
@@@ -2881,6 -2883,10 +2883,10 @@@
list.Faces[list.FaceCount].ObjectListIndex = ObjectCount;
list.Faces[list.FaceCount].ObjectIndex = ObjectIndex;
list.Faces[list.FaceCount].FaceIndex = i;
+
+ // HACK: Let's store the wrapping mode.
+ list.Faces[list.FaceCount].Wrap = wrap;
+
Objects[ObjectCount].FaceListReferences[i] = new ObjectListReference(listType, list.FaceCount);
list.FaceCount++;
}
diff --combined openBVE/OpenBve/OpenBve.csproj
index cecddc0,6bb78d3..cc781ce
--- a/openBVE/OpenBve/OpenBve.csproj
+++ b/openBVE/OpenBve/OpenBve.csproj
@@@ -1,4 -1,4 +1,4 @@@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@@ -13,14 -13,15 +13,15 @@@
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
- <TargetFrameworkProfile />
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<SignAssembly>False</SignAssembly>
<DelaySign>False</DelaySign>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<RunCodeAnalysis>False</RunCodeAnalysis>
<RunSourceAnalysis>False</RunSourceAnalysis>
<ApplicationIcon>..\icon.ico</ApplicationIcon>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@@ -33,8 -34,7 +34,8 @@@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>None</DebugType>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>PdbOnly</DebugType>
<Optimize>true</Optimize>
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\Release\</OutputPath>
@@@ -216,4 -216,4 +217,4 @@@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
diff --combined openBVE/OpenBveApi/OpenBveApi.csproj
index 684b594,0b8bc43..d7a132b
--- a/openBVE/OpenBveApi/OpenBveApi.csproj
+++ b/openBVE/OpenBveApi/OpenBveApi.csproj
@@@ -7,7 -7,7 +7,7 @@@
<OutputType>Library</OutputType>
<RootNamespace>OpenBveApi</RootNamespace>
<AssemblyName>OpenBveApi</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@@ -15,7 -15,8 +15,8 @@@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DocumentationFile>bin\Release\OpenBveApi.xml</DocumentationFile>
- <TargetFrameworkProfile />
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@@ -34,8 -35,8 +35,8 @@@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>bin\Release\</OutputPath>
- <DebugSymbols>false</DebugSymbols>
- <DebugType>None</DebugType>
+ <DebugSymbols>True</DebugSymbols>
+ <DebugType>PdbOnly</DebugType>
<Optimize>True</Optimize>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>TRACE</DefineConstants>
@@@ -75,4 -76,4 +76,4 @@@
<DependentUpon>Math.cs</DependentUpon>
</Compile>
</ItemGroup>
-</Project>
+</Project>
diff --combined openBVE/OpenBveAts/OpenBveAts.csproj
index b6ebeaa,a8972db..34a3623
--- a/openBVE/OpenBveAts/OpenBveAts.csproj
+++ b/openBVE/OpenBveAts/OpenBveAts.csproj
@@@ -7,14 -7,15 +7,15 @@@
<OutputType>Library</OutputType>
<RootNamespace>OpenBveAts</RootNamespace>
<AssemblyName>OpenBveAts</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <TargetFrameworkProfile />
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
diff --combined openBVE/Sound.Flac/Sound.Flac.csproj
index d1db165,80b3f1e..06a016b
--- a/openBVE/Sound.Flac/Sound.Flac.csproj
+++ b/openBVE/Sound.Flac/Sound.Flac.csproj
@@@ -7,14 -7,15 +7,15 @@@
<OutputType>Library</OutputType>
<RootNamespace>Sound.Flac</RootNamespace>
<AssemblyName>Sound.Flac</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <TargetFrameworkProfile />
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
<PlatformTarget>AnyCPU</PlatformTarget>
diff --combined openBVE/Sound.RiffWave/Sound.RiffWave.csproj
index 0fd3ab5,c3628a9..6388944
--- a/openBVE/Sound.RiffWave/Sound.RiffWave.csproj
+++ b/openBVE/Sound.RiffWave/Sound.RiffWave.csproj
@@@ -7,14 -7,15 +7,15 @@@
<OutputType>Library</OutputType>
<RootNamespace>Plugin</RootNamespace>
<AssemblyName>Sound.RiffWave</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <TargetFrameworkProfile />
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
<PlatformTarget>AnyCPU</PlatformTarget>
diff --combined openBVE/Texture.Ace/Texture.Ace.csproj
index 1ebdf03,f005b26..79c9342
--- a/openBVE/Texture.Ace/Texture.Ace.csproj
+++ b/openBVE/Texture.Ace/Texture.Ace.csproj
@@@ -7,14 -7,15 +7,15 @@@
<OutputType>Library</OutputType>
<RootNamespace>Texture.Ace</RootNamespace>
<AssemblyName>Texture.Ace</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <TargetFrameworkProfile />
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
<PlatformTarget>AnyCPU</PlatformTarget>
diff --combined openBVE/Texture.BmpGifJpegPngTiff/Texture.BmpGifJpegPngTiff.csproj
index fb1c4fa,2729b5f..a5b3469
--- a/openBVE/Texture.BmpGifJpegPngTiff/Texture.BmpGifJpegPngTiff.csproj
+++ b/openBVE/Texture.BmpGifJpegPngTiff/Texture.BmpGifJpegPngTiff.csproj
@@@ -7,14 -7,15 +7,15 @@@
<OutputType>Library</OutputType>
<RootNamespace>Plugin</RootNamespace>
<AssemblyName>Texture.BmpGifJpegPngTiff</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <TargetFrameworkProfile />
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
<PlatformTarget>AnyCPU</PlatformTarget>
--
openbve
More information about the Pkg-cli-apps-commits
mailing list