Menu
▾
▴
freetrain-svn
|
From: <je...@us...> - 2008-03-18 08:35:04
|
Revision: 236
http://freetrain.svn.sourceforge.net/freetrain/?rev=236&view=rev
Author: jendave
Date: 2008-03-18 01:35:09 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
fixed issues with namespaces
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs
branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
branches/FreeTrainSDL/core/controllers/road/RoadController.cs
branches/FreeTrainSDL/core/framework/MainWindow.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-18 08:20:58 UTC (rev 235)
+++ branches/FreeTrainSDL/Program.cs 2008-03-18 08:35:09 UTC (rev 236)
@@ -35,7 +35,7 @@
using FreeTrain.world.Terrain;
using FreeTrain.Controllers.Land;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.Sound;
+using FreeTrain.Framework.sound;
using FreeTrain.Util;
using FreeTrain.Util.Command;
using FreeTrain.Controllers;
Modified: branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
+++ branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs 2008-03-18 08:35:09 UTC (rev 236)
@@ -23,7 +23,7 @@
using FreeTrain.Contributions.Common;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.Sound;
+using FreeTrain.Framework.sound;
using FreeTrain.world;
namespace FreeTrain.Contributions.Rail
Modified: branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
+++ branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-18 08:35:09 UTC (rev 236)
@@ -24,7 +24,7 @@
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.Road
+namespace FreeTrain.Contributions.road
{
/// <summary>
/// RoadContribution for "org.kohsuke.freetrain.road.pc-9801fa" plug-in
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-18 08:20:58 UTC (rev 235)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-18 08:35:09 UTC (rev 236)
@@ -618,7 +618,7 @@
new Train(World.world.rootTrainGroup,
(int)length.Value, selectedTrain);
- FreeTrain.Framework.Sound.SoundEffectManager
+ FreeTrain.Framework.sound.SoundEffectManager
.PlaySynchronousSound(ResourceUtil.findSystemResource("vehiclePurchase.wav"));
AccountManager.theInstance.spend(getTotalPrice(), AccountGenre.RAIL_SERVICE);
Modified: branches/FreeTrainSDL/core/controllers/road/RoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/road/RoadController.cs 2008-03-18 08:20:58 UTC (rev 235)
+++ branches/FreeTrainSDL/core/controllers/road/RoadController.cs 2008-03-18 08:35:09 UTC (rev 236)
@@ -24,7 +24,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.Contributions.Road;
+using FreeTrain.Contributions.road;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
using FreeTrain.Views.Map;
Modified: branches/FreeTrainSDL/core/framework/MainWindow.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-18 08:20:58 UTC (rev 235)
+++ branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-18 08:35:09 UTC (rev 236)
@@ -43,7 +43,7 @@
using FreeTrain.Controllers.Terrain;
using FreeTrain.Controllers.Structs;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.Sound;
+using FreeTrain.Framework.sound;
using FreeTrain.Framework.graphics;
using FreeTrain.Views;
using FreeTrain.Views.Map;
Modified: branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs 2008-03-18 08:20:58 UTC (rev 235)
+++ branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs 2008-03-18 08:35:09 UTC (rev 236)
@@ -21,7 +21,7 @@
using System;
using FreeTrain.world;
-namespace FreeTrain.Framework.Sound
+namespace FreeTrain.Framework.sound
{
/// <summary>
/// Sound Effect
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml 2008-03-18 08:20:58 UTC (rev 235)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml 2008-03-18 08:35:09 UTC (rev 236)
@@ -3,7 +3,7 @@
]>
-<plugin>
+<plug-in>
<title>Half-tile Structures</title>
<author>C477</author>
<!--<title>半ボクセル建築</title>
@@ -48,4 +48,4 @@
</contribution>
<!--ここまでの順序は大切-->
-</plugin>
+</plug-in>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-18 15:11:13
|
Revision: 237
http://freetrain.svn.sourceforge.net/freetrain/?rev=237&view=rev
Author: jendave
Date: 2008-03-18 08:11:13 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
refactoring
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/SDLGUI.cs
branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs
branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-18 08:35:09 UTC (rev 236)
+++ branches/FreeTrainSDL/Program.cs 2008-03-18 15:11:13 UTC (rev 237)
@@ -118,10 +118,8 @@
dragStartScrollPos = new Point(0, 0);
scrollPos = new Point(0, 0);
- //Sdl.SDL_Init(Sdl.SDL_INIT_EVERYTHING | Sdl.SDL_INIT_AUDIO);
SdlDotNet.Graphics.Video.Initialize();
Mixer.Initialize();
- //SdlMixer.Mix_OpenAudio(SdlMixer.MIX_DEFAULT_FREQUENCY, unchecked(Sdl.AUDIO_S16LSB), 2, 1024);
SdlMixer.MusicFinishedDelegate musicStopped = new SdlMixer.MusicFinishedDelegate(musicHasStopped);
SdlMixer.Mix_HookMusicFinished(musicStopped);
@@ -216,9 +214,6 @@
break;
}
- //Sdl.SDL_Rect current_view = new Sdl.SDL_Rect(0, 0, (short)width, (short)height);
- //Tao.Sdl.Sdl.SDL_FillRect(screen, ref current_view, Sdl.SDL_MapRGB(videoInfo.vfmt, 0, 100, 0));
-
if (qview != null)
{
controller = MainWindow.mainWindow.currentController;
@@ -227,7 +222,7 @@
if (World.world.satellite == null || World.world.satellite.surface.w != 150 || World.world.satellite.surface.h != 150)
{
World.world.satellite = new Surface(150, 150, 32);
- World.world.satellite.fill(Color.FromArgb(222, 195, 132));
+ World.world.satellite.Fill(Color.FromArgb(222, 195, 132));
}
/*for (int i = 0; i < World.world.rootTrainGroup.items.Count; i++)
Modified: branches/FreeTrainSDL/SDLGUI.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUI.cs 2008-03-18 08:35:09 UTC (rev 236)
+++ branches/FreeTrainSDL/SDLGUI.cs 2008-03-18 15:11:13 UTC (rev 237)
@@ -137,14 +137,14 @@
public void drawGUI(int width, int height, IntPtr screen)
{
- int curXPos = -(top_bar.size.Width);
+ int curXPos = -(top_bar.Size.Width);
Sdl.SDL_Rect src, dst;
while (curXPos < width)
{
- curXPos += top_bar.size.Width;
- src = new Sdl.SDL_Rect((short)curXPos, 0, (short)top_bar.size.Width, (short)top_bar.size.Height);
+ curXPos += top_bar.Size.Width;
+ src = new Sdl.SDL_Rect((short)curXPos, 0, (short)top_bar.Size.Width, (short)top_bar.Size.Height);
dst = top_bar.clipSDLRect;
Tao.Sdl.Sdl.SDL_BlitSurface(top_bar.surfacePtr(), ref dst, screen, ref src);
}
@@ -204,17 +204,17 @@
if (SHOW_SPLASH)
{
- int xpos = (width / 2) - (splash.size.Width / 2);
- int ypos = (height / 2) - (splash.size.Height / 2);
- src = new Sdl.SDL_Rect((short)xpos, (short)ypos, (short)splash.size.Width, (short)(splash.size.Height * 2));
+ int xpos = (width / 2) - (splash.Size.Width / 2);
+ int ypos = (height / 2) - (splash.Size.Height / 2);
+ src = new Sdl.SDL_Rect((short)xpos, (short)ypos, (short)splash.Size.Width, (short)(splash.Size.Height * 2));
Tao.Sdl.Sdl.SDL_FillRect(screen, ref src, baseColor);
src = splash.clipSDLRect;
- dst = new Sdl.SDL_Rect((short)xpos, (short)ypos, (short)splash.size.Width, (short)(splash.size.Height));
+ dst = new Sdl.SDL_Rect((short)xpos, (short)ypos, (short)splash.Size.Width, (short)(splash.Size.Height));
Tao.Sdl.Sdl.SDL_BlitSurface(splash.surfacePtr(), ref src, screen, ref dst);
for (int i = 0; i < MAX_SPLASH_LINES; i++)
if (SPLASH_TEXT[i] != string.Empty)
- drawText(screen, freesans, SPLASH_TEXT[i], Color.Black, xpos + 10, (ypos + splash.size.Height + 10) + (i * (2 + SPLASH_TEXT_HEIGHT)), 0, false, false);
- drawText(screen, freesans, "[" + SPLASH_PERCENT.ToString() + "%]", Color.Black, new Point(xpos + (splash.size.Height * 2) - 16, ypos + splash.size.Width - 20), 0, false, false);
+ drawText(screen, freesans, SPLASH_TEXT[i], Color.Black, xpos + 10, (ypos + splash.Size.Height + 10) + (i * (2 + SPLASH_TEXT_HEIGHT)), 0, false, false);
+ drawText(screen, freesans, "[" + SPLASH_PERCENT.ToString() + "%]", Color.Black, new Point(xpos + (splash.Size.Height * 2) - 16, ypos + splash.Size.Width - 20), 0, false, false);
}
}
Modified: branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs 2008-03-18 08:35:09 UTC (rev 236)
+++ branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs 2008-03-18 15:11:13 UTC (rev 237)
@@ -78,7 +78,7 @@
Surface surface = new Surface(sz.Width, sz.Height);// ResourceUtil.directDraw.createOffscreenSurface(sz);
surfaces[x, y, z] = surface;
- surface.fill(Color.Magenta);
+ surface.Fill(Color.Magenta);
surface.sourceColorKey = Color.Magenta;
Point offset = src[x, y, z].offset;
@@ -104,7 +104,7 @@
}
}
- sprites[x, y, z] = new DirectSprite(surface, offset, new Point(0, 0), surface.size);
+ sprites[x, y, z] = new DirectSprite(surface, offset, new Point(0, 0), surface.Size);
}
}
}
Modified: branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs 2008-03-18 08:35:09 UTC (rev 236)
+++ branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs 2008-03-18 15:11:13 UTC (rev 237)
@@ -49,7 +49,7 @@
/// <param name="_surface"></param>
/// <param name="_offset"></param>
public DirectSprite(Surface _surface, Point _offset)
- : this(_surface, _offset, new Point(0, 0), _surface.size) { }
+ : this(_surface, _offset, new Point(0, 0), _surface.Size) { }
/// <summary>
Modified: branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
===================================================================
--- branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs 2008-03-18 08:35:09 UTC (rev 236)
+++ branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs 2008-03-18 15:11:13 UTC (rev 237)
@@ -389,8 +389,8 @@
rectAB.Inflate(20, 20);
if (rectAB.X < 0) rectAB.X = 0;
if (rectAB.Y < 0) rectAB.Y = 0;
- if ((rectAB.Width + rectAB.X) > offscreenBuffer.size.Width) rectAB.Width = (rectAB.Width - rectAB.X);
- if ((rectAB.Height + rectAB.Y) > offscreenBuffer.size.Height) rectAB.Height = (rectAB.Height - rectAB.Y);
+ if ((rectAB.Width + rectAB.X) > offscreenBuffer.Size.Width) rectAB.Width = (rectAB.Width - rectAB.X);
+ if ((rectAB.Height + rectAB.Y) > offscreenBuffer.Size.Height) rectAB.Height = (rectAB.Height - rectAB.Y);
//if (rectClient. > offscreenBuffer.clipRect)
//dirtyRect.add(rectClient);
Modified: branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
===================================================================
--- branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs 2008-03-18 08:35:09 UTC (rev 236)
+++ branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs 2008-03-18 15:11:13 UTC (rev 237)
@@ -579,8 +579,8 @@
{
int offset = idx * 32;
// clear the sprite
- images[tdiff].fill(new Rectangle(new Point(offset, 0), new Size(32, images[tdiff].size.Height)), Color.Magenta);
- flippedImages[tdiff].fill(new Rectangle(new Point(offset, 0), new Size(32, flippedImages[tdiff].size.Height)), Color.Magenta);
+ images[tdiff].Fill(new Rectangle(new Point(offset, 0), new Size(32, images[tdiff].Size.Height)), Color.Magenta);
+ flippedImages[tdiff].Fill(new Rectangle(new Point(offset, 0), new Size(32, flippedImages[tdiff].Size.Height)), Color.Magenta);
Point[] pts = new Point[]{ new Point(offset+16, 0),
new Point(offset+32, u *4),
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs 2008-03-18 08:35:09 UTC (rev 236)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs 2008-03-18 15:11:13 UTC (rev 237)
@@ -86,7 +86,7 @@
/// <summary>
///
/// </summary>
- public IntPtr mask, dupSurface;
+ public IntPtr mask;//, dupSurface;
/// <summary>
///
/// </summary>
@@ -102,7 +102,7 @@
/// <summary>
///
/// </summary>
- public Size size
+ public Size Size
{
get { return new Size(this.surface.w, this.surface.h); }
}
@@ -189,7 +189,7 @@
/// </summary>
public void resetClipRect()
{
- Sdl.SDL_Rect r = new Sdl.SDL_Rect(0, 0, (short)size.Width, (short)size.Height);
+ Sdl.SDL_Rect r = new Sdl.SDL_Rect(0, 0, (short)Size.Width, (short)Size.Height);
Sdl.SDL_SetClipRect(this.surfacePtr(), ref r);
}
/// <summary>
@@ -217,7 +217,7 @@
}
set
{
- value.Intersect(new Rectangle(0, 0, size.Width, size.Height));
+ value.Intersect(new Rectangle(0, 0, Size.Width, Size.Height));
srect.x = (short)value.X;
srect.y = (short)value.Y;
srect.w = (short)value.Width;
@@ -235,47 +235,39 @@
//i'm sure something needs to be cleared here
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="c"></param>
- /// <returns></returns>
- public int getSDLColor(Color c) { return Sdl.SDL_MapRGB(this.surfacePtrs[0], c.R, c.G, c.B); }
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="c"></param>
+ ///// <returns></returns>
+ //public int getSDLColor(Color c) { return Sdl.SDL_MapRGB(this.surfacePtrs[0], c.R, c.G, c.B); }
- /// <summary>
- ///
- /// </summary>
- /// <param name="destX"></param>
- /// <param name="destY"></param>
- /// <param name="source"></param>
- /// <param name="srcRect"></param>
- public void bltFast(int destX, int destY, Surface source, Rectangle srcRect)
- {
- //RECT srect = Util.toRECT(srcRect);
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="destX"></param>
+ ///// <param name="destY"></param>
+ ///// <param name="source"></param>
+ ///// <param name="srcRect"></param>
+ //public void bltFast(int destX, int destY, Surface source, Rectangle srcRect)
+ //{
+ // //RECT srect = Util.toRECT(srcRect);
- //Sdl.SDL_Rect src = toRect(srcRect), dst = toRect(destX, destY, srcRect.Width, srcRect.Height);
- //Tao.Sdl.Sdl.SDL_BlitSurface(source.surface, ref src, this.surface, ref dst);
+ // //Sdl.SDL_Rect src = toRect(srcRect), dst = toRect(destX, destY, srcRect.Width, srcRect.Height);
+ // //Tao.Sdl.Sdl.SDL_BlitSurface(source.surface, ref src, this.surface, ref dst);
- drect.x = (short)destX;
- drect.y = (short)destY;
- drect.w = (short)srcRect.Width;
- drect.h = (short)srcRect.Height;
- srect.x = (short)srcRect.X;
- srect.y = (short)srcRect.Y;
- srect.w = (short)srcRect.Width;
- srect.h = (short)srcRect.Height;
+ // drect.x = (short)destX;
+ // drect.y = (short)destY;
+ // drect.w = (short)srcRect.Width;
+ // drect.h = (short)srcRect.Height;
+ // srect.x = (short)srcRect.X;
+ // srect.y = (short)srcRect.Y;
+ // srect.w = (short)srcRect.Width;
+ // srect.h = (short)srcRect.Height;
- blt(drect, source, srect);
- }
+ // blt(drect, source, srect);
+ //}
- //public Sdl.SDL_Rect toRect(Rectangle r) { return new Sdl.SDL_Rect((short)r.Left, (short)r.Top, (short)r.Width, (short)r.Height); }
- //public Sdl.SDL_Rect toRect(int x, int y, int w, int h) { return new Sdl.SDL_Rect((short)x, (short)y, (short)w, (short)h); }
-
- /// <summary>
- /// Copies an image from another surface.
- /// </summary>
- ///
-
private Sdl.SDL_Rect drect, srect;
/// <summary>
@@ -307,48 +299,48 @@
{
drect.x = (short)dstPos.X;
drect.y = (short)dstPos.Y;
- drect.w = (short)source.size.Width;
- drect.h = (short)source.size.Height;
+ drect.w = (short)source.Size.Width;
+ drect.h = (short)source.Size.Height;
srect.x = 0;
srect.y = 0;
- srect.w = (short)source.size.Width;
- srect.h = (short)source.size.Height;
+ srect.w = (short)source.Size.Width;
+ srect.h = (short)source.Size.Height;
blt(drect, source, srect);
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="dstX1"></param>
- /// <param name="dstY1"></param>
- /// <param name="dstX2"></param>
- /// <param name="dstY2"></param>
- /// <param name="source"></param>
- /// <param name="srcX1"></param>
- /// <param name="srcY1"></param>
- /// <param name="srcX2"></param>
- /// <param name="srcY2"></param>
- public void blt(int dstX1, int dstY1, int dstX2, int dstY2, Surface source,
- int srcX1, int srcY1, int srcX2, int srcY2)
- {
- drect.x = (short)dstX1;
- drect.y = (short)dstY1;
- drect.w = (short)(dstX2 - dstX1);
- drect.h = (short)(dstY2 - dstY1);
- srect.x = (short)srcX1;
- srect.y = (short)srcY1;
- srect.w = (short)(srcX2 - srcX1);
- srect.h = (short)(srcY2 - srcY1);
- blt(drect, source, srect);
- }
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="dstX1"></param>
+ ///// <param name="dstY1"></param>
+ ///// <param name="dstX2"></param>
+ ///// <param name="dstY2"></param>
+ ///// <param name="source"></param>
+ ///// <param name="srcX1"></param>
+ ///// <param name="srcY1"></param>
+ ///// <param name="srcX2"></param>
+ ///// <param name="srcY2"></param>
+ //public void blt(int dstX1, int dstY1, int dstX2, int dstY2, Surface source,
+ // int srcX1, int srcY1, int srcX2, int srcY2)
+ //{
+ // drect.x = (short)dstX1;
+ // drect.y = (short)dstY1;
+ // drect.w = (short)(dstX2 - dstX1);
+ // drect.h = (short)(dstY2 - dstY1);
+ // srect.x = (short)srcX1;
+ // srect.y = (short)srcY1;
+ // srect.w = (short)(srcX2 - srcX1);
+ // srect.h = (short)(srcY2 - srcY1);
+ // blt(drect, source, srect);
+ //}
- /// <summary>
- ///
- /// </summary>
- /// <param name="dst"></param>
- /// <param name="source"></param>
- /// <param name="src"></param>
- public void blt(Point dst, Surface source, Rectangle src) { blt(new Rectangle(dst.X, dst.Y, src.Width, src.Height), source, src); }
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="dst"></param>
+ ///// <param name="source"></param>
+ ///// <param name="src"></param>
+ //public void blt(Point dst, Surface source, Rectangle src) { blt(new Rectangle(dst.X, dst.Y, src.Width, src.Height), source, src); }
private void blt(Rectangle dst, Surface source, Rectangle src)
{
drect.x = (short)dst.X;
@@ -428,7 +420,7 @@
/// </summary>
/// <param name="dstPos"></param>
/// <param name="source"></param>
- public void bltAlpha(Point dstPos, Surface source) { bltAlpha(dstPos, source, new Point(0, 0), source.size); }
+ public void bltAlpha(Point dstPos, Surface source) { bltAlpha(dstPos, source, new Point(0, 0), source.Size); }
/// <summary>
///
/// </summary>
@@ -616,16 +608,16 @@
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="dstPos"></param>
- /// <param name="source"></param>
- /// <param name="fill"></param>
- public void bltShape(Point dstPos, Surface source, Color fill)
- {
- bltShape(dstPos, source, new Point(0, 0), source.size, fill);
- }
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="dstPos"></param>
+ ///// <param name="source"></param>
+ ///// <param name="fill"></param>
+ //public void bltShape(Point dstPos, Surface source, Color fill)
+ //{
+ // bltShape(dstPos, source, new Point(0, 0), source.Size, fill);
+ //}
/// <summary>
///
@@ -772,97 +764,97 @@
SdlGfx.pixelRGBA(this.surfacePtrs[0], (short)x, (short)y, col.R, col.G, col.B, 255);
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="buf"></param>
- public void SetPixels(Int32[] buf)
- {
- Sdl.SDL_LockSurface(this.surfacePtrs[0]);
- Marshal.Copy(buf, 0, new IntPtr(this.surface.pixels.ToInt32()), buf.Length);
- Sdl.SDL_UnlockSurface(this.surfacePtrs[0]);
- /*
- try
- {
- int bytesPerPixel = this.pixelFormat.BytesPerPixel;
- //int pixels = this.surface.pixels.ToInt32() + point.X * bytesPerPixel;
- int pitch = this.surface.pitch;
- if (bytesPerPixel == 4)
- {
- //the buffer for a row of pixels.
- //Int32[] buffer = new Int32[colors.GetLength(0)];
- DateTime d = DateTime.Now;
- /*for (short x = 0; x < colors.GetLength(0); x++)
- {
- //gets only the pixels in the row that are required.
- for (short y = 0; y < colors.GetLength(1); y++)
- {
- //converts the pixel to a color value.
- //buffer[x] = Sdl.SDL_MapRGB(this.surface.format, colors[x, y].R, colors[x, y].G, colors[x, y].B);
- SdlGfx.pixelRGBA(this.surfacePtrs[0], x, y, colors[x, y].R, colors[x, y].G, colors[x, y].B, 255);
- }
- //then copies them to the image.
- //Marshal.Copy(buffer, 0, new IntPtr(pixels + (y + point.Y) * pitch), buffer.Length);
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="buf"></param>
+ //public void SetPixels(Int32[] buf)
+ //{
+ // Sdl.SDL_LockSurface(this.surfacePtrs[0]);
+ // Marshal.Copy(buf, 0, new IntPtr(this.surface.pixels.ToInt32()), buf.Length);
+ // Sdl.SDL_UnlockSurface(this.surfacePtrs[0]);
+ // /*
+ // try
+ // {
+ // int bytesPerPixel = this.pixelFormat.BytesPerPixel;
+ // //int pixels = this.surface.pixels.ToInt32() + point.X * bytesPerPixel;
+ // int pitch = this.surface.pitch;
+ // if (bytesPerPixel == 4)
+ // {
+ // //the buffer for a row of pixels.
+ // //Int32[] buffer = new Int32[colors.GetLength(0)];
+ // DateTime d = DateTime.Now;
+ // /*for (short x = 0; x < colors.GetLength(0); x++)
+ // {
+ // //gets only the pixels in the row that are required.
+ // for (short y = 0; y < colors.GetLength(1); y++)
+ // {
+ // //converts the pixel to a color value.
+ // //buffer[x] = Sdl.SDL_MapRGB(this.surface.format, colors[x, y].R, colors[x, y].G, colors[x, y].B);
+ // SdlGfx.pixelRGBA(this.surfacePtrs[0], x, y, colors[x, y].R, colors[x, y].G, colors[x, y].B, 255);
+ // }
+ // //then copies them to the image.
+ // //Marshal.Copy(buffer, 0, new IntPtr(pixels + (y + point.Y) * pitch), buffer.Length);
- }
+ // }
- Marshal.Copy(buf, 0, new IntPtr(pixels), buf.Length);
- Console.WriteLine((DateTime.Now - d).TotalMilliseconds + "ms");
- }
- else if (bytesPerPixel == 3)
- {
- //the buffer for a row of pixels.
- Int32[] buffer = new Int32[colors.GetLength(0)];
- for (int y = 0; y < colors.GetLength(1); ++y)
- {
- //gets only the pixels in the row that are required.
- for (int x = 0; x < buffer.Length; ++x)
- {
- //converts the pixel to a color value.
- buffer[x] = Sdl.SDL_MapRGB(this.surface.format, colors[x, y].R, colors[x, y].G, colors[x, y].B);
- }
- //then copies them to the image.
- MarshalHelper.CopyInt24(buffer, 0, new IntPtr(pixels + (y + point.Y) * pitch), buffer.Length);
- }
- }
- else if (bytesPerPixel == 2)
- {
- //the buffer for a row of pixels.
- Int16[] buffer = new Int16[colors.GetLength(0)];
- for (int y = 0; y < colors.GetLength(1); ++y)
- {
- //gets only the pixels in the row that are required.
- for (int x = 0; x < buffer.Length; ++x)
- {
- //converts the pixel to a color value.
- buffer[x] = (short)Sdl.SDL_MapRGB(this.surface.format, colors[x, y].R, colors[x, y].G, colors[x, y].B);
- }
- //then copies them to the image.
- Marshal.Copy(buffer, 0, new IntPtr(pixels + (y + point.Y) * pitch), buffer.Length);
- }
- }
- else if (bytesPerPixel == 1)
- {
- //the buffer for a row of pixels.
- Byte[] buffer = new Byte[colors.GetLength(0)];
- for (int y = 0; y < colors.GetLength(1); ++y)
- {
- //gets only the pixels in the row that are required.
- for (int x = 0; x < buffer.Length; ++x)
- {
- //converts the pixel to a color value.
- buffer[x] = (byte)Sdl.SDL_MapRGB(this.surface.format, colors[x, y].R, colors[x, y].G, colors[x, y].B);
- }
- //then copies them to the image.
- Marshal.Copy(buffer, 0, new IntPtr(pixels + (y + point.Y) * pitch), buffer.Length);
- }
- }
- }
- finally
- {
- Sdl.SDL_UnlockSurface(this.surfacePtrs[0]);
- }*/
- }
+ // Marshal.Copy(buf, 0, new IntPtr(pixels), buf.Length);
+ // Console.WriteLine((DateTime.Now - d).TotalMilliseconds + "ms");
+ // }
+ // else if (bytesPerPixel == 3)
+ // {
+ // //the buffer for a row of pixels.
+ // Int32[] buffer = new Int32[colors.GetLength(0)];
+ // for (int y = 0; y < colors.GetLength(1); ++y)
+ // {
+ // //gets only the pixels in the row that are required.
+ // for (int x = 0; x < buffer.Length; ++x)
+ // {
+ // //converts the pixel to a color value.
+ // buffer[x] = Sdl.SDL_MapRGB(this.surface.format, colors[x, y].R, colors[x, y].G, colors[x, y].B);
+ // }
+ // //then copies them to the image.
+ // MarshalHelper.CopyInt24(buffer, 0, new IntPtr(pixels + (y + point.Y) * pitch), buffer.Length);
+ // }
+ // }
+ // else if (bytesPerPixel == 2)
+ // {
+ // //the buffer for a row of pixels.
+ // Int16[] buffer = new Int16[colors.GetLength(0)];
+ // for (int y = 0; y < colors.GetLength(1); ++y)
+ // {
+ // //gets only the pixels in the row that are required.
+ // for (int x = 0; x < buffer.Length; ++x)
+ // {
+ // //converts the pixel to a color value.
+ // buffer[x] = (short)Sdl.SDL_MapRGB(this.surface.format, colors[x, y].R, colors[x, y].G, colors[x, y].B);
+ // }
+ // //then copies them to the image.
+ // Marshal.Copy(buffer, 0, new IntPtr(pixels + (y + point.Y) * pitch), buffer.Length);
+ // }
+ // }
+ // else if (bytesPerPixel == 1)
+ // {
+ // //the buffer for a row of pixels.
+ // Byte[] buffer = new Byte[colors.GetLength(0)];
+ // for (int y = 0; y < colors.GetLength(1); ++y)
+ // {
+ // //gets only the pixels in the row that are required.
+ // for (int x = 0; x < buffer.Length; ++x)
+ // {
+ // //converts the pixel to a color value.
+ // buffer[x] = (byte)Sdl.SDL_MapRGB(this.surface.format, colors[x, y].R, colors[x, y].G, colors[x, y].B);
+ // }
+ // //then copies them to the image.
+ // Marshal.Copy(buffer, 0, new IntPtr(pixels + (y + point.Y) * pitch), buffer.Length);
+ // }
+ // }
+ // }
+ // finally
+ // {
+ // Sdl.SDL_UnlockSurface(this.surfacePtrs[0]);
+ // }*/
+ //}
/// <summary>
///
@@ -1013,9 +1005,9 @@
/// <summary>
/// Fills the surface.
/// </summary>
- public void fill(Color c)
+ public void Fill(Color c)
{
- fill(clipRect, c);
+ Fill(clipRect, c);
}
@@ -1024,7 +1016,7 @@
/// </summary>
/// <param name="rect"></param>
/// <param name="c"></param>
- public void fill(Rectangle rect, Color c)
+ public void Fill(Rectangle rect, Color c)
{
//rect.Intersect(clip);
//surface.Fill(rect, c);
@@ -1071,7 +1063,7 @@
/// <returns></returns>
public bool HitTest(int x, int y)
{
- if (x < 0 || x > size.Width || y < 0 || y > size.Height)
+ if (x < 0 || x > Size.Width || y < 0 || y > Size.Height)
return false;
return ((getColorAt(x, y) & 0xffffff) == colorKey);
}
@@ -1086,16 +1078,16 @@
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="x"></param>
- /// <param name="y"></param>
- /// <returns></returns>
- public Color getColor(int x, int y)
- {
- return this.GetPixel(x, y);
- }
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="x"></param>
+ ///// <param name="y"></param>
+ ///// <returns></returns>
+ //public Color getColor(int x, int y)
+ //{
+ // return this.GetPixel(x, y);
+ //}
/// <summary>
///
@@ -1104,23 +1096,23 @@
/// <param name="x"></param>
/// <param name="y"></param>
/// <returns></returns>
- public Color getColor(IntPtr surf, int x, int y)
- {
- return this.GetPixel(surf, x, y);
- }
+ //public Color getColor(IntPtr surf, int x, int y)
+ //{
+ // return this.GetPixel(surf, x, y);
+ //}
/// <summary>
///
/// </summary>
/// <param name="colorValue"></param>
/// <returns></returns>
- [CLSCompliant(false)]
- public System.Drawing.Color GetColor(int colorValue)
- {
- byte r, g, b, a;
- Sdl.SDL_GetRGBA(colorValue, this.surface.format, out r, out g, out b, out a);
- return System.Drawing.Color.FromArgb(a, r, g, b);
- }
+ //[CLSCompliant(false)]
+ //public System.Drawing.Color GetColor(int colorValue)
+ //{
+ // byte r, g, b, a;
+ // Sdl.SDL_GetRGBA(colorValue, this.surface.format, out r, out g, out b, out a);
+ // return System.Drawing.Color.FromArgb(a, r, g, b);
+ //}
/// <summary>
///
@@ -1156,29 +1148,29 @@
SdlGfx.rectangleRGBA(this.surfacePtr(), (short)r.X, (short)r.Y, (short)(r.X + r.Width), (short)(r.Y + r.Height), c.R, c.G, c.B, 255);
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="p1"></param>
- /// <param name="p2"></param>
- /// <param name="p3"></param>
- /// <param name="p4"></param>
- public void drawPolygon(Point p1, Point p2, Point p3, Point p4) { drawBox(new Rectangle(p1, new Size(p2.X - p1.X, p4.Y - p1.Y))); }
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="p1"></param>
+ ///// <param name="p2"></param>
+ ///// <param name="p3"></param>
+ ///// <param name="p4"></param>
+ //public void drawPolygon(Point p1, Point p2, Point p3, Point p4) { drawBox(new Rectangle(p1, new Size(p2.X - p1.X, p4.Y - p1.Y))); }
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="col"></param>
+ ///// <param name="pts"></param>
+ //public void drawPolygon(Color col, Point[] pts)
+ //{
+ // //surface.Draw(new SdlDotNet.Graphics.Primitives.Polygon(new ArrayList(pts)), col);
+ //}
/// <summary>
///
/// </summary>
/// <param name="col"></param>
/// <param name="pts"></param>
- public void drawPolygon(Color col, Point[] pts)
- {
- //surface.Draw(new SdlDotNet.Graphics.Primitives.Polygon(new ArrayList(pts)), col);
- }
- /// <summary>
- ///
- /// </summary>
- /// <param name="col"></param>
- /// <param name="pts"></param>
public void fillPolygon(Color col, Point[] pts)
{
//Surface tx = new Surface(Video.CreateRgbSurface(20,20));
@@ -1205,13 +1197,13 @@
// surface.Draw(new SdlDotNet.Graphics.Primitives.Line((Point)pts[curPoint], (Point)pts[curPoint + 1]), col,false,false);
}
- /// <summary>
- /// Tries to recover a lost surface.
- /// </summary>
- public void restore()
- {
- //handle.restore();
- }
+ ///// <summary>
+ ///// Tries to recover a lost surface.
+ ///// </summary>
+ //public void restore()
+ //{
+ // //handle.restore();
+ //}
/// <summary>
/// Makes the bitmap of this surface.
@@ -1222,7 +1214,7 @@
{
get
{
- byte[] arr = new byte[(this.size.Width * this.size.Height * this.bpp) + this.BmpHeader];
+ byte[] arr = new byte[(this.Size.Width * this.Size.Height * this.bpp) + this.BmpHeader];
IntPtr i = Marshal.AllocHGlobal(arr.Length);
try
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-18 16:48:31
|
Revision: 238
http://freetrain.svn.sourceforge.net/freetrain/?rev=238&view=rev
Author: jendave
Date: 2008-03-18 09:48:34 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
fixed a typo
Modified Paths:
--------------
branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs
Modified: branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
===================================================================
--- branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs 2008-03-18 15:11:13 UTC (rev 237)
+++ branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs 2008-03-18 16:48:34 UTC (rev 238)
@@ -526,7 +526,7 @@
/// <summary> Load sprites for cliffs. </summary>
private static void initCliffSprites()
{
- Picture picture = ResourceUtil.loadSystemPicture("Cliff.bmp");
+ Picture picture = ResourceUtil.loadSystemPicture("cliff.bmp");
for (int side = 0; side < 2; side++)
{
for (int l = 0; l <= 4; l++)
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs 2008-03-18 15:11:13 UTC (rev 237)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs 2008-03-18 16:48:34 UTC (rev 238)
@@ -1089,23 +1089,23 @@
// return this.GetPixel(x, y);
//}
- /// <summary>
- ///
- /// </summary>
- /// <param name="surf"></param>
- /// <param name="x"></param>
- /// <param name="y"></param>
- /// <returns></returns>
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="surf"></param>
+ ///// <param name="x"></param>
+ ///// <param name="y"></param>
+ ///// <returns></returns>
//public Color getColor(IntPtr surf, int x, int y)
//{
// return this.GetPixel(surf, x, y);
//}
- /// <summary>
- ///
- /// </summary>
- /// <param name="colorValue"></param>
- /// <returns></returns>
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="colorValue"></param>
+ ///// <returns></returns>
//[CLSCompliant(false)]
//public System.Drawing.Color GetColor(int colorValue)
//{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-18 17:52:16
|
Revision: 239
http://freetrain.svn.sourceforge.net/freetrain/?rev=239&view=rev
Author: jendave
Date: 2008-03-18 10:52:14 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
More namespace fixes
Modified Paths:
--------------
branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
branches/FreeTrainSDL/core/controllers/land/LandController.cs
branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs
branches/FreeTrainSDL/core/framework/AboutDialog.cs
branches/FreeTrainSDL/core/framework/ErrorMessageBox.cs
branches/FreeTrainSDL/core/framework/MainWindow.cs
branches/FreeTrainSDL/core/views/map/HeightCutWindow.cs
branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs
branches/FreeTrainSDL/core/world/accounting/GenreSelectorDialog.cs
branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs
branches/FreeTrainSDL/lib/Controls/ColorPicker.cs
branches/FreeTrainSDL/lib/Controls/CostBox.cs
branches/FreeTrainSDL/lib/Controls/FileDropHandler.cs
branches/FreeTrainSDL/lib/Controls/IndexSelector.cs
branches/FreeTrainSDL/lib/Controls/MruMenu.cs
branches/FreeTrainSDL/lib/Controls/SubListSelector.cs
branches/FreeTrainSDL/lib/Controls/TrackBarEx.cs
branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HueShiftSprite.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigCommand.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorTestTrainCar.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml
Modified: branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -27,7 +27,7 @@
using FreeTrain.world;
using FreeTrain.world.road;
-namespace FreeTrain.Contributions.road
+namespace FreeTrain.Contributions.Road
{
/// <summary>
/// Road for cars/buses
Modified: branches/FreeTrainSDL/core/controllers/land/LandController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandController.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/controllers/land/LandController.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -98,14 +98,14 @@
#region Designer generated code
private System.Windows.Forms.PictureBox preview;
private System.ComponentModel.IContainer components = null;
- private FreeTrain.controls.IndexSelector indexSelector;
+ private FreeTrain.Controls.IndexSelector indexSelector;
private System.Windows.Forms.ComboBox groupBox;
private void InitializeComponent()
{
this.groupBox = new System.Windows.Forms.ComboBox();
this.preview = new System.Windows.Forms.PictureBox();
- this.indexSelector = new FreeTrain.controls.IndexSelector();
+ this.indexSelector = new FreeTrain.Controls.IndexSelector();
this.SuspendLayout();
//
// groupBox
Modified: branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -105,14 +105,14 @@
#region Designer generated code
private System.Windows.Forms.PictureBox preview;
private System.ComponentModel.IContainer components = null;
- private FreeTrain.controls.CostBox costBox;
+ private FreeTrain.Controls.CostBox costBox;
private System.Windows.Forms.RadioButton buttonRemove;
private System.Windows.Forms.RadioButton buttonPlace;
private void InitializeComponent()
{
this.preview = new System.Windows.Forms.PictureBox();
- this.costBox = new FreeTrain.controls.CostBox();
+ this.costBox = new FreeTrain.Controls.CostBox();
this.buttonRemove = new System.Windows.Forms.RadioButton();
this.buttonPlace = new System.Windows.Forms.RadioButton();
this.SuspendLayout();
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -34,7 +34,7 @@
using FreeTrain.Views;
using FreeTrain.Views.Map;
using SDL.net;
-using FreeTrain.controls;
+using FreeTrain.Controls;
namespace FreeTrain.Controllers.Rail
@@ -56,13 +56,13 @@
theInstance.Activate();
}
- private FreeTrain.controls.IndexSelector indexSelector;
+ private FreeTrain.Controls.IndexSelector indexSelector;
private System.Windows.Forms.ListView listView1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
- private FreeTrain.controls.IndexSelector indexSelector1;
+ private FreeTrain.Controls.IndexSelector indexSelector1;
private System.Windows.Forms.Label label4;
- private FreeTrain.controls.IndexSelector indexSelector2;
+ private FreeTrain.Controls.IndexSelector indexSelector2;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.ColumnHeader columnHeader2;
@@ -219,12 +219,12 @@
this.columnHeader4 = new System.Windows.Forms.ColumnHeader();
this.columnHeader5 = new System.Windows.Forms.ColumnHeader();
this.columnHeader6 = new System.Windows.Forms.ColumnHeader();
- this.indexSelector = new FreeTrain.controls.IndexSelector();
+ this.indexSelector = new FreeTrain.Controls.IndexSelector();
this.stationType = new System.Windows.Forms.ComboBox();
this.stationPicture = new System.Windows.Forms.PictureBox();
- this.indexSelector1 = new FreeTrain.controls.IndexSelector();
+ this.indexSelector1 = new FreeTrain.Controls.IndexSelector();
this.label4 = new System.Windows.Forms.Label();
- this.indexSelector2 = new FreeTrain.controls.IndexSelector();
+ this.indexSelector2 = new FreeTrain.Controls.IndexSelector();
this.label5 = new System.Windows.Forms.Label();
this.platformPage = new System.Windows.Forms.TabPage();
this.checkSlim = new System.Windows.Forms.CheckBox();
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -125,7 +125,7 @@
#region Windows Form Designer generated code
private System.Windows.Forms.RadioButton buttonPlace;
private System.Windows.Forms.RadioButton buttonRemove;
- private FreeTrain.controls.CostBox costBox;
+ private FreeTrain.Controls.CostBox costBox;
private System.Windows.Forms.Label message;
private System.ComponentModel.Container components = null;
@@ -134,7 +134,7 @@
this.message = new System.Windows.Forms.Label();
this.buttonPlace = new System.Windows.Forms.RadioButton();
this.buttonRemove = new System.Windows.Forms.RadioButton();
- this.costBox = new FreeTrain.controls.CostBox();
+ this.costBox = new FreeTrain.Controls.CostBox();
this.SuspendLayout();
//
// message
Modified: branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -51,7 +51,7 @@
theInstance.Activate();
}
- private FreeTrain.controls.CostBox costBox;
+ private FreeTrain.Controls.CostBox costBox;
private static SlopeRailRoadController theInstance;
/// <summary>
@@ -170,7 +170,7 @@
this.pictureW = new System.Windows.Forms.PictureBox();
this.buttonPlace = new System.Windows.Forms.RadioButton();
this.buttonRemove = new System.Windows.Forms.RadioButton();
- this.costBox = new FreeTrain.controls.CostBox();
+ this.costBox = new FreeTrain.Controls.CostBox();
((System.ComponentModel.ISupportInitialize)(this.pictureN)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureE)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureS)).BeginInit();
Modified: branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -55,7 +55,7 @@
/// </summary>
protected System.Windows.Forms.RadioButton buttonPlace;
private System.ComponentModel.IContainer components = null;
- private FreeTrain.controls.IndexSelector indexSelector;
+ private FreeTrain.Controls.IndexSelector indexSelector;
private Bitmap previewBitmap;
/// <summary>
@@ -111,7 +111,7 @@
this.preview = new System.Windows.Forms.PictureBox();
this.buttonRemove = new System.Windows.Forms.RadioButton();
this.buttonPlace = new System.Windows.Forms.RadioButton();
- this.indexSelector = new FreeTrain.controls.IndexSelector();
+ this.indexSelector = new FreeTrain.Controls.IndexSelector();
((System.ComponentModel.ISupportInitialize)(this.preview)).BeginInit();
this.SuspendLayout();
//
Modified: branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -50,7 +50,7 @@
private Label label1;
private GroupBox groupBox1;
- private FreeTrain.controls.IndexSelector selSize;
+ private FreeTrain.Controls.IndexSelector selSize;
private static MountainController theInstance;
/// <summary>
@@ -101,7 +101,7 @@
this.preview = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.selSize = new FreeTrain.controls.IndexSelector();
+ this.selSize = new FreeTrain.Controls.IndexSelector();
((System.ComponentModel.ISupportInitialize)(this.preview)).BeginInit();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
Modified: branches/FreeTrainSDL/core/framework/AboutDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/AboutDialog.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/framework/AboutDialog.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -24,7 +24,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.controls;
+using FreeTrain.Controls;
using SDL.net;
using FreeTrain.Util;
Modified: branches/FreeTrainSDL/core/framework/ErrorMessageBox.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/ErrorMessageBox.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/framework/ErrorMessageBox.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -23,7 +23,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.controls;
+using FreeTrain.Controls;
namespace FreeTrain.Framework
{
@@ -97,7 +97,7 @@
this.detail = new System.Windows.Forms.TextBox();
this.okButton = new System.Windows.Forms.Button();
this.msg = new System.Windows.Forms.Label();
- this.linkLabel1 = new FreeTrain.controls.UrlLinkLabel();
+ this.linkLabel1 = new FreeTrain.Controls.UrlLinkLabel();
this.SuspendLayout();
//
// icon
Modified: branches/FreeTrainSDL/core/framework/MainWindow.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -35,7 +35,7 @@
using FreeTrain.Contributions.road;
using FreeTrain.Contributions.Structs;
using FreeTrain.Contributions.Others;
-using FreeTrain.controls;
+using FreeTrain.Controls;
using FreeTrain.Controllers;
using FreeTrain.Controllers.Land;
using FreeTrain.Controllers.Rail;
Modified: branches/FreeTrainSDL/core/views/map/HeightCutWindow.cs
===================================================================
--- branches/FreeTrainSDL/core/views/map/HeightCutWindow.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/views/map/HeightCutWindow.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -66,12 +66,12 @@
drawer.heightCutHeight = trackBar.Value;
}
#region Windows Form Designer generated code
- private FreeTrain.controls.TrackBarEx trackBar;
+ private FreeTrain.Controls.TrackBarEx trackBar;
private System.ComponentModel.Container components = null;
private void InitializeComponent()
{
- this.trackBar = new FreeTrain.controls.TrackBarEx();
+ this.trackBar = new FreeTrain.Controls.TrackBarEx();
((System.ComponentModel.ISupportInitialize)(this.trackBar)).BeginInit();
this.SuspendLayout();
//
Modified: branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs
===================================================================
--- branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -25,7 +25,7 @@
using System.Windows.Forms;
//using AxSHDocVw;
//using MsHtmlHost;
-using FreeTrain.controls;
+using FreeTrain.Controls;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
Modified: branches/FreeTrainSDL/core/world/accounting/GenreSelectorDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/world/accounting/GenreSelectorDialog.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/core/world/accounting/GenreSelectorDialog.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -73,14 +73,14 @@
private System.Windows.Forms.Button okButton;
private System.Windows.Forms.Button cancelButton;
- private FreeTrain.controls.SubListSelector selector;
+ private FreeTrain.Controls.SubListSelector selector;
private System.ComponentModel.Container components = null;
private void InitializeComponent()
{
this.okButton = new System.Windows.Forms.Button();
this.cancelButton = new System.Windows.Forms.Button();
- this.selector = new FreeTrain.controls.SubListSelector();
+ this.selector = new FreeTrain.Controls.SubListSelector();
this.SuspendLayout();
//
// okButton
Modified: branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -25,7 +25,7 @@
using System.Drawing;
using System.IO;
-namespace FreeTrain.controls
+namespace FreeTrain.Controls
{
/// <summary>
/// the button pick color by opening ColorPicker
Modified: branches/FreeTrainSDL/lib/Controls/ColorPicker.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/ColorPicker.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/lib/Controls/ColorPicker.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -25,7 +25,7 @@
using System.Data;
using System.Windows.Forms;
-namespace FreeTrain.controls
+namespace FreeTrain.Controls
{
/// <summary>
///
Modified: branches/FreeTrainSDL/lib/Controls/CostBox.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/CostBox.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/lib/Controls/CostBox.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -25,7 +25,7 @@
using System.Data;
using System.Windows.Forms;
-namespace FreeTrain.controls
+namespace FreeTrain.Controls
{
/// <summary>
/// Displays a price.
Modified: branches/FreeTrainSDL/lib/Controls/FileDropHandler.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/FileDropHandler.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/lib/Controls/FileDropHandler.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -21,7 +21,7 @@
using System;
using System.Windows.Forms;
-namespace FreeTrain.controls
+namespace FreeTrain.Controls
{
/// <summary> Delegate that received dropped files. </summary>
public delegate void FileDropEventHandler(string fileName);
Modified: branches/FreeTrainSDL/lib/Controls/IndexSelector.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/IndexSelector.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/lib/Controls/IndexSelector.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -25,7 +25,7 @@
using System.Data;
using System.Windows.Forms;
-namespace FreeTrain.controls
+namespace FreeTrain.Controls
{
/// <summary>
/// Allow the user to select an index
Modified: branches/FreeTrainSDL/lib/Controls/MruMenu.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/MruMenu.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/lib/Controls/MruMenu.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -28,7 +28,7 @@
using System.Xml;
//using Microsoft.Win32;
-namespace FreeTrain.controls
+namespace FreeTrain.Controls
{
/// <summary>
///
Modified: branches/FreeTrainSDL/lib/Controls/SubListSelector.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/SubListSelector.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/lib/Controls/SubListSelector.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -25,7 +25,7 @@
using System.Data;
using System.Windows.Forms;
-namespace FreeTrain.controls
+namespace FreeTrain.Controls
{
/// <summary>
/// Select an ordered sub list from another list.
Modified: branches/FreeTrainSDL/lib/Controls/TrackBarEx.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/TrackBarEx.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/lib/Controls/TrackBarEx.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -21,7 +21,7 @@
using System;
using System.Windows.Forms;
-namespace FreeTrain.controls
+namespace FreeTrain.Controls
{
/// <summary>
/// TrackBar class with a bug fix to the mouse wheel support.
Modified: branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -25,7 +25,7 @@
using System.IO;
//using Microsoft.Win32;
-namespace FreeTrain.controls
+namespace FreeTrain.Controls
{
/// <summary>
/// LinkLabel control that launchs a browser and
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -45,11 +45,11 @@
[CLSCompliant(false)]
public class ControllerForm : ControllerHostForm
{
- private FreeTrain.controls.CostBox costBox;
+ private FreeTrain.Controls.CostBox costBox;
private System.Windows.Forms.RadioButton buttonRemove;
private System.Windows.Forms.RadioButton buttonPlace;
private System.Windows.Forms.ComboBox typeBox;
- private FreeTrain.controls.IndexSelector colSelector;
+ private FreeTrain.Controls.IndexSelector colSelector;
private Bitmap previewBitmap;
/// <summary>
@@ -86,7 +86,7 @@
#region Designer generated code
private System.Windows.Forms.PictureBox preview;
private System.ComponentModel.IContainer components = null;
- private FreeTrain.controls.IndexSelector indexSelector;
+ private FreeTrain.Controls.IndexSelector indexSelector;
private void InitializeComponent()
{
@@ -95,9 +95,9 @@
//this.costBox = new freetrain.controls.CostBox();
this.buttonRemove = new System.Windows.Forms.RadioButton();
this.buttonPlace = new System.Windows.Forms.RadioButton();
- this.colSelector = new FreeTrain.controls.IndexSelector();
- this.costBox = new FreeTrain.controls.CostBox();
- this.indexSelector = new FreeTrain.controls.IndexSelector();
+ this.colSelector = new FreeTrain.Controls.IndexSelector();
+ this.costBox = new FreeTrain.Controls.CostBox();
+ this.indexSelector = new FreeTrain.Controls.IndexSelector();
this.SuspendLayout();
//
// typeBox
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -45,7 +45,7 @@
[CLSCompliant(false)]
public class ControllerForm : ControllerHostForm
{
- private FreeTrain.controls.CostBox costBox;
+ private FreeTrain.Controls.CostBox costBox;
private System.Windows.Forms.RadioButton buttonRemove;
private System.Windows.Forms.RadioButton buttonPlace;
private System.Windows.Forms.ComboBox typeBox;
@@ -86,16 +86,16 @@
#region Designer generated code
private System.Windows.Forms.PictureBox preview;
private System.ComponentModel.IContainer components = null;
- private FreeTrain.controls.IndexSelector indexSelector;
+ private FreeTrain.Controls.IndexSelector indexSelector;
private void InitializeComponent()
{
this.typeBox = new System.Windows.Forms.ComboBox();
this.preview = new System.Windows.Forms.PictureBox();
- this.costBox = new FreeTrain.controls.CostBox();
+ this.costBox = new FreeTrain.Controls.CostBox();
this.buttonRemove = new System.Windows.Forms.RadioButton();
this.buttonPlace = new System.Windows.Forms.RadioButton();
- this.indexSelector = new FreeTrain.controls.IndexSelector();
+ this.indexSelector = new FreeTrain.Controls.IndexSelector();
this.SuspendLayout();
//
// typeBox
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -24,7 +24,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.controls;
+using FreeTrain.Controls;
using FreeTrain.Controllers;
using FreeTrain.Contributions;
using FreeTrain.Contributions.Common;
@@ -51,20 +51,20 @@
private System.Windows.Forms.Label nameLabel;
private System.Windows.Forms.PictureBox previewBox;
- private FreeTrain.controls.IndexSelector selectorDir;
- private FreeTrain.controls.IndexSelector selectorColor;
+ private FreeTrain.Controls.IndexSelector selectorDir;
+ private FreeTrain.Controls.IndexSelector selectorColor;
private System.Windows.Forms.NumericUpDown numHeight;
private System.Windows.Forms.Button btnDetail;
private System.Windows.Forms.ComboBox typeBox;
- private FreeTrain.controls.CostBox costBox;
+ private FreeTrain.Controls.CostBox costBox;
private System.ComponentModel.Container components = null;
private System.Windows.Forms.Label labelDir;
private System.Windows.Forms.Label labelHeight;
private System.Windows.Forms.Label labelInfo;
- private FreeTrain.controls.IndexSelector selectorDesign;
+ private FreeTrain.Controls.IndexSelector selectorDesign;
private System.Windows.Forms.CheckBox cbRandColor;
private System.Windows.Forms.CheckBox cbRandDesign;
- private FreeTrain.controls.IndexSelector selectorCol2;
+ private FreeTrain.Controls.IndexSelector selectorCol2;
private System.Windows.Forms.CheckBox cbRandCol2;
private System.Windows.Forms.ListBox typeList;
private System.Windows.Forms.GroupBox groupColor;
@@ -407,22 +407,22 @@
{
this.nameLabel = new System.Windows.Forms.Label();
this.previewBox = new System.Windows.Forms.PictureBox();
- this.selectorDesign = new FreeTrain.controls.IndexSelector();
- this.selectorDir = new FreeTrain.controls.IndexSelector();
+ this.selectorDesign = new FreeTrain.Controls.IndexSelector();
+ this.selectorDir = new FreeTrain.Controls.IndexSelector();
this.labelDir = new System.Windows.Forms.Label();
- this.selectorColor = new FreeTrain.controls.IndexSelector();
+ this.selectorColor = new FreeTrain.Controls.IndexSelector();
this.typeBox = new System.Windows.Forms.ComboBox();
this.numHeight = new System.Windows.Forms.NumericUpDown();
this.labelHeight = new System.Windows.Forms.Label();
this.btnDetail = new System.Windows.Forms.Button();
this.labelInfo = new System.Windows.Forms.Label();
- this.costBox = new FreeTrain.controls.CostBox();
+ this.costBox = new FreeTrain.Controls.CostBox();
this.groupColor = new System.Windows.Forms.GroupBox();
this.cbRandColor = new System.Windows.Forms.CheckBox();
this.groupDesign = new System.Windows.Forms.GroupBox();
this.cbRandDesign = new System.Windows.Forms.CheckBox();
this.groupCol2 = new System.Windows.Forms.GroupBox();
- this.selectorCol2 = new FreeTrain.controls.IndexSelector();
+ this.selectorCol2 = new FreeTrain.Controls.IndexSelector();
this.cbRandCol2 = new System.Windows.Forms.CheckBox();
this.typeList = new System.Windows.Forms.ListBox();
((System.ComponentModel.ISupportInitialize)(this.previewBox)).BeginInit();
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -37,7 +37,7 @@
//using SDL.net;
using SDL.net;
-namespace FreeTrain.world.Structs.hv
+namespace FreeTrain.world.Structs.HalfVoxelStructure
{
/// <summary>
/// Controller that allows the user to
@@ -50,18 +50,18 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.RadioButton btnRemove;
private System.Windows.Forms.RadioButton btnPlace;
- private FreeTrain.controls.CostBox price;
+ private FreeTrain.Controls.CostBox price;
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.GroupBox group;
private System.Windows.Forms.Label namelabel;
- private FreeTrain.controls.IndexSelector idxDesign;
- private FreeTrain.controls.IndexSelector idxColor;
+ private FreeTrain.Controls.IndexSelector idxDesign;
+ private FreeTrain.Controls.IndexSelector idxColor;
private System.Windows.Forms.ComboBox typeBox;
private System.Windows.Forms.CheckBox cbRndColor;
private System.Windows.Forms.CheckBox cbRndDesign;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.CheckBox cbRndColor2;
- private FreeTrain.controls.IndexSelector idxColor2;
+ private FreeTrain.Controls.IndexSelector idxColor2;
private Bitmap previewBitmap;
private Random rnd;
@@ -118,7 +118,7 @@
#region Designer generated code
private System.Windows.Forms.PictureBox preview;
private System.ComponentModel.IContainer components = null;
- private FreeTrain.controls.IndexSelector indexSelector;
+ private FreeTrain.Controls.IndexSelector indexSelector;
private void InitializeComponent()
{
@@ -128,8 +128,8 @@
this.btnPlace = new System.Windows.Forms.RadioButton();
this.group = new System.Windows.Forms.GroupBox();
this.namelabel = new System.Windows.Forms.Label();
- this.idxDesign = new FreeTrain.controls.IndexSelector();
- this.idxColor = new FreeTrain.controls.IndexSelector();
+ this.idxDesign = new FreeTrain.Controls.IndexSelector();
+ this.idxColor = new FreeTrain.Controls.IndexSelector();
this.label1 = new System.Windows.Forms.Label();
this.typeBox = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
@@ -137,10 +137,10 @@
this.cbRndDesign = new System.Windows.Forms.CheckBox();
this.label2 = new System.Windows.Forms.Label();
this.cbRndColor2 = new System.Windows.Forms.CheckBox();
- this.idxColor2 = new FreeTrain.controls.IndexSelector();
- this.price = new FreeTrain.controls.CostBox();
+ this.idxColor2 = new FreeTrain.Controls.IndexSelector();
+ this.price = new FreeTrain.Controls.CostBox();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
- this.indexSelector = new FreeTrain.controls.IndexSelector();
+ this.indexSelector = new FreeTrain.Controls.IndexSelector();
this.group.SuspendLayout();
this.SuspendLayout();
//
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVControllerImpl.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVControllerImpl.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -28,7 +28,7 @@
using FreeTrain.Controllers;
-namespace FreeTrain.world.Structs.hv
+namespace FreeTrain.world.Structs.HalfVoxelStructure
{
internal delegate void createCallback();
/// <summary>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -32,7 +32,7 @@
using FreeTrain.world;
using FreeTrain.world.Subsidiaries;
-namespace FreeTrain.world.Structs.hv
+namespace FreeTrain.world.Structs.HalfVoxelStructure
{
/// <summary>
/// The half divided voxel structure.
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -32,7 +32,7 @@
using FreeTrain.Controllers;
using FreeTrain.Contributions.Structs;
-namespace FreeTrain.world.Structs.hv
+namespace FreeTrain.world.Structs.HalfVoxelStructure
{
/// <summary>
///
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HueShiftSprite.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HueShiftSprite.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HueShiftSprite.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -28,7 +28,7 @@
using FreeTrain.Framework.plugin;
using FreeTrain.Framework.graphics;
-namespace FreeTrain.world.Structs.hv
+namespace FreeTrain.world.Structs.HalfVoxelStructure
{
/// <summary>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/MenuContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/MenuContributionImpl.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/MenuContributionImpl.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -24,7 +24,7 @@
using FreeTrain.Framework;
using FreeTrain.Contributions.Others;
-namespace FreeTrain.world.Structs.hv
+namespace FreeTrain.world.Structs.HalfVoxelStructure
{
/// <summary>
/// Adds "half voxel" menu to the main window
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml 2008-03-18 17:52:14 UTC (rev 239)
@@ -37,13 +37,13 @@
<contribution type="contribution" id="{A8454630-96EB-45AD-C477-7DA394892BE6}">
<name>HalfVoxelStructure</name>
<class name="FreeTrain.Framework.plugin.FixedClassContributionFactory"/>
- <implementation name="FreeTrain.world.Structs.hv.HalfVoxelContribution"
+ <implementation name="FreeTrain.world.Structs.HalfVoxelStructure.HalfVoxelContribution"
codebase="FreeTrain.HalfVoxelStructure.dll" />
</contribution>
<!-- temporary -->
<contribution type="menu" id="{01AA051B-6112-4C00-C477-DE82E240F19F}">
- <class name="FreeTrain.world.Structs.hv.MenuContributionImpl"
+ <class name="FreeTrain.world.Structs.HalfVoxelStructure.MenuContributionImpl"
codebase="FreeTrain.HalfVoxelStructure.dll" />
</contribution>
<!--ここまでの順序は大切-->
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigCommand.cs
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigCommand.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigCommand.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -26,7 +26,7 @@
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.world.Rail.cttrain
+namespace FreeTrain.world.Rail.ColorTestTrain
{
/// <summary>
/// Menu item contribution that allows an user to
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -25,7 +25,7 @@
using System.Windows.Forms;
using FreeTrain.Contributions.Train;
-namespace FreeTrain.world.Rail.cttrain
+namespace FreeTrain.world.Rail.ColorTestTrain
{
/// <summary>
/// ColorConfigDialog
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorTestTrainCar.cs
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorTestTrainCar.cs 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorTestTrainCar.cs 2008-03-18 17:52:14 UTC (rev 239)
@@ -24,7 +24,7 @@
using FreeTrain.Framework.plugin;
using FreeTrain.Contributions.Train;
-namespace FreeTrain.world.Rail.cttrain
+namespace FreeTrain.world.Rail.ColorTestTrain
{
/// <summary>
/// TrainCar contribution implementation for ColorTestTrain.
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-18 17:52:14 UTC (rev 239)
@@ -66,5 +66,8 @@
<Private>False</Private>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Content Include="plugin.xml" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project>
\ No newline at end of file
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml 2008-03-18 16:48:34 UTC (rev 238)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml 2008-03-18 17:52:14 UTC (rev 239)
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<plug-in>
+<?xml version="1.0" encoding="UTF-8" ?>
+<plug-in>
<title>Color Test Train</title>
- <author>Kohsuke Kawaguchi</author>
- <homepage>http://www.kohsuke.org/freetrain/</homepage>
-
- <contribution type="menu" id="{8CA8F000-4DC6-4441-8F53-A628C952BD9F}">
- <class name="FreeTrain.world.Rail.cttrain.ColorConfigCommand"
- codebase="FreeTrain.ColorTestTrain.dll" />
- </contribution>
-
- <!-- Test Train -->
- <contribution type="trainCar" id="{6E5E12DD-69CB-4DF2-B4F0-2BCDA703CBB0}">
- <class
- name="FreeTrain.world.Rail.cttrain.ColorTestTrainCar"
- codebase="FreeTrain.ColorTestTrain.dll" />
- </contribution>
-
- <contribution type="train" id="{719F0922-EA74-409C-B829-C4950201C226}">
- <name>Test train with modifiable colors</name>
- <price>1</price>
+ <author>Kohsuke Kawaguchi</author>
+ <homepage>http://www.kohsuke.org/freetrain/</homepage>
+
+ <contribution type="menu" id="{8CA8F000-4DC6-4441-8F53-A628C952BD9F}">
+ <class name="FreeTrain.world.Rail.ColorTestTrain.ColorConfigCommand"
+ codebase="FreeTrain.ColorTestTrain.dll" />
+ </contribution>
+
+ <!-- Test Train -->
+ <contribution type="trainCar" id="{6E5E12DD-69CB-4DF2-B4F0-2BCDA703CBB0}">
+ <class
+ name="FreeTrain.world.Rail.ColorTestTrain.ColorTestTrainCar"
+ codebase="FreeTrain.ColorTestTrain.dll" />
+ </contribution>
+
+ <contribution type="train" id="{719F0922-EA74-409C-B829-C4950201C226}">
+ <name>Test train with modifiable colors</name>
+ <price>1</price>
<speed>medium</speed>
- <author>C477 (mainly)</author>
- <type>FTct</type>
- <company>FreeTrain</company>
- <description>Used when designing new trains</description>
-
- <composition>
- <body carRef="{6E5E12DD-69CB-4DF2-B4F0-2BCDA703CBB0}" />
- </composition>
- </contribution>
-</plug-in>
+ <author>C477 (mainly)</author>
+ <type>FTct</type>
+ <company>FreeTrain</company>
+ <description>Used when designing new trains</description>
+
+ <composition>
+ <body carRef="{6E5E12DD-69CB-4DF2-B4F0-2BCDA703CBB0}" />
+ </composition>
+ </contribution>
+</plug-in>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-18 18:50:37
|
Revision: 241
http://freetrain.svn.sourceforge.net/freetrain/?rev=241&view=rev
Author: jendave
Date: 2008-03-18 11:50:43 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
All assemblies are now strong-named. Added icon to main window
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
branches/FreeTrainSDL/lib/Controls/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/Properties/AssemblyInfo.cs
Added Paths:
-----------
branches/FreeTrainSDL/App.ico
branches/FreeTrainSDL/FreeTrainSdl.snk
branches/FreeTrainSDL/core/FreeTrainSdl.snk
branches/FreeTrainSDL/lib/Controls/FreeTrainSdl.snk
branches/FreeTrainSDL/lib/SDLGFX.net/FreeTrainSdl.snk
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrainSdl.snk
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrainSdl.snk
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrainSdl.snk
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrainSdl.snk
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrainSdl.snk
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrainSdl.snk
Added: branches/FreeTrainSDL/App.ico
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/App.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-18 18:50:43 UTC (rev 241)
@@ -23,6 +23,9 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>true</IsWebBootstrapper>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
+ <ApplicationIcon>App.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -82,6 +85,12 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <None Include="FreeTrainSdl.snk" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="App.ico" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Added: branches/FreeTrainSDL/FreeTrainSdl.snk
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/FreeTrainSdl.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/Program.cs 2008-03-18 18:50:43 UTC (rev 241)
@@ -117,13 +117,14 @@
dragStartMousePos = new Point(0, 0);
dragStartScrollPos = new Point(0, 0);
scrollPos = new Point(0, 0);
-
+ SdlDotNet.Graphics.Video.WindowCaption = "FreeTrain SDL";
+ SdlDotNet.Graphics.Video.WindowIcon();
SdlDotNet.Graphics.Video.Initialize();
Mixer.Initialize();
SdlMixer.MusicFinishedDelegate musicStopped = new SdlMixer.MusicFinishedDelegate(musicHasStopped);
SdlMixer.Mix_HookMusicFinished(musicStopped);
- Sdl.SDL_WM_SetCaption("FreeTrain SDL", "");
+
screen = Sdl.SDL_SetVideoMode(
width,
height,
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-18 18:50:43 UTC (rev 241)
@@ -9,8 +9,7 @@
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>FreeTrain.Core</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -22,6 +21,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -991,6 +991,9 @@
<Name>SDL.net</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="FreeTrainSdl.snk" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
@@ -998,4 +1001,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
Added: branches/FreeTrainSDL/core/FreeTrainSdl.snk
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/core/FreeTrainSdl.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/core/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/core/Properties/AssemblyInfo.cs 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/core/Properties/AssemblyInfo.cs 2008-03-18 18:50:43 UTC (rev 241)
@@ -34,6 +34,6 @@
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+
[assembly: AssemblyKeyName("")]
[assembly: CLSCompliant(true)]
\ No newline at end of file
Modified: branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
===================================================================
--- branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2008-03-18 18:50:43 UTC (rev 241)
@@ -11,8 +11,7 @@
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>FreeTrain.Controls</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -26,6 +25,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -135,6 +135,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <None Include="FreeTrainSdl.snk" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
Added: branches/FreeTrainSDL/lib/Controls/FreeTrainSdl.snk
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/lib/Controls/FreeTrainSdl.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/lib/Controls/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/Properties/AssemblyInfo.cs 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/lib/Controls/Properties/AssemblyInfo.cs 2008-03-18 18:50:43 UTC (rev 241)
@@ -35,6 +35,6 @@
[assembly: AssemblyVersion("1.0.2002.1221")]
[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+
[assembly: AssemblyKeyName("")]
[assembly: CLSCompliant(true)]
Added: branches/FreeTrainSDL/lib/SDLGFX.net/FreeTrainSdl.snk
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/lib/SDLGFX.net/FreeTrainSdl.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj 2008-03-18 18:50:43 UTC (rev 241)
@@ -6,6 +6,8 @@
<OutputType>Library</OutputType>
<RootNamespace>SDLGFX.net</RootNamespace>
<AssemblyName>SDLGFX.net</AssemblyName>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -43,4 +45,7 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
+ <ItemGroup>
+ <None Include="FreeTrainSdl.snk" />
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj 2008-03-18 18:50:43 UTC (rev 241)
@@ -11,8 +11,7 @@
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>FreeTrain.DummyCars</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -26,6 +25,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\</OutputPath>
@@ -126,6 +126,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <None Include="FreeTrainSdl.snk" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
Added: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrainSdl.snk
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrainSdl.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/Properties/AssemblyInfo.cs 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/Properties/AssemblyInfo.cs 2008-03-18 18:50:43 UTC (rev 241)
@@ -35,5 +35,5 @@
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+
[assembly: AssemblyKeyName("")]
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj 2008-03-18 18:50:43 UTC (rev 241)
@@ -11,8 +11,7 @@
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>FreeTrain.RoadAccessory</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -26,6 +25,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\</OutputPath>
@@ -126,6 +126,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <None Include="FreeTrainSdl.snk" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
Added: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrainSdl.snk
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrainSdl.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/Properties/AssemblyInfo.cs 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/Properties/AssemblyInfo.cs 2008-03-18 18:50:43 UTC (rev 241)
@@ -34,6 +34,6 @@
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+
[assembly: AssemblyKeyName("")]
[assembly: CLSCompliant(true)]
\ No newline at end of file
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj 2008-03-18 18:50:43 UTC (rev 241)
@@ -11,8 +11,7 @@
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>FreeTrain.ExpandedContributions</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -26,6 +25,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>.\</OutputPath>
@@ -136,6 +136,7 @@
<DependentUpon>MultiSelectorController.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <None Include="FreeTrainSdl.snk" />
<None Include="plugin.xml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Added: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrainSdl.snk
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrainSdl.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/Properties/AssemblyInfo.cs 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/Properties/AssemblyInfo.cs 2008-03-18 18:50:43 UTC (rev 241)
@@ -34,6 +34,6 @@
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+
[assembly: AssemblyKeyName("")]
[assembly: CLSCompliant(true)]
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2008-03-18 18:50:43 UTC (rev 241)
@@ -11,8 +11,7 @@
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>FreeTrain.HalfVoxelStructure</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -26,6 +25,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>.\</OutputPath>
@@ -134,6 +134,9 @@
<Content Include="HVCursor.bmp" />
<Content Include="plugin.xml" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="FreeTrainSdl.snk" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
Added: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrainSdl.snk
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrainSdl.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/Properties/AssemblyInfo.cs 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/Properties/AssemblyInfo.cs 2008-03-18 18:50:43 UTC (rev 241)
@@ -37,5 +37,5 @@
[assembly: CLSCompliant(true)]
[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+
[assembly: AssemblyKeyName("")]
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj 2008-03-18 18:50:43 UTC (rev 241)
@@ -11,8 +11,7 @@
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>FreeTrain.VinylHouse</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -26,6 +25,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>.\</OutputPath>
@@ -103,6 +103,9 @@
<ItemGroup>
<Content Include="plugin.xml" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="FreeTrainSdl.snk" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
Added: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrainSdl.snk
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrainSdl.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/Properties/AssemblyInfo.cs 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/Properties/AssemblyInfo.cs 2008-03-18 18:50:43 UTC (rev 241)
@@ -34,6 +34,6 @@
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+
[assembly: AssemblyKeyName("")]
[assembly: CLSCompliant(true)]
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-18 18:50:43 UTC (rev 241)
@@ -12,6 +12,8 @@
<PostBuildEvent />
<StartupObject />
<NoConfig>false</NoConfig>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<NoStdLib>false</NoStdLib>
@@ -69,5 +71,8 @@
<ItemGroup>
<Content Include="plugin.xml" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="FreeTrainSdl.snk" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project>
\ No newline at end of file
Added: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrainSdl.snk
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrainSdl.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/Properties/AssemblyInfo.cs 2008-03-18 17:58:40 UTC (rev 240)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/Properties/AssemblyInfo.cs 2008-03-18 18:50:43 UTC (rev 241)
@@ -34,6 +34,5 @@
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]
[assembly: CLSCompliant(true)]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-18 21:03:45
|
Revision: 242
http://freetrain.svn.sourceforge.net/freetrain/?rev=242&view=rev
Author: jendave
Date: 2008-03-18 14:03:39 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
Update main program to use SdlDotNet for control (still using SDL.net surface)
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/lib/SdlDotNet.dll
branches/FreeTrainSDL/lib/SdlDotNet.xml
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-18 18:50:43 UTC (rev 241)
+++ branches/FreeTrainSDL/Program.cs 2008-03-18 21:03:39 UTC (rev 242)
@@ -28,265 +28,218 @@
using Tao.Sdl;
using SdlDotNet.Audio;
//using SdlDotNet.Graphics;
+using SdlDotNet.Core;
+using SdlDotNet.Input;
using SDL.net;
using FreeTrain.world;
-using FreeTrain.world.Rail;
-using FreeTrain.world.Terrain;
-using FreeTrain.Controllers.Land;
-using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.sound;
-using FreeTrain.Util;
-using FreeTrain.Util.Command;
using FreeTrain.Controllers;
using FreeTrain.Controllers.Rail;
using FreeTrain.Controllers.Terrain;
using FreeTrain.Controllers.Structs;
using FreeTrain.Framework;
using FreeTrain.Views;
-using FreeTrain.Framework.graphics;
namespace FreeTrainSDL
{
public class FreeTrainSDL : IDisposable
{
- int flags = (Sdl.SDL_HWSURFACE | Sdl.SDL_DOUBLEBUF | Sdl.SDL_ANYFORMAT | Sdl.SDL_RESIZABLE);
+ #region Private fields
- static int width = 640, height = 480;
- private int MAP_X_OFFSET = 12, MAP_Y_OFFSET = 24;
- private IntPtr screen;
- private SDLGUI gui;
- bool quitFlag = false;
+ int width = 640;
+ int height = 480;
+ int mapXOffset = 12;
+ int mapYOffset = 24;
+ System.Windows.Forms.Timer timer;
+ SdlDotNet.Graphics.Surface screen;
+ SDLGUI gui;
Sdl.SDL_VideoInfo videoInfo;
Sdl.SDL_PixelFormat pixelFormat;
- Sdl.SDL_Event evt;
-
- static int CURRENT_BPP = 16;
-
- Surface tmp;
-
+ int currentBpp = 16;
ModalController controller = null;
+ bool dragMode = false;
+ Point dragStartMousePosition;
+ Point dragStartScrollPosition;
+ Point autoScrollPosition;
+ QuarterViewDrawer qView = null;
+ World world = null;
+ WeatherOverlay weatherOverlay;
+ Sdl.SDL_Rect sourceRect;
+ Sdl.SDL_Rect dst;
+ short oldX;
+ short oldY;
+ bool lastMouseState;
- private bool dragMode = false;
- private Point dragStartMousePos, dragStartScrollPos, AutoScrollPosition;
+ #endregion
- private Point scrollPos
+ #region Private Methods
+
+ private Point ScrollPosition
{
get
{
- Point pt = AutoScrollPosition;
- return new Point(pt.X + MAP_X_OFFSET, pt.Y + MAP_Y_OFFSET);
+ Point pt = autoScrollPosition;
+ return new Point(pt.X + mapXOffset, pt.Y + mapYOffset);
}
set
{
- AutoScrollPosition = new Point(
- Math.Max(value.X - MAP_X_OFFSET, 0),
- Math.Max(value.Y - MAP_Y_OFFSET, 0));
+ autoScrollPosition = new Point(
+ Math.Max(value.X - mapXOffset, 0),
+ Math.Max(value.Y - mapYOffset, 0));
}
}
- QuarterViewDrawer qview = null;
- World w = null;
- WeatherOverlay weatherOverlay;
-
- Sdl.SDL_Rect source_rect, dst;
-
- /// <summary>
- /// The main entry point for the application.
- /// </summary>
- [STAThread]
- static void Main()
+ private void UpdateMessage(string msg, float progress)
{
- FreeTrainSDL ftsdl = new FreeTrainSDL();
- ftsdl.Go();
- }
-
- public void updateMessage(string msg, float progress)
- {
//Console.WriteLine("LOADING: " + msg + "{" + progress + "}");
gui.addSplashText(msg.Replace('\n', ' '), progress);
}
- public void musicHasStopped()
+ private void MusicHasStopped()
{
Core.bgmManager.nextSong();
}
- public void Go()
+ private void Quit(object sender, QuitEventArgs e)
{
- dragStartMousePos = new Point(0, 0);
- dragStartScrollPos = new Point(0, 0);
- scrollPos = new Point(0, 0);
- SdlDotNet.Graphics.Video.WindowCaption = "FreeTrain SDL";
- SdlDotNet.Graphics.Video.WindowIcon();
- SdlDotNet.Graphics.Video.Initialize();
- Mixer.Initialize();
- SdlMixer.MusicFinishedDelegate musicStopped = new SdlMixer.MusicFinishedDelegate(musicHasStopped);
- SdlMixer.Mix_HookMusicFinished(musicStopped);
+ SdlMixer.Mix_CloseAudio();
-
- screen = Sdl.SDL_SetVideoMode(
- width,
- height,
- CURRENT_BPP,
- flags);
+ timer.Stop();
+ Events.QuitApplication();
+ }
- IntPtr videoInfoPointer = Sdl.SDL_GetVideoInfo();
+ private void Tick(object sender, TickEventArgs e)
+ {
+ if (qView != null)
+ {
+ controller = MainWindow.mainWindow.currentController;
- if (videoInfoPointer != IntPtr.Zero)
+ qView.updateScreen();
+ if (World.world.satellite == null || World.world.satellite.surface.w != 150 || World.world.satellite.surface.h != 150)
+ {
+ World.world.satellite = new Surface(150, 150, 32);
+ World.world.satellite.sourceColorKey = Color.Magenta;
+ World.world.satellite.Fill(Color.FromArgb(222, 195, 132));
+ }
+ }
+ Application.DoEvents();
+ }
+
+ private void KeyDown(object sender, KeyboardEventArgs e)
+ {
+ if (e.Key == Key.Escape || e.Key == Key.Q)
{
- videoInfo = (Sdl.SDL_VideoInfo)Marshal.PtrToStructure(videoInfoPointer, typeof(Sdl.SDL_VideoInfo));
- pixelFormat = (Sdl.SDL_PixelFormat)Marshal.PtrToStructure(videoInfo.vfmt, typeof(Sdl.SDL_PixelFormat));
+ Events.QuitApplication();
}
+ if (e.Key == Key.B)
+ {
+ RailRoadController.create();
+ }
+ }
- gui = new SDLGUI();
- gui.ButtonClick += new EventHandler(GUIButtonClick);
- gui.initGUI(width, height, videoInfo.vfmt);
- gui.addButton("rail", "Railroad Construction");
- gui.addButton("station", "Station Construction");
- gui.addButton("train", "Train Stuff");
- gui.addButton("land", "Modify Terrain");
- gui.addButton("struct", "Structure Construction");
- gui.addButton("playlist", "Music Playlist");
+ private void Resize(object sender, SdlDotNet.Graphics.VideoResizeEventArgs e)
+ {
+ this.width = e.Width;
+ this.height = e.Height;
+ screen = SdlDotNet.Graphics.Video.SetVideoMode(width, height, currentBpp, true);
+ screen.SourceColorKey = Color.Magenta;
+ weatherOverlay.setSize(new Size(width, height));
+ qView.size = new Size(e.Width, e.Height);
+ }
- gui.clock_text = "Initialising...";
+ private void MusicFinished(object sender, MusicFinishedEventArgs e)
+ {
+ Core.bgmManager.nextSong();
+ }
- updateMessage("FreeTrain SDL Starting...", -1);
- gui.SHOW_SPLASH = true;
+ private void MouseButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ lastMouseState = e.ButtonPressed;
+ if (e.Button == MouseButton.PrimaryButton && !dragMode)
+ {
+ dragMode = true;
+ dragStartMousePosition = new Point(e.X, e.Y);
+ dragStartScrollPosition = ScrollPosition;
+ Mouse.ShowCursor = true;
+ }
+ }
- finalDraw();
+ private void MouseButtonUp(object sender, MouseButtonEventArgs e)
+ {
+ if (dragMode)
+ {
+ dragMode = false;
+ Mouse.MousePosition = new Point(oldX, oldY);
- MainWindow.mainWindow = new MainWindow(null, true);
- updateMessage("Loading plugins...", -1);
- finalDraw();
- Core.init(null, null, null, new ProgressHandler(updateMessage), true);
- w = new World(new Distance(150, 150, 7), 3);
- World.world = w;
+ Mouse.ShowCursor = true;
+ }
- weatherOverlay = NullWeatherOverlay.theInstance;
- tmp = new Surface(width, height);
-
- updateMessage("Creating Map...", 0);
- finalDraw();
- qview = new QuarterViewDrawer(w, new Rectangle(0, 0, w.size.x * 32 - 16, (w.size.y - 2 * w.size.z - 1) * 8));
- qview.offscreenBuffer = new Surface(w.size.x * 32 - 16, (w.size.y - 2 * w.size.z - 1) * 8, videoInfo.vfmt);
- qview.recreateDrawBuffer(new Size(width, height), true);
- updateMessage("Creating Map...", 100);
- finalDraw();
-
- qview.draw(new Rectangle(0, 0, w.size.x * 32 - 16, (w.size.y - 2 * w.size.z - 1) * 8), null);
- qview.OnUpdated += new EventHandler(qview_OnUpdated);
-
- gui.SHOW_SPLASH = false;
-
- Timer timer = new Timer();
- timer.Tick += new EventHandler(timer_Tick);
- timer.Interval = 33;
- timer.Enabled = true;
- timer.Start();
-
- while (quitFlag == false)
+ if (lastMouseState)
{
- //do shit all.
- int result = Sdl.SDL_PollEvent(out evt);
- switch (evt.type)
+ if (!gui.checkIfGUIClick(e.EventStruct.button))
{
- case Sdl.SDL_QUIT:
- quitFlag = true;
- break;
- case Sdl.SDL_KEYDOWN:
- Events_KeyDown(evt.key);
- break;
- case Sdl.SDL_VIDEORESIZE:
- width = evt.resize.w;
- height = evt.resize.h;
- screen = Sdl.SDL_SetVideoMode(width, height, CURRENT_BPP, flags);
- weatherOverlay.setSize(new Size(width, height));
- qview.size = new Size(evt.resize.w, evt.resize.h);
- break;
- case Sdl.SDL_MOUSEBUTTONDOWN:
- Events_MouseButtonDown(evt.button);
- break;
- case Sdl.SDL_MOUSEBUTTONUP:
- Events_MouseButtonUp(evt.button);
- break;
- case Sdl.SDL_MOUSEMOTION:
- Events_MouseMotion(evt.motion);
- break;
- }
-
- if (qview != null)
- {
- controller = MainWindow.mainWindow.currentController;
-
- qview.updateScreen();
- if (World.world.satellite == null || World.world.satellite.surface.w != 150 || World.world.satellite.surface.h != 150)
+ if (controller != null)
{
- World.world.satellite = new Surface(150, 150, 32);
- World.world.satellite.Fill(Color.FromArgb(222, 195, 132));
- }
+ Point ab = qView.fromClientToAB(e.X + ScrollPosition.X, e.Y + ScrollPosition.Y);
+ Location xyz = qView.fromABToXYZ(ab, controller);
- /*for (int i = 0; i < World.world.rootTrainGroup.items.Count; i++)
- {
- Train t = (Train)World.world.rootTrainGroup.items.get(i);
- if (t.state == Train.State.Moving)
- gui.updateTrainStatus(i, 3);
- else if (t.isPlaced)
- gui.updateTrainStatus(i, 2);
- else
- gui.updateTrainStatus(i, 1);
-
- if (i == gui.sat.selectedTrain) gui.sat.currentTrainText = t.name;
+ if (e.Button == MouseButton.SecondaryButton) controller.onClick(null, xyz, ab);
}
-
- gui.updateSatellite(ref World.world.satellite);*/
}
-
- Application.DoEvents();
}
+ lastMouseState = e.ButtonPressed;
+ }
-
- SdlMixer.Mix_CloseAudio();
-
- timer.Stop();
+ private void MouseMotion(object sender, MouseMotionEventArgs e)
+ {
+ if (dragMode)
+ {
+ scrollByDrag(new Point(e.X, e.Y));
+ }
+ else
+ {
+ gui.checkMouseMovement(e.EventStruct.motion);
+ if (controller != null)
+ {
+ Point ab = qView.fromClientToAB(e.X + ScrollPosition.X, e.Y + ScrollPosition.Y);
+ controller.onMouseMove(null, qView.fromABToXYZ(ab, controller), ab);
+ }
+ oldX = e.X;
+ oldY = e.Y;
+ }
}
- void timer_Tick(object sender, EventArgs e)
+ private void timerTick(object sender, EventArgs e)
{
- if (qview != null)
+ if (qView != null)
{
World.world.clock.tick();
World.world.clock.tick();
- //World.world.clock.tick();
- //World.world.clock.tick();
- //World.world.clock.tick();
- //World.world.clock.tick();
- source_rect = new Sdl.SDL_Rect((short)scrollPos.X, (short)scrollPos.Y, (short)width, (short)height);
+
+ sourceRect = new Sdl.SDL_Rect((short)ScrollPosition.X, (short)ScrollPosition.Y, (short)width, (short)height);
dst = new Sdl.SDL_Rect(0, 0, (short)width, (short)height);
- Tao.Sdl.Sdl.SDL_BlitSurface(qview.offscreenBuffer.surfacePtr(), ref source_rect, screen, ref dst);
- //Tao.Sdl.Sdl.SDL_BlitSurface(tmp.surfacePtr(), ref dst, screen, ref dst);
+ Tao.Sdl.Sdl.SDL_BlitSurface(qView.offscreenBuffer.surfacePtr(), ref sourceRect, screen.Handle, ref dst);
}
-
finalDraw();
}
- void finalDraw()
+ private void finalDraw()
{
if (gui != null)
{
gui.updateGUIElements(width, height);
if (World.world != null) gui.clock_text = World.world.clock.displayString;
- gui.drawGUI(width, height, screen);
+ gui.drawGUI(width, height, screen.Handle);
}
- int result = Sdl.SDL_Flip(screen);
+ screen.Update();
}
private void weatherTimer_Tick(object sender, System.EventArgs e)
{
}
- void GUIButtonClick(object sender, EventArgs e)
+ private void GUIButtonClick(object sender, EventArgs e)
{
switch ((string)sender)
{
@@ -309,205 +262,138 @@
BGMPlaylist bgmplaylist = new BGMPlaylist();
bgmplaylist.Show();
break;
- /*case 1:
- TrainTradingDialog t = new TrainTradingDialog();
- t.ShowDialog();
- t.Dispose();
- TrainPlacementController.create();
- break;
- case 2:
-
-
- break;
- case 3:
- if (screen.FullScreen)
- {
- width = old_width;
- height = old_height;
- }
- else
- {
- old_width = width;
- old_height = height;
- width = 640;
- height = 480;
- }
- bool new_FS = !screen.FullScreen;
- screen = Video.SetVideoMode(width, height, CURRENT_BPP, true, false, new_FS);
- qview.size = new Size(width, height);
- break;
-
- StationaryStructPlacementController.create();
- VarHeightBuildingController.create();
- CommercialStructPlacementController.create();
- break;
-
- case 4:
- quitFlag = true;
- break;*/
}
}
- void qview_OnUpdated(object sender, EventArgs e)
+ private void qview_OnUpdated(object sender, EventArgs e)
{
- //if (qview.offscreenBuffer != null)
- //{
- //maybe do something? I don't know.
- //}
- //
}
- void Events_KeyDown(Sdl.SDL_KeyboardEvent e)
+ private bool scrollByDrag(Point curMousePos)
{
- switch (e.keysym.sym)
- {
- case (int)Sdl.SDLK_ESCAPE:
- case (int)Sdl.SDLK_q:
- quitFlag = true;
- break;
- case (int)Sdl.SDLK_b:
- RailRoadController.create();
- break;
- }
+ int dragAccel = 1;
+ Point pt = this.dragStartScrollPosition;
+ pt.X += (curMousePos.X - dragStartMousePosition.X) * dragAccel;
+ pt.Y += (curMousePos.Y - dragStartMousePosition.Y) * dragAccel;
+ ScrollPosition = pt;
+ qView.origin = ScrollPosition;
+ return true;
}
- short old_x, old_y;
- void Events_MouseMotion(Sdl.SDL_MouseMotionEvent e)
+ private int distance(Point a, Point b)
{
- if (dragMode)
- {
- scrollByDrag(new Point(e.x, e.y));
+ return (int)Math.Sqrt((a.X - b.X) * (a.X - b.X) + (a.Y - b.Y) * (a.Y - b.Y));
+ }
+ #endregion
- }
- else
- {
- gui.checkMouseMovement(e);
- if (controller != null)
- {
- Point ab = qview.fromClientToAB(e.x + scrollPos.X, e.y + scrollPos.Y);
- controller.onMouseMove(null, qview.fromABToXYZ(ab, controller), ab);
- }
- old_x = e.x;
- old_y = e.y;
- }
+ #region Main
-
- }
- byte lastMouseState;
- void Events_MouseButtonDown(Sdl.SDL_MouseButtonEvent e)
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main()
{
- lastMouseState = e.state;
- if (e.button == Sdl.SDL_BUTTON_RIGHT && !dragMode)
- {
- dragMode = true;
- dragStartMousePos = new Point(e.x, e.y);
- dragStartScrollPos = scrollPos;
- Sdl.SDL_ShowCursor(0);
- }
+ FreeTrainSDL ftsdl = new FreeTrainSDL();
+ ftsdl.Go();
}
- void Events_MouseButtonUp(Sdl.SDL_MouseButtonEvent e)
+ private void Go()
{
- if (dragMode)
+ timer = new System.Windows.Forms.Timer();
+ Events.KeyboardDown += new EventHandler<KeyboardEventArgs>(this.KeyDown);
+ Events.MouseButtonDown +=
+ new EventHandler<MouseButtonEventArgs>(this.MouseButtonDown);
+ Events.MouseButtonUp +=
+ new EventHandler<MouseButtonEventArgs>(this.MouseButtonUp);
+ Events.Quit += new EventHandler<QuitEventArgs>(this.Quit);
+ Events.Tick += new EventHandler<TickEventArgs>(this.Tick);
+ Events.VideoResize += new EventHandler<SdlDotNet.Graphics.VideoResizeEventArgs>(this.Resize);
+ Events.MusicFinished +=
+ new EventHandler<MusicFinishedEventArgs>(this.MusicFinished);
+ Events.MouseMotion += new EventHandler<MouseMotionEventArgs>(this.MouseMotion);
+ dragStartMousePosition = new Point(0, 0);
+ dragStartScrollPosition = new Point(0, 0);
+ ScrollPosition = new Point(0, 0);
+
+ SdlDotNet.Graphics.Video.WindowIcon();
+ SdlDotNet.Graphics.Video.WindowCaption = "FreeTrain SDL";
+ SdlDotNet.Graphics.Video.Initialize();
+ Mixer.Initialize();
+
+ SdlMixer.MusicFinishedDelegate musicStopped = new SdlMixer.MusicFinishedDelegate(MusicHasStopped);
+ SdlMixer.Mix_HookMusicFinished(musicStopped);
+
+
+ screen = SdlDotNet.Graphics.Video.SetVideoMode(width, height, currentBpp, true);
+ screen.SourceColorKey = Color.Magenta;
+ IntPtr videoInfoPointer = Sdl.SDL_GetVideoInfo();
+
+ if (videoInfoPointer != IntPtr.Zero)
{
- dragMode = false;
- //if (scrollByDrag(e.Position)) return;
- Sdl.SDL_WarpMouse(old_x, old_y);
- Sdl.SDL_ShowCursor(1);
+ videoInfo = (Sdl.SDL_VideoInfo)Marshal.PtrToStructure(videoInfoPointer, typeof(Sdl.SDL_VideoInfo));
+ pixelFormat = (Sdl.SDL_PixelFormat)Marshal.PtrToStructure(videoInfo.vfmt, typeof(Sdl.SDL_PixelFormat));
}
- if (lastMouseState == Sdl.SDL_PRESSED)
- {
- if (!gui.checkIfGUIClick(e))
- {
- if (controller != null)
- {
- Point ab = qview.fromClientToAB(e.x + scrollPos.X, e.y + scrollPos.Y);
- Location xyz = qview.fromABToXYZ(ab, controller);
+ gui = new SDLGUI();
+ gui.ButtonClick += new EventHandler(GUIButtonClick);
+ gui.initGUI(width, height, videoInfo.vfmt);
+ gui.addButton("rail", "Railroad Construction");
+ gui.addButton("station", "Station Construction");
+ gui.addButton("train", "Train Stuff");
+ gui.addButton("land", "Modify Terrain");
+ gui.addButton("struct", "Structure Construction");
+ gui.addButton("playlist", "Music Playlist");
- if (e.button == Sdl.SDL_BUTTON_LEFT) controller.onClick(null, xyz, ab);
- }
- }
- }
- lastMouseState = e.state;
- }
+ gui.clock_text = "Initialising...";
- private bool scrollByDrag(Point curMousePos)
- {
- int dragAccel = 1;
- //if (controller == null)
- //{
- Point pt = this.dragStartScrollPos;
- pt.X += (curMousePos.X - dragStartMousePos.X) * dragAccel;
- pt.Y += (curMousePos.Y - dragStartMousePos.Y) * dragAccel;
- //pt.X *= -1;
- //pt.Y *= -1;
- //Console.WriteLine(pt);
- scrollPos = pt;
- qview.origin = scrollPos;
- //if (qview.origin != scrollPos)
- //{
- // dragStartMousePos = curMousePos;
- // dragStartScrollPos = curMousePos;
- // scrollPos = qview.origin;
- //}
- //Console.Write(scrollPos);
- return true;
- //}
- //return false;
- }
+ UpdateMessage("FreeTrain SDL Starting...", -1);
+ gui.SHOW_SPLASH = true;
- private int distance(Point a, Point b)
- {
- return (int)Math.Sqrt((a.X - b.X) * (a.X - b.X) + (a.Y - b.Y) * (a.Y - b.Y));
- }
+ finalDraw();
- //private void Tick(object sender, TickEventArgs args)
- //{
- //screen.Fill(Color.Black);
- /*if (qview != null) {
- controller = MainWindow.mainWindow.currentController;
- clock = World.world.clock;
- clock.tick();
- clock.tick();
- clock.tick();
- clock.tick();
+ MainWindow.mainWindow = new MainWindow(null, true);
+ UpdateMessage("Loading plugins...", -1);
+ finalDraw();
+ Core.init(null, null, null, new ProgressHandler(UpdateMessage), true);
+ world = new World(new Distance(150, 150, 7), 3);
+ World.world = world;
- qview.updateScreen();
-
- //if (scrollPos.X == source_rect.X && scrollPos.Y == source_rect.Y)
- //{
- //tst = screen.CreateScaledSurface(0.5);
- // screen.Blit(qview.offscreenBuffer.handle, new Point(0,0), source_rect);
- //screen.Draw(new SdlDotNet.Graphics.Primitives.Box(qview.offscreenBuffer.clipRect.Location, qview.offscreenBuffer.clipRect.Size),Color.Black);
- //Rectangle r = new Rectangle(0, 0, width / 2, height / 2);
-
- //screen.Blit(tst,new Point(0,0));
- //tst.Dispose();
-
- //}
- //else
- //{
- source_rect = new Rectangle(scrollPos, new Size(width, height));
- screen.Blit(qview.offscreenBuffer.handle, new Point(0, 0), source_rect);
- //}
-
- }*/
+ weatherOverlay = NullWeatherOverlay.theInstance;
- // if (gui != null) {
- // gui.updateGUIElements(width,height);
- // if (clock != null) gui.clock_text = clock.displayString;
- // gui.drawGUI(width,height,screen);
- // }
+ UpdateMessage("Creating Map...", 0);
+ finalDraw();
+ qView = new QuarterViewDrawer(world, new Rectangle(0, 0, world.size.x * 32 - 16, (world.size.y - 2 * world.size.z - 1) * 8));
+ qView.offscreenBuffer = new Surface(world.size.x * 32 - 16, (world.size.y - 2 * world.size.z - 1) * 8, screen.CreateCompatibleSurface().Pixels);
+ qView.offscreenBuffer.sourceColorKey = Color.Magenta;
+ qView.recreateDrawBuffer(new Size(width, height), true);
+ UpdateMessage("Creating Map...", 100);
+ finalDraw();
- // screen.Update();
- //}
+ qView.draw(new Rectangle(0, 0, world.size.x * 32 - 16, (world.size.y - 2 * world.size.z - 1) * 8), null);
+ qView.OnUpdated += new EventHandler(qview_OnUpdated);
+ gui.SHOW_SPLASH = false;
+
+ timer.Tick += new EventHandler(timerTick);
+ timer.Interval = 33;
+ timer.Enabled = true;
+ timer.Start();
+
+ Events.Run();
+ }
+
+ #endregion
+
+ #region Public Methods
+
public void Dispose()
{
-
weatherOverlay.Dispose();
Dispose();
}
+
+ #endregion
+
}
}
Modified: branches/FreeTrainSDL/lib/SdlDotNet.dll
===================================================================
(Binary files differ)
Modified: branches/FreeTrainSDL/lib/SdlDotNet.xml
===================================================================
--- branches/FreeTrainSDL/lib/SdlDotNet.xml 2008-03-18 18:50:43 UTC (rev 241)
+++ branches/FreeTrainSDL/lib/SdlDotNet.xml 2008-03-18 21:03:39 UTC (rev 242)
@@ -4,811 +4,1131 @@
<name>SdlDotNet</name>
</assembly>
<members>
- <member name="T:SdlDotNet.Audio.AudioException">
+ <member name="T:SdlDotNet.Graphics.Transformation">
<summary>
- Represents a Audio run-time error from the Sdl library.
+ The Tranformation class holds variables for rotating and zooming a Surface
</summary>
</member>
- <member name="T:SdlDotNet.Core.SdlException">
+ <member name="M:SdlDotNet.Graphics.Transformation.#ctor(System.Double,System.Double,System.Double,System.Boolean,System.Int32)">
<summary>
- Represents a run-time error from the Sdl library.
+ Basic constructor
</summary>
+ <param name="scaleX">X-axis scaling factor</param>
+ <param name="scaleY">Y-axis scaling factor</param>
+ <param name="zoom">scaling in both X and Y axes</param>
+ <param name="antiAlias">Antialias</param>
+ <param name="degreesOfRotation">Rotate surface by given degrees</param>
</member>
- <member name="M:SdlDotNet.Core.SdlException.#ctor">
+ <member name="M:SdlDotNet.Graphics.Transformation.#ctor(System.Double,System.Double,System.Double,System.Int32)">
<summary>
- Returns basic exception
+ Transform with Anti-aliasing is on
</summary>
+ <param name="scaleX">X-axis scaling factor
+ </param>
+ <param name="scaleY">Y-axis scaling factor
+ </param>
+ <param name="zoom">scaling in both X and Y axes
+ </param>
+ <param name="degreesOfRotation">Rotate surface by given degrees
+ </param>
</member>
- <member name="M:SdlDotNet.Core.SdlException.#ctor(System.String)">
+ <member name="M:SdlDotNet.Graphics.Transformation.#ctor(System.Double,System.Double,System.Int32)">
<summary>
- Initializes an SdlException instance
+ Transform with Anti-aliasing on and zoom off.
</summary>
- <param name="message">
- The string representing the error message
+ <param name="scaleX">X-axis scaling factor
</param>
+ <param name="scaleY">Y-axis scaling factor
+ </param>
+ <param name="degreesOfRotation">
+ Rotate surface by given degrees
+ </param>
</member>
- <member name="M:SdlDotNet.Core.SdlException.#ctor(System.String,System.Exception)">
+ <member name="M:SdlDotNet.Graphics.Transformation.#ctor(System.Double,System.Int32)">
<summary>
- Returns exception
+ Transform with Anti-aliasing on and scaling off.
</summary>
- <param name="message">Exception message</param>
- <param name="exception">Exception type</param>
+ <param name="zoom">Zoom factor</param>
+ <param name="degreesOfRotation">Degrees to rotate surface</param>
</member>
- <member name="M:SdlDotNet.Core.SdlException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+ <member name="M:SdlDotNet.Graphics.Transformation.#ctor(System.Int32)">
<summary>
- Returns SerializationInfo
+ Rotate surface
</summary>
- <param name="info"></param>
- <param name="context"></param>
+ <param name="degreesOfRotation">Degrees to rotate surface</param>
</member>
- <member name="M:SdlDotNet.Core.SdlException.Generate">
+ <member name="P:SdlDotNet.Graphics.Transformation.ScaleX">
<summary>
- Generates an SdlException based on the last Sdl Error code.
+ Stretch surface in X-axis by this amount
</summary>
- <returns>
- A new SdlException object
- </returns>
</member>
- <member name="P:SdlDotNet.Core.SdlException.GetError">
+ <member name="P:SdlDotNet.Graphics.Transformation.ScaleY">
<summary>
- Returns SDL error.
+ Stretch surface in Y-axis by this amount
</summary>
</member>
- <member name="M:SdlDotNet.Audio.AudioException.#ctor">
+ <member name="P:SdlDotNet.Graphics.Transformation.Zoom">
<summary>
- Returns basic exception
+ Stretch surface in X-axis and Y-axis by this amount
</summary>
</member>
- <member name="M:SdlDotNet.Audio.AudioException.#ctor(System.String)">
+ <member name="P:SdlDotNet.Graphics.Transformation.DegreesOfRotation">
<summary>
- Initializes an AudioException instance
+ Rotate surface by given degrees.
</summary>
- <param name="message">
- The string representing the error message
+ </member>
+ <member name="P:SdlDotNet.Graphics.Transformation.AntiAlias">
+ <summary>
+ Use antialiasing on the Surface.
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Sprites.TextSprite">
+ <summary>
+ Implements a basic font that is given a font and a string and
+ generates an appropriate surface from that font.
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Sprites.Sprite">
+ <summary>
+ Sprite class contains both a Surface and a Rectangle so that
+ an object can be easily displayed and manipulated.
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor">
+ <summary>
+ Basic constructor.
+ </summary>
+ <remarks>
+ Use this with caution.
+ This is provided as a convenience.
+ Please give the sprite a Surface and a Vector.</remarks>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(SdlDotNet.Graphics.Surface,System.Drawing.Point)">
+ <summary>
+ Create a new Sprite
+ </summary>
+ <param name="position">Starting position</param>
+ <param name="surface">Surface of Sprite</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(SdlDotNet.Graphics.Surface)">
+ <summary>
+ Create new Sprite at (0, 0)
+ </summary>
+ <param name="surface">Surface of Sprite</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(System.String)">
+ <summary>
+ Creates a new sprite using the given surface file.
+ </summary>
+ <param name="surfaceFile">
+ The file path of the surface to use as the sprite.
</param>
</member>
- <member name="M:SdlDotNet.Audio.AudioException.#ctor(System.String,System.Exception)">
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(SdlDotNet.Graphics.Surface,SdlDotNet.Core.Vector)">
<summary>
- Returns exception
+ Create new Sprite
</summary>
- <param name="message">Exception message</param>
- <param name="exception">Exception type</param>
+ <param name="vector">Vector of Sprite</param>
+ <param name="surface">Surface of Sprite</param>
</member>
- <member name="M:SdlDotNet.Audio.AudioException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(SdlDotNet.Graphics.Surface,SdlDotNet.Core.Vector,SdlDotNet.Graphics.Sprites.SpriteCollection)">
<summary>
- Returns SerializationInfo
+ Create new sprite
</summary>
- <param name="info"></param>
- <param name="context"></param>
+ <param name="vector">Vector of Sprite</param>
+ <param name="surface">Surface of Sprite</param>
+ <param name="group">
+ SpriteCollection group to put Sprite into.
+ </param>
</member>
- <member name="T:SdlDotNet.Audio.AudioStream">
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(SdlDotNet.Graphics.Surface,System.Drawing.Point,SdlDotNet.Graphics.Sprites.SpriteCollection)">
<summary>
- An active audio stream for queueing audio data to be played asynchronously.
+ Create new sprite
</summary>
+ <param name="position">position of Sprite</param>
+ <param name="surface">Surface of Sprite</param>
+ <param name="group">
+ SpriteCollection group to put Sprite into.
+ </param>
</member>
- <member name="M:SdlDotNet.Audio.AudioStream.#ctor(System.Int32,SdlDotNet.Audio.AudioFormat,SdlDotNet.Audio.SoundChannel,System.Int16,SdlDotNet.Audio.AudioCallback,System.Object)">
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.ActiveEventArgs)">
<summary>
- Creates an AudioStream
+ Processes Active events
</summary>
- <param name="sampleFrequency">Frequency</param>
- <param name="format">format of stream data</param>
- <param name="channels">Mono or Stereo</param>
- <param name="samples">number of samples</param>
- <param name="callback">Method callback to get more data</param>
- <param name="data">data object</param>
+ <param name="args">Event args</param>
</member>
- <member name="M:SdlDotNet.Audio.AudioStream.#ctor(System.Int32,SdlDotNet.Audio.AudioFormat,SdlDotNet.Audio.SoundChannel,System.Int16)">
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.KeyboardEventArgs)">
<summary>
- Creates an AudioStream
+ Processes the keyboard.
</summary>
- <param name="sampleFrequency">Frequency</param>
- <param name="format">format of stream data</param>
- <param name="channels">Mono or Stereo</param>
- <param name="samples">number of samples</param>
+ <param name="args">Event args</param>
</member>
- <member name="M:SdlDotNet.Audio.AudioStream.Write(System.Int16[])">
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.MouseButtonEventArgs)">
<summary>
- Asynchronously queues audio data in <paramref name="data"/>.
+ Processes a mouse button. This event is trigger by the SDL
+ system.
</summary>
- <param name="data">Buffer formatted as <see cref="F:SdlDotNet.Audio.AudioFormat.Unsigned16Little"/> of audio data to be played</param>
+ <param name="args">Event args</param>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.Offset">
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.MouseMotionEventArgs)">
<summary>
+ Processes a mouse motion event. This event is triggered by
+ SDL. Only
+ sprites that are MouseSensitive are processed.
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.JoystickAxisEventArgs)">
+ <summary>
+ Processes a joystick motion event. This event is triggered by
+ SDL. Only
+ sprites that are JoystickSensitive are processed.
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.JoystickButtonEventArgs)">
+ <summary>
+ Processes a joystick button event. This event is triggered by
+ SDL. Only
+ sprites that are JoystickSensitive are processed.
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.JoystickHatEventArgs)">
+ <summary>
+ Processes a joystick hat motion event. This event is triggered by
+ SDL. Only
+ sprites that are JoystickSensitive are processed.
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.JoystickBallEventArgs)">
+ <summary>
+ Processes a joystick hat motion event. This event is triggered by
+ SDL. Only
+ sprites that are JoystickSensitive are processed.
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Core.QuitEventArgs)">
+ <summary>
+ Processes Quit Events
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Core.UserEventArgs)">
+ <summary>
+ Process User Events
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Graphics.VideoExposeEventArgs)">
+ <summary>
+ Process VideoExposeEvents
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Graphics.VideoResizeEventArgs)">
+ <summary>
+ Process VideoResizeEvents
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Audio.ChannelFinishedEventArgs)">
+ <summary>
+ Process ChannelFinishedEvents
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Audio.MusicFinishedEventArgs)">
+ <summary>
+ Process MusicFinishedEvents
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Core.TickEventArgs)">
+ <summary>
+ All sprites are tickable, regardless if they actual do
+ anything. This ensures that the functionality is there, to be
+ overridden as needed.
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.IntersectsWith(System.Drawing.Point)">
+ <summary>
+ Checks if Sprite intersects with a point
+ </summary>
+ <param name="point">Point to intersect with</param>
+ <returns>True if Sprite intersects with the Point</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.IntersectsWith(System.Drawing.Rectangle)">
+ <summary>
+ Checks if Sprite intersects with a rectangle
+ </summary>
+ <param name="rectangle">rectangle to intersect with
+ </param>
+ <returns>True if Sprite intersect with Rectangle</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.IntersectsWith(SdlDotNet.Graphics.Sprites.Sprite)">
+ <summary>
+ Check if two Sprites intersect
+ </summary>
+ <param name="sprite">Sprite to check intersection with</param>
+ <returns>True if sprites intersect</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.IntersectsWith(System.Drawing.Rectangle,System.Int32)">
+ <summary>
+ Checks if Sprite intersects with a rectangle with tolerance
+ </summary>
+ <param name="rect">rectangle to intersect with
+ </param>
+ <param name="tolerance">The tolerance of the collision check</param>
+ <returns>True if Sprite intersect with Rectangle</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.IntersectsWith(SdlDotNet.Graphics.Sprites.Sprite,System.Int32)">
+ <summary>
+ Check if two Sprites intersect
+ </summary>
+ <param name="sprite">Sprite to check intersection with</param>
+ <param name="tolerance">The amount of tolerance to give the collision.</param>
+ <returns>True if sprites intersect</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.IntersectsWithRadius(SdlDotNet.Graphics.Sprites.Sprite,System.Int32,System.Int32,System.Int32)">
+ <summary>
+ Checks for collision between two sprites using a radius from the center of the sprites.
+ </summary>
+ <param name="sprite">The sprite to compare to.</param>
+ <param name="radius">The radius of the current sprite. Defaults to the radius of the sprite.</param>
+ <param name="radiusOther">The other sprite's radius. Defaults to the radius of the sprite.</param>
+ <param name="tolerance">The size of the buffer zone for collision detection. Defaults to 0.</param>
+ <returns>True if they intersect, false if they don't.</returns>
+ <remarks>If they radius is not given, it calculates it for you using half the width plus half the height.</remarks>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.IntersectsWithRadius(SdlDotNet.Graphics.Sprites.Sprite,System.Int32,System.Int32)">
+ <summary>
+ Checks for collision between two sprites using a radius from the center of the sprites.
+ </summary>
+ <param name="sprite">The sprite to compare to.</param>
+ <param name="radius">The radius of the current sprite. Defaults to the radius of the sprite.</param>
+ <param name="radiusOther">The other sprite's radius. Defaults to the radius of the sprite.</param>
+ <returns>True if they intersect, false if they don't.</returns>
+ <remarks>The offset defaults to 0.</remarks>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.IntersectsWithRadius(SdlDotNet.Graphics.Sprites.Sprite,System.Int32)">
+ <summary>
+ Checks for collision between two sprites using a radius from the center of the sprites.
+ </summary>
+ <param name="sprite">The sprite to compare to.</param>
+ <param name="radius">The radius of the sprites.</param>
+ <returns>True if they intersect, false if they don't.</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.IntersectsWithRadius(SdlDotNet.Graphics.Sprites.Sprite)">
+ <summary>
+ Checks for collision between two sprites using a radius from the center of the sprites.
+ </summary>
+ <param name="sprite">The sprite to compare to.</param>
+ <returns>True if they intersect, false if they don't.</returns>
+ <remarks>The radius for both the sprites is calculated by using half the width and half the height.</remarks>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.IntersectsWith(SdlDotNet.Graphics.Sprites.SpriteCollection)">
+ <summary>
+ Check to see if Sprite intersects with any sprite in a SpriteCollection
+ </summary>
+ <param name="spriteCollection">Collection to chekc the intersection with</param>
+ <returns>True if sprite intersects with any sprite in collection</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Dispose(System.Boolean)">
+ <summary>
+ Destroy sprite
+ </summary>
+ <param name="disposing">If true, remove all unamanged resources</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Kill">
+ <summary>
</summary>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.AudioStatus">
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Dispose">
<summary>
- Returns the current playback state of the audio subsystem. See <see cref="P:SdlDotNet.Audio.AudioStream.AudioStatus"/>.
+ Destroy object
</summary>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.Paused">
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Close">
<summary>
- Gets or sets the paused state of the audio subsystem.
+ Destroy object
</summary>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.Bits">
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Finalize">
<summary>
- Returns the format of the stream
+ Destroy object
</summary>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.Samples">
+ <member name="E:SdlDotNet.Graphics.Sprites.Sprite.ChangedZAxis">
<summary>
- Size of the SDL audio sample buffer
+
</summary>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.RemainingSamples">
+ <member name="E:SdlDotNet.Graphics.Sprites.Sprite.KillSprite">
<summary>
- Total remaining samples queued
+
</summary>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.RemainingMilliseconds">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Surface">
<summary>
- Total remaining milliseconds before sample queue is emptied
+ Gets and sets the surface of the sprite.
</summary>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.RemainingQueues">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Vector">
<summary>
- Remaining number of buffers queued
+
</summary>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.Frequency">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.BoundingBox">
<summary>
- Audio frequency in samples per second
+
</summary>
- <remarks>
- The number of samples sent to the sound device every second.
- Common values are 11025, 22050 and 44100. The higher the better.
- </remarks>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.Format">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Rectangle">
<summary>
- Audio data format.
+ Gets and sets the sprite's surface rectangle.
</summary>
- <remarks>
- Specifies the size and type of each sample element.
- </remarks>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.Channels">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.LastBlitRectangle">
<summary>
- Number of channels: 1 mono, 2 stereo.
+
</summary>
- <remarks>
- The number of seperate sound channels.
- 1 is mono (single channel), 2 is stereo (dual channel).
- </remarks>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.BufferSamples">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Position">
<summary>
- Audio buffer size in samples.
+ Gets and sets the sprites current x,y location.
</summary>
- <remarks>
- When used with <see cref="M:SdlDotNet.Audio.Mixer.OpenAudio(SdlDotNet.Audio.AudioStream)"/> this refers
- to the size of the
- audio buffer in samples. A sample a chunk of audio data
- of the size specified in format mulitplied by the number
- of channels.
- </remarks>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.BufferSize">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Center">
<summary>
- Audio buffer size in bytes (calculated)
+ Center point of Sprite
</summary>
</member>
- <member name="P:SdlDotNet.Audio.AudioStream.Silence">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.X">
<summary>
- Audio buffer silence value (calculated).
+ Gets and sets the sprite's x location.
</summary>
</member>
- <member name="T:SdlDotNet.Audio.CDDrive">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Y">
<summary>
- Represents an individual CD drive on the system
+ Gets and sets the sprite's y location.
</summary>
- <remarks></remarks>
</member>
- <member name="T:SdlDotNet.Core.BaseSdlResource">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Z">
<summary>
- Base class for SdlResources
+ Gets and sets the sprite's z coordinate.
</summary>
- <remarks>
- Several SdlDotNet classes inherit from this class
- </remarks>
</member>
- <member name="M:SdlDotNet.Core.BaseSdlResource.#ctor(System.IntPtr)">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Left">
<summary>
- Creates class using a handle.
+ Gets the left edge of the sprite.
</summary>
- <param name="handle">
- Pointer to unmanaged Sdl resource
- </param>
- <remarks>
- Often used by internal classes.
- </remarks>
</member>
- <member name="M:SdlDotNet.Core.BaseSdlResource.#ctor">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Right">
<summary>
- Default constructor.
+ Gets the right edge of the sprite.
</summary>
- <remarks>
- Used by outside classes.
- </remarks>
</member>
- <member name="M:SdlDotNet.Core.BaseSdlResource.Finalize">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Top">
<summary>
- Allows an Object to attempt to free resources
- and perform other cleanup operations before the Object
- is reclaimed by garbage collection.
+ Gets the top edge of the sprite.
</summary>
- <remarks>
- Frees managed resources
- </remarks>
</member>
- <member name="M:SdlDotNet.Core.BaseSdlResource.Dispose(System.Boolean)">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Bottom">
<summary>
- Dispose objects
+ Gets the bottom edge of the sprite.
</summary>
- <param name="disposing">
- If true, it will dispose close the handle
- </param>
- <remarks>
- Will dispose managed and unmanaged resources.
- </remarks>
</member>
- <member name="M:SdlDotNet.Core.BaseSdlResource.CloseHandle">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Size">
<summary>
- Close the handle.
+ Gets and sets the sprite's size.
</summary>
- <remarks>
- Used to close handle to unmanaged SDL resources
- </remarks>
</member>
- <member name="M:SdlDotNet.Core.BaseSdlResource.Dispose">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Height">
<summary>
- Closes and destroys this object
+ Gets and sets the sprite's height.
</summary>
- <remarks>
- Destroys managed and unmanaged objects
- </remarks>
</member>
- <member name="M:SdlDotNet.Core.BaseSdlResource.Close">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Width">
<summary>
- Closes and destroys this object
+ Gets and sets the sprite's width.
</summary>
- <remarks>
- Same as Dispose(true)
- </remarks>
</member>
- <member name="P:SdlDotNet.Core.BaseSdlResource.Handle">
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.AllowDrag">
<summary>
+ Allows sprite to be dragged via the mouse
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.BeingDragged">
+ <summary>
+ true when sprite is being dragged by the mouse
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Visible">
+ <summary>
+ Gets and sets whether or not the sprite is visible when rendered.
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Alpha">
+ <summary>
+ Gets and sets the alpha associated with the sprite's surface.
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.AlphaBlending">
+ <summary>
+ Gets and sets the alpha blending associated with the sprite's surface.
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.TransparentColor">
+ <summary>
+ Gets and sets the transparent color associated with the sprite's surface.
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Sprites.Sprite.Transparent">
+ <summary>
+ Gets and sets the transparency associated with the sprite's surface.
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.TextSprite.#ctor(SdlDotNet.Graphics.Font)">
+ <summary>
+ Creates a new TextSprite given the font.
+ </summary>
+ <param name="font">The font to use when rendering.</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.TextSprite.#ctor(System.String,SdlDotNet.Graphics.Font)">
+ <summary>
+ Creates a new TextSprite with given the text and font.
+ </summary>
+ <param name="textItem">Text to display</param>
+ <param name="font">The font to use when rendering.</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.TextSprite.#ctor(System.String,SdlDotNet.Graphics.Font,System.Drawing.Color)">
+ <summary>
+ Creates a new TextSprite given the text, font and color.
+ </summary>
+ <param name="textItem">Text to display</param>
+ <param name="font">The font to use when rendering.</param>
+ <param name="color">color of Text</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.TextSprite.#ctor(System.String,SdlDotNet.Graphics.Font,System.Drawing.Color,System.Boolean)">
+ <summary>
+ Creates a new TextSprite given the text, font, color and anti-aliasing flag.
+ </summary>
+ <param name="textItem">Text to display</param>
+ <param name="font">The font to use when rendering.</param>
+ <param name="color">Color of Text</param>
+ <param name="antiAlias">A flag determining if it's to
+ use anti-aliasing when rendering. Defaults to true.</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.TextSprite.#ctor(System.String,SdlDotNet.Graphics.Font,System.Drawing.Color,System.Drawing.Color)">
+ <summary>
+ Creates a new TextSprite given the text, font, color and background color.
+ </summary>
+ ...
[truncated message content] |
|
From: <je...@us...> - 2008-03-18 21:32:39
|
Revision: 243
http://freetrain.svn.sourceforge.net/freetrain/?rev=243&view=rev
Author: jendave
Date: 2008-03-18 14:32:22 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
fixed disposed() pattern
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-18 21:03:39 UTC (rev 242)
+++ branches/FreeTrainSDL/Program.cs 2008-03-18 21:32:22 UTC (rev 243)
@@ -42,7 +42,7 @@
namespace FreeTrainSDL
{
- public class FreeTrainSDL : IDisposable
+ class FreeTrainSDL : IDisposable
{
#region Private fields
@@ -115,7 +115,9 @@
controller = MainWindow.mainWindow.currentController;
qView.updateScreen();
- if (World.world.satellite == null || World.world.satellite.surface.w != 150 || World.world.satellite.surface.h != 150)
+ if (World.world.satellite == null ||
+ World.world.satellite.surface.w != 150 ||
+ World.world.satellite.surface.h != 150)
{
World.world.satellite = new Surface(150, 150, 32);
World.world.satellite.sourceColorKey = Color.Magenta;
@@ -235,10 +237,6 @@
screen.Update();
}
- private void weatherTimer_Tick(object sender, System.EventArgs e)
- {
- }
-
private void GUIButtonClick(object sender, EventArgs e)
{
switch ((string)sender)
@@ -265,10 +263,6 @@
}
}
- private void qview_OnUpdated(object sender, EventArgs e)
- {
- }
-
private bool scrollByDrag(Point curMousePos)
{
int dragAccel = 1;
@@ -371,8 +365,7 @@
finalDraw();
qView.draw(new Rectangle(0, 0, world.size.x * 32 - 16, (world.size.y - 2 * world.size.z - 1) * 8), null);
- qView.OnUpdated += new EventHandler(qview_OnUpdated);
-
+
gui.SHOW_SPLASH = false;
timer.Tick += new EventHandler(timerTick);
@@ -385,14 +378,54 @@
#endregion
- #region Public Methods
+ #region IDisposable Members
+ private bool disposed;
+
+ /// <summary>
+ /// Destroy object
+ /// </summary>
public void Dispose()
{
- weatherOverlay.Dispose();
+ this.Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Destroy object
+ /// </summary>
+ public void Close()
+ {
Dispose();
}
+ /// <summary>
+ /// Destroy object
+ /// </summary>
+ ~FreeTrainSDL()
+ {
+ Dispose(false);
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="disposing"></param>
+ protected virtual void Dispose(bool disposing)
+ {
+ if (!this.disposed)
+ {
+ if (disposing)
+ {
+ if (this.weatherOverlay != null)
+ {
+ this.weatherOverlay.Dispose();
+ this.weatherOverlay = null;
+ }
+ }
+ this.disposed = true;
+ }
+ }
+
#endregion
}
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs 2008-03-18 21:03:39 UTC (rev 242)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs 2008-03-18 21:32:22 UTC (rev 243)
@@ -277,7 +277,7 @@
this.MinimizeBox = false;
this.Name = "ColorConfigDialog";
this.ShowInTaskbar = false;
- this.Text = "Color test train settings";
+ this.Text = "Color Test Train Settings";
((System.ComponentModel.ISupportInitialize)(this.boxBase)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.boxLine1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.boxLine2)).EndInit();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-19 18:09:06
|
Revision: 244
http://freetrain.svn.sourceforge.net/freetrain/?rev=244&view=rev
Author: jendave
Date: 2008-03-19 11:09:05 -0700 (Wed, 19 Mar 2008)
Log Message:
-----------
Renamed some methods. Fixed problem with buttons
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
branches/FreeTrainSDL/core/world/accounting/AccountGenre.cs
branches/FreeTrainSDL/core/world/accounting/AccountManager.cs
branches/FreeTrainSDL/core/world/accounting/AccountSummaryWindow.cs
branches/FreeTrainSDL/core/world/rail/Platform.cs
branches/FreeTrainSDL/core/world/rail/SingleRailRoad.cs
branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs
branches/FreeTrainSDL/core/world/rail/Station.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/Program.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -157,7 +157,7 @@
private void MouseButtonDown(object sender, MouseButtonEventArgs e)
{
lastMouseState = e.ButtonPressed;
- if (e.Button == MouseButton.PrimaryButton && !dragMode)
+ if (e.Button == MouseButton.SecondaryButton && !dragMode)
{
dragMode = true;
dragStartMousePosition = new Point(e.X, e.Y);
@@ -185,7 +185,7 @@
Point ab = qView.fromClientToAB(e.X + ScrollPosition.X, e.Y + ScrollPosition.Y);
Location xyz = qView.fromABToXYZ(ab, controller);
- if (e.Button == MouseButton.SecondaryButton) controller.onClick(null, xyz, ab);
+ if (e.Button == MouseButton.PrimaryButton) controller.onClick(null, xyz, ab);
}
}
}
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-19 18:09:05 UTC (rev 244)
@@ -992,6 +992,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <None Include="ClassDiagram1.cd" />
<None Include="FreeTrainSdl.snk" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Modified: branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -259,7 +259,7 @@
if (v != null && !v.entity.isOwned && v.entity.isSilentlyReclaimable)
{
// remove the old structure if possible
- AccountGenre.SUBSIDIARIES.spend(v.entity.entityValue);
+ AccountGenre.Subsidiaries.Spend(v.entity.entityValue);
v.entity.remove();
}
v = World.world[x, y, z];
@@ -267,7 +267,7 @@
if (v == null)
{
// buy it
- AccountGenre.SUBSIDIARIES.spend(World.world.landValue[new Location(x, y, z)]);
+ AccountGenre.Subsidiaries.Spend(World.world.landValue[new Location(x, y, z)]);
new LandPropertyVoxel(new Location(x, y, z));
}
}
@@ -321,7 +321,7 @@
LandPropertyVoxel v = World.world[x, y, z] as LandPropertyVoxel;
if (v != null)
{
- AccountGenre.SUBSIDIARIES.earn(v.landPrice);
+ AccountGenre.Subsidiaries.Earn(v.landPrice);
v.remove();
}
}
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -147,8 +147,8 @@
this.message.TabIndex = 1;
this.message.Text = "Click on two points on the map to place tracks";
this.message.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.message.MouseDown += new MouseEventHandler(this.AbstractControllerForm_MouseDown);
- this.message.MouseMove += new MouseEventHandler(this.AbstractControllerForm_MouseMove);
+ //this.message.MouseDown += new MouseEventHandler(this.AbstractControllerForm_MouseDown);
+ //this.message.MouseMove += new MouseEventHandler(this.AbstractControllerForm_MouseMove);
//
// buttonPlace
//
@@ -191,8 +191,8 @@
this.costBox.Name = "costBox";
this.costBox.Size = new System.Drawing.Size(105, 25);
this.costBox.TabIndex = 4;
- this.costBox.MouseDown += new MouseEventHandler(this.AbstractControllerForm_MouseDown);
- this.costBox.MouseMove += new MouseEventHandler(this.AbstractControllerForm_MouseMove);
+ //this.costBox.MouseDown += new MouseEventHandler(this.AbstractControllerForm_MouseDown);
+ //this.costBox.MouseMove += new MouseEventHandler(this.AbstractControllerForm_MouseMove);
//
// RailRoadController
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -621,7 +621,7 @@
FreeTrain.Framework.sound.SoundEffectManager
.PlaySynchronousSound(ResourceUtil.findSystemResource("vehiclePurchase.wav"));
- AccountManager.theInstance.spend(getTotalPrice(), AccountGenre.RAIL_SERVICE);
+ AccountManager.theInstance.spend(getTotalPrice(), AccountGenre.RailService);
// set count to 0 to avoid accidental purchase
count.Value = 0;
Modified: branches/FreeTrainSDL/core/world/accounting/AccountGenre.cs
===================================================================
--- branches/FreeTrainSDL/core/world/accounting/AccountGenre.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/world/accounting/AccountGenre.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -54,7 +54,7 @@
/// <summary>
/// Get the transaction history of this genre.
/// </summary>
- public TransactionHistory history
+ public TransactionHistory History
{
get
{
@@ -78,7 +78,7 @@
/// Short-cut to the <code>AccountManager.spend</code> method.
/// </summary>
/// <param name="delta"></param>
- public void spend(long delta)
+ public void Spend(long delta)
{
AccountManager.theInstance.spend(delta, this);
}
@@ -87,7 +87,7 @@
/// Short-cut to the <code>AccountManager.earn</code> method.
/// </summary>
/// <param name="delta"></param>
- public void earn(long delta)
+ public void Earn(long delta)
{
AccountManager.theInstance.earn(delta, this);
}
@@ -104,7 +104,7 @@
/// <summary>
///
/// </summary>
- public static AccountGenre RAIL_SERVICE
+ public static AccountGenre RailService
{
get
{
@@ -116,7 +116,7 @@
///
///
/// </summary>
- public static AccountGenre ROAD_SERVICE
+ public static AccountGenre RoadService
{
get
{
@@ -127,7 +127,7 @@
/// <summary>
///
/// </summary>
- public static AccountGenre SUBSIDIARIES
+ public static AccountGenre Subsidiaries
{
get
{
@@ -138,7 +138,7 @@
/// <summary>
///
/// </summary>
- public static AccountGenre OTHERS
+ public static AccountGenre Others
{
get
{
Modified: branches/FreeTrainSDL/core/world/accounting/AccountManager.cs
===================================================================
--- branches/FreeTrainSDL/core/world/accounting/AccountManager.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/world/accounting/AccountManager.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -117,7 +117,7 @@
public void spend(long delta, AccountGenre genre)
{
transact(delta, genre);
- genre.history.spend(delta);
+ genre.History.spend(delta);
if (genre.onUpdate != null) genre.onUpdate();
if (onAccountChange != null) onAccountChange();
}
@@ -129,7 +129,7 @@
public void earn(long delta, AccountGenre genre)
{
transact(-delta, genre);
- genre.history.earn(delta);
+ genre.History.earn(delta);
if (genre.onUpdate != null) genre.onUpdate();
if (onAccountChange != null) onAccountChange();
}
Modified: branches/FreeTrainSDL/core/world/accounting/AccountSummaryWindow.cs
===================================================================
--- branches/FreeTrainSDL/core/world/accounting/AccountSummaryWindow.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/world/accounting/AccountSummaryWindow.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -466,7 +466,7 @@
private readonly AccountSummaryWindow parent;
/// <summary> History object that whose value we are displaying. </summary>
- private TransactionHistory history { get { return genre.history; } }
+ private TransactionHistory history { get { return genre.History; } }
internal GenreListItem(AccountSummaryWindow _parent, AccountGenre genre)
{
@@ -539,9 +539,9 @@
// recover from missing plug-in error by returning a default list.
Debug.WriteLine(e.StackTrace);
return new AccountGenre[] {
- AccountGenre.RAIL_SERVICE,
- AccountGenre.ROAD_SERVICE,
- AccountGenre.SUBSIDIARIES
+ AccountGenre.RailService,
+ AccountGenre.RoadService,
+ AccountGenre.Subsidiaries
};
}
}
Modified: branches/FreeTrainSDL/core/world/rail/Platform.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/Platform.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/world/rail/Platform.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -197,7 +197,7 @@
public void onClockPerDay()
{
// charge the cost
- AccountManager.theInstance.spend(18 * length, AccountGenre.RAIL_SERVICE);
+ AccountManager.theInstance.spend(18 * length, AccountGenre.RailService);
}
Modified: branches/FreeTrainSDL/core/world/rail/SingleRailRoad.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/SingleRailRoad.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/world/rail/SingleRailRoad.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -279,7 +279,7 @@
here = here.toward(there);
}
- Accounting.AccountGenre.RAIL_SERVICE.spend(cost); // charge the cost
+ Accounting.AccountGenre.RailService.Spend(cost); // charge the cost
return true;
}
@@ -324,7 +324,7 @@
Direction d = here.getDirectionTo(there);
// charge the cost first.
- Accounting.AccountGenre.RAIL_SERVICE.spend(calcCostOfRemoving(here, there));
+ Accounting.AccountGenre.RailService.Spend(calcCostOfRemoving(here, there));
while (true)
{
Modified: branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -207,7 +207,7 @@
Debug.Assert(canCreateSlope(_base, dir));
// charge the cost before we alter something
- Accounting.AccountGenre.RAIL_SERVICE.spend(calcCostOfNewSlope(_base, dir));
+ Accounting.AccountGenre.RailService.Spend(calcCostOfNewSlope(_base, dir));
SlopeEntity entity = new SlopeEntity(_base, dir);
@@ -416,7 +416,7 @@
Debug.Assert(canRemoveSlope(loc, dir));
// charge the cost before we alter something
- Accounting.AccountGenre.RAIL_SERVICE.spend(calcCostOfTearDownSlope(loc, dir));
+ Accounting.AccountGenre.RailService.Spend(calcCostOfTearDownSlope(loc, dir));
for (int i = 0; i < 4; i++)
{
Modified: branches/FreeTrainSDL/core/world/rail/Station.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/Station.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/world/rail/Station.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -204,7 +204,7 @@
private void onDayClock()
{
// called once a day. charge the operation cost
- AccountManager.theInstance.spend(type.operationCost, AccountGenre.RAIL_SERVICE);
+ AccountManager.theInstance.spend(type.operationCost, AccountGenre.RailService);
}
@@ -420,7 +420,7 @@
public void clockHandlerDay()
{
// called once a day. charge the operation cost
- AccountManager.theInstance.spend(type.operationCost, AccountGenre.RAIL_SERVICE);
+ AccountManager.theInstance.spend(type.operationCost, AccountGenre.RailService);
import.DailyReset();
export.DailyReset();
trains.DailyReset();
Modified: branches/FreeTrainSDL/core/world/rail/Train.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -384,7 +384,7 @@
if (((moveCount++) & 15) == 0)
{
// TODO: exact amount is still under debate
- AccountManager.theInstance.spend(length * 20 + (passenger / 20), AccountGenre.RAIL_SERVICE);
+ AccountManager.theInstance.spend(length * 20 + (passenger / 20), AccountGenre.RailService);
}
playSound(thudSound);
@@ -480,7 +480,7 @@
// record the sales
AccountManager.theInstance.earn(
r * type.fare * dist / 5000,
- AccountGenre.RAIL_SERVICE);
+ AccountGenre.RailService);
passengerSourceState = null;
}
Modified: branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs
===================================================================
--- branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs 2008-03-18 21:32:22 UTC (rev 243)
+++ branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs 2008-03-19 18:09:05 UTC (rev 244)
@@ -115,7 +115,7 @@
_isOwned = false;
SubsidiaryMarket.SELL.remove(this);
- AccountGenre.SUBSIDIARIES.earn(currentMarketPrice);
+ AccountGenre.Subsidiaries.Earn(currentMarketPrice);
}
/// <summary>
@@ -132,7 +132,7 @@
SubsidiaryMarket.BUY.remove(this);
SubsidiaryMarket.SELL.add(this);
- AccountGenre.SUBSIDIARIES.spend(currentMarketPrice);
+ AccountGenre.Subsidiaries.Spend(currentMarketPrice);
}
/// <summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-19 21:51:30
|
Revision: 245
http://freetrain.svn.sourceforge.net/freetrain/?rev=245&view=rev
Author: jendave
Date: 2008-03-19 14:51:34 -0700 (Wed, 19 Mar 2008)
Log Message:
-----------
namespace fixes
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/SDLGUI.cs
branches/FreeTrainSDL/SDLGUIButton.cs
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs
branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs
branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs
branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs
branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs
branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs
branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs
branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs
branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs
branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs
branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs
branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs
branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
branches/FreeTrainSDL/core/controllers/road/RoadController.cs
branches/FreeTrainSDL/core/framework/Core.cs
branches/FreeTrainSDL/core/framework/MainWindow.cs
branches/FreeTrainSDL/core/framework/ResourceUtil.cs
branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs
branches/FreeTrainSDL/core/world/structs/StationListenerImpl.cs
branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.structure.hv.oldhouse/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.structure.c477/plugin.xml
Added Paths:
-----------
branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs
Removed Paths:
-------------
branches/FreeTrainSDL/core/contributions/population/Population.cs
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-19 21:51:34 UTC (rev 245)
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FreeTrain</RootNamespace>
<AssemblyName>FreeTrainSDL</AssemblyName>
- <StartupObject>FreeTrainSDL.FreeTrainSDL</StartupObject>
+ <StartupObject>FreeTrain.FreeTrainSDL</StartupObject>
<PublishUrl>http://localhost/FreeTrainSDL/</PublishUrl>
<Install>true</Install>
<InstallFrom>Web</InstallFrom>
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/Program.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -40,7 +40,7 @@
using FreeTrain.Framework;
using FreeTrain.Views;
-namespace FreeTrainSDL
+namespace FreeTrain
{
class FreeTrainSDL : IDisposable
{
@@ -372,6 +372,8 @@
timer.Interval = 33;
timer.Enabled = true;
timer.Start();
+ //ControlPanel controlPanel = new ControlPanel();
+ //controlPanel.Show();
Events.Run();
}
Modified: branches/FreeTrainSDL/SDLGUI.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUI.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/SDLGUI.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -28,7 +28,7 @@
using Tao.Sdl;
using SDL.net;
-namespace FreeTrainSDL
+namespace FreeTrain
{
public class SDLGUI
{
Modified: branches/FreeTrainSDL/SDLGUIButton.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUIButton.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/SDLGUIButton.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -28,7 +28,7 @@
using Tao.Sdl;
using SDL.net;
-namespace FreeTrainSDL
+namespace FreeTrain
{
class SDLGUIButton
{
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-19 21:51:34 UTC (rev 245)
@@ -155,6 +155,7 @@
<Compile Include="contributions\population\AgriculturalPopulation.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="contributions\population\BasePopulation.cs" />
<Compile Include="contributions\population\CombinationPopulation.cs">
<SubType>Code</SubType>
</Compile>
@@ -173,9 +174,6 @@
<Compile Include="contributions\population\PersistentPopulation.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="contributions\population\Population.cs">
- <SubType>Code</SubType>
- </Compile>
<Compile Include="contributions\population\ResidentialPopulation.cs">
<SubType>Code</SubType>
</Compile>
@@ -992,7 +990,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <None Include="ClassDiagram1.cd" />
<None Include="FreeTrainSdl.snk" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Modified: branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -22,7 +22,7 @@
using System.Drawing;
using FreeTrain.Framework.graphics;
using FreeTrain.Controllers;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
namespace FreeTrain.Contributions.Common
{
@@ -35,7 +35,7 @@
/// <summary>
/// Population of this structure, or null if this structure is not populated.
/// </summary>
- Population population { get; }
+ BasePopulation population { get; }
/// <summary>
/// True if the computer (the development algorithm) is not allowed to
Modified: branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -23,7 +23,7 @@
using System.Runtime.Serialization;
using System.Xml;
using FreeTrain.Util;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
using FreeTrain.Controllers;
using FreeTrain.Framework.plugin;
using FreeTrain.Framework.graphics;
@@ -115,7 +115,7 @@
/// <summary>
///
/// </summary>
- public virtual Population population { get { return core.population; } }
+ public virtual BasePopulation population { get { return core.population; } }
/// <summary>
/// True if the computer (the development algorithm) is not allowed to
@@ -187,12 +187,12 @@
XmlElement pop = (XmlElement)e.SelectSingleNode("population");
if (pop != null)
- _population = new PersistentPopulation(Population.load(pop),
+ _population = new PersistentPopulation(BasePopulation.load(pop),
new PopulationReferenceImpl(ownerId));
}
- private readonly Population _population;
+ private readonly BasePopulation _population;
private readonly bool _computerCannotBuild;
private readonly bool _playerCannotBuild;
private readonly string _name;
@@ -206,7 +206,7 @@
/// <summary>
///
/// </summary>
- public Population population { get { return _population; } }
+ public BasePopulation population { get { return _population; } }
/// <summary>
///
/// </summary>
Modified: branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -24,7 +24,7 @@
using System.Xml;
using SDL.net;
using FreeTrain.Controllers;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Views;
Modified: branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -22,7 +22,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.population
+namespace FreeTrain.Contributions.Population
{
/// <summary>
/// HourlyPopulation with a typical distribution for
Copied: branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs (from rev 243, branches/FreeTrainSDL/core/contributions/population/Population.cs)
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs (rev 0)
+++ branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -0,0 +1,66 @@
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.Runtime.Serialization;
+using System.Xml;
+using FreeTrain.Framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.Structs;
+
+namespace FreeTrain.Contributions.Population
+{
+ /// <summary>
+ /// Computes the population from the base population.
+ ///
+ /// The Population class has a special code to support de-serizliation.
+ /// We'd like the de-serialization of Population not to create a fresh
+ /// instance of Population, but we'd like it to resolve to the existing
+ /// instance.
+ ///
+ /// However, Population object doesn't know how to resolve to its running
+ /// instance. Thus it takes an IObjectReference as a parameter, which should
+ /// know how to resolve to the actual instance.
+ ///
+ /// During the serialization, this resolver is stored in place of the
+ /// population object and then asked to restore the reference.
+ /// </summary>
+ [Serializable]
+ public abstract class BasePopulation
+ {
+ /// <summary>
+ /// Number of population that is counted toward the total population of the world.
+ /// </summary>
+ public abstract int residents { get; }
+
+ /// <summary>
+ /// Computes the population of the given structure at the given time.
+ /// </summary>
+ public abstract int calcPopulation(Time currentTime);
+
+ /// <summary>
+ /// Loads a population from the plug-in manifest file.
+ /// </summary>
+ public static BasePopulation load(XmlElement e)
+ {
+ return (BasePopulation)PluginUtil.loadObjectFromManifest(e);
+ }
+ }
+}
Modified: branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -22,7 +22,7 @@
using System.Xml;
using FreeTrain.world;
-namespace FreeTrain.Contributions.population
+namespace FreeTrain.Contributions.Population
{
/// <summary>
/// Populaion that additively combines other populations.
@@ -39,9 +39,9 @@
/// ...
/// </population>
/// </summary>
- public class CombinationPopulation : Population
+ public class CombinationPopulation : BasePopulation
{
- private readonly Population[] children;
+ private readonly BasePopulation[] children;
/// <summary>
///
@@ -50,9 +50,9 @@
public CombinationPopulation(XmlElement e)
{
XmlNodeList nl = e.SelectNodes("population");
- children = new Population[nl.Count];
+ children = new BasePopulation[nl.Count];
for (int i = 0; i < nl.Count; i++)
- children[i] = Population.load((XmlElement)nl[i]);
+ children[i] = BasePopulation.load((XmlElement)nl[i]);
}
/// <summary>
///
@@ -62,7 +62,7 @@
get
{
int r = 0;
- foreach (Population p in children)
+ foreach (BasePopulation p in children)
r += p.residents;
return r;
}
@@ -75,7 +75,7 @@
public override int calcPopulation(Time currentTime)
{
int r = 0;
- foreach (Population p in children)
+ foreach (BasePopulation p in children)
r += p.calcPopulation(currentTime);
return r;
}
Modified: branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -24,13 +24,13 @@
using FreeTrain.world.Structs;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.population
+namespace FreeTrain.Contributions.Population
{
/// <summary>
/// Always the same population
/// </summary>
[Serializable]
- public class ConstantPopulation : Population
+ public class ConstantPopulation : BasePopulation
{
/// <summary>
///
Modified: branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -24,13 +24,13 @@
using FreeTrain.world.Structs;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.population
+namespace FreeTrain.Contributions.Population
{
/// <summary>
/// Population depends on hour of the day
/// </summary>
[Serializable]
- public class HourlyPopulation : Population
+ public class HourlyPopulation : BasePopulation
{
/// <summary>
///
Modified: branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -23,23 +23,23 @@
using FreeTrain.world;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.population
+namespace FreeTrain.Contributions.Population
{
/// <summary>
/// Multiplies another population by a constant factor.
/// This object is not-persistent.
/// </summary>
[Serializable]
- public class MultiplierPopulation : Population
+ public class MultiplierPopulation : BasePopulation
{
private readonly int factor;
- private readonly Population core;
+ private readonly BasePopulation core;
/// <summary>
///
/// </summary>
/// <param name="f"></param>
/// <param name="_core"></param>
- public MultiplierPopulation(int f, Population _core)
+ public MultiplierPopulation(int f, BasePopulation _core)
{
this.factor = f;
this.core = _core;
Modified: branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -22,7 +22,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.population
+namespace FreeTrain.Contributions.Population
{
/// <summary>
/// HourlyPopulation with a typical distribution for
Modified: branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -22,7 +22,7 @@
using System.Runtime.Serialization;
using FreeTrain.world;
-namespace FreeTrain.Contributions.population
+namespace FreeTrain.Contributions.Population
{
/// <summary>
/// Population implementation that wraps another Population and
@@ -32,9 +32,9 @@
/// to the existing PersistentPopulation object.
/// </summary>
[Serializable]
- public class PersistentPopulation : Population, ISerializable
+ public class PersistentPopulation : BasePopulation, ISerializable
{
- private readonly Population core;
+ private readonly BasePopulation core;
/// <summary>
/// Object used to restore the reference to this Population object.
@@ -50,7 +50,7 @@
/// This object needs to be serializable, and will be used to
/// restore reference correctly.
/// </param>
- public PersistentPopulation(Population _core, IObjectReference _ref)
+ public PersistentPopulation(BasePopulation _core, IObjectReference _ref)
{
this.core = _core;
this.resolver = _ref;
@@ -95,7 +95,7 @@
[Serializable]
internal class SerializationHelper : IObjectReference
{
- private Population reference = null;
+ private BasePopulation reference = null;
/// <summary>
///
/// </summary>
Deleted: branches/FreeTrainSDL/core/contributions/population/Population.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/Population.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/Population.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -1,66 +0,0 @@
-#region LICENSE
-/*
- * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#endregion LICENSE
-
-using System;
-using System.Runtime.Serialization;
-using System.Xml;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world;
-using FreeTrain.world.Structs;
-
-namespace FreeTrain.Contributions.population
-{
- /// <summary>
- /// Computes the population from the base population.
- ///
- /// The Population class has a special code to support de-serizliation.
- /// We'd like the de-serialization of Population not to create a fresh
- /// instance of Population, but we'd like it to resolve to the existing
- /// instance.
- ///
- /// However, Population object doesn't know how to resolve to its running
- /// instance. Thus it takes an IObjectReference as a parameter, which should
- /// know how to resolve to the actual instance.
- ///
- /// During the serialization, this resolver is stored in place of the
- /// population object and then asked to restore the reference.
- /// </summary>
- [Serializable]
- public abstract class Population
- {
- /// <summary>
- /// Number of population that is counted toward the total population of the world.
- /// </summary>
- public abstract int residents { get; }
-
- /// <summary>
- /// Computes the population of the given structure at the given time.
- /// </summary>
- public abstract int calcPopulation(Time currentTime);
-
- /// <summary>
- /// Loads a population from the plug-in manifest file.
- /// </summary>
- public static Population load(XmlElement e)
- {
- return (Population)PluginUtil.loadObjectFromManifest(e);
- }
- }
-}
Modified: branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -22,7 +22,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.population
+namespace FreeTrain.Contributions.Population
{
/// <summary>
/// HourlyPopulation with a typical distribution for
Modified: branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -22,7 +22,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.population
+namespace FreeTrain.Contributions.Population
{
/// <summary>
/// HourlyPopulation with a typical distribution for
Modified: branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -22,7 +22,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.population
+namespace FreeTrain.Contributions.Population
{
/// <summary>
/// HourlyPopulation with a typical distribution for
Modified: branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -23,7 +23,7 @@
using FreeTrain.Contributions.Common;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.sound;
+using FreeTrain.Framework.Sound;
using FreeTrain.world;
namespace FreeTrain.Contributions.Rail
Modified: branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -25,7 +25,7 @@
using FreeTrain.Framework.plugin;
using FreeTrain.Framework.graphics;
using FreeTrain.Controllers;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
namespace FreeTrain.Contributions.Rail
{
@@ -58,7 +58,7 @@
/// <summary>
///
/// </summary>
- public virtual Population population { get { return null; } }
+ public virtual BasePopulation population { get { return null; } }
/// <summary>
///
/// </summary>
Modified: branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -24,7 +24,7 @@
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.road
+namespace FreeTrain.Contributions.Road
{
/// <summary>
/// RoadContribution for "org.kohsuke.freetrain.road.pc-9801fa" plug-in
Modified: branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -28,7 +28,7 @@
using FreeTrain.world;
using FreeTrain.world.road;
-namespace FreeTrain.Contributions.road
+namespace FreeTrain.Contributions.Road
{
/// <summary>
/// Usual implementation of RoadContribution.
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -29,7 +29,7 @@
using FreeTrain.world;
using FreeTrain.world.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.sound;
+using FreeTrain.Framework.Sound;
using FreeTrain.Util.Controls;
using FreeTrain.Util.Command;
using SDL.net;
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -618,7 +618,7 @@
new Train(World.world.rootTrainGroup,
(int)length.Value, selectedTrain);
- FreeTrain.Framework.sound.SoundEffectManager
+ FreeTrain.Framework.Sound.SoundEffectManager
.PlaySynchronousSound(ResourceUtil.findSystemResource("vehiclePurchase.wav"));
AccountManager.theInstance.spend(getTotalPrice(), AccountGenre.RailService);
Modified: branches/FreeTrainSDL/core/controllers/road/RoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/road/RoadController.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/controllers/road/RoadController.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -24,7 +24,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.Contributions.road;
+using FreeTrain.Contributions.Road;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
using FreeTrain.Views.Map;
Modified: branches/FreeTrainSDL/core/framework/Core.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/Core.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/framework/Core.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -26,7 +26,7 @@
using System.Xml;
//using Microsoft.Win32;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.sound;
+using FreeTrain.Framework.Sound;
using FreeTrain.Util;
namespace FreeTrain.Framework
Modified: branches/FreeTrainSDL/core/framework/MainWindow.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -43,7 +43,7 @@
using FreeTrain.Controllers.Terrain;
using FreeTrain.Controllers.Structs;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.sound;
+using FreeTrain.Framework.Sound;
using FreeTrain.Framework.graphics;
using FreeTrain.Views;
using FreeTrain.Views.Map;
Modified: branches/FreeTrainSDL/core/framework/ResourceUtil.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -84,10 +84,10 @@
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
- public static Sound loadSystemSound(String name)
+ public static SdlDotNet.Audio.Sound loadSystemSound(String name)
{
// can't read from stream
- return new Sound(findSystemResource(name));
+ return new SdlDotNet.Audio.Sound(findSystemResource(name));
}
// using URI is essentially dangerous as Segment only support file names.
@@ -97,9 +97,9 @@
/// </summary>
/// <param name="uri"></param>
/// <returns></returns>
- public static Sound loadSound(Uri uri)
+ public static SdlDotNet.Audio.Sound loadSound(Uri uri)
{
- return new Sound(uri.LocalPath);
+ return new SdlDotNet.Audio.Sound(uri.LocalPath);
}
/// <summary>
///
Modified: branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -26,7 +26,7 @@
using SdlDotNet;
//using SDL.net;
-namespace FreeTrain.Framework.sound
+namespace FreeTrain.Framework.Sound
{
/// <summary>
/// SoundEffect object that handles multiple
@@ -45,7 +45,7 @@
/// <param name="seg">Sound-effect object</param>
/// <param name="concurrentPlaybackMax">Number of maximum concurrent playback.</param>
/// <param name="intervalTime">Interval between two successive playbacks</param>
- public RepeatableSoundEffectImpl(Sound seg, int concurrentPlaybackMax, int intervalTime)
+ public RepeatableSoundEffectImpl(SdlDotNet.Audio.Sound seg, int concurrentPlaybackMax, int intervalTime)
{
this.segment = seg;
this.concurrentPlaybackMax = concurrentPlaybackMax;
@@ -55,9 +55,9 @@
///
/// </summary>
/// <param name="seg"></param>
- public RepeatableSoundEffectImpl(Sound seg) : this(seg, 3, 200) { }
+ public RepeatableSoundEffectImpl(SdlDotNet.Audio.Sound seg) : this(seg, 3, 200) { }
- private readonly Sound segment;
+ private readonly SdlDotNet.Audio.Sound segment;
///// <summary>
///// SegmentState objects that represent the state
Modified: branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -21,7 +21,7 @@
using System;
using FreeTrain.world;
-namespace FreeTrain.Framework.sound
+namespace FreeTrain.Framework.Sound
{
/// <summary>
/// Sound Effect
Modified: branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -26,7 +26,7 @@
using SdlDotNet.Core;
//using SDL.net;
-namespace FreeTrain.Framework.sound
+namespace FreeTrain.Framework.Sound
{
/// <summary>
/// Coordinates sound effects.
@@ -101,10 +101,10 @@
// sndPlaySound(fileName,0);
try
{
- if (sounds.Contains(fileName)) { ((Sound)sounds[fileName]).Play(); }
+ if (sounds.Contains(fileName)) { ((SdlDotNet.Audio.Sound)sounds[fileName]).Play(); }
else
{
- Sound newSound = new Sound(fileName);
+ SdlDotNet.Audio.Sound newSound = new SdlDotNet.Audio.Sound(fileName);
sounds.Add(fileName, newSound);
newSound.Play();
}
@@ -127,10 +127,10 @@
//SDL.net.Audio.play(fileName);
try
{
- if (sounds.Contains(fileName)) { ((Sound)sounds[fileName]).Play(); }
+ if (sounds.Contains(fileName)) { ((SdlDotNet.Audio.Sound)sounds[fileName]).Play(); }
else
{
- Sound newSound = new Sound(fileName);
+ SdlDotNet.Audio.Sound newSound = new SdlDotNet.Audio.Sound(fileName);
sounds.Add(fileName, newSound);
newSound.Play();
}
@@ -148,7 +148,7 @@
}*/
//internal void play(Segment segment, int ms)
- internal void play(Sound segment, int ms)
+ internal void play(SdlDotNet.Audio.Sound segment, int ms)
{
try
{
Modified: branches/FreeTrainSDL/core/world/rail/Train.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -25,7 +25,7 @@
using SDL.net;
using FreeTrain.Contributions.Train;
using FreeTrain.Framework;
-using FreeTrain.Framework.sound;
+using FreeTrain.Framework.Sound;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world.Accounting;
Modified: branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs
===================================================================
--- branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using System.Drawing;
using FreeTrain.Framework;
-using FreeTrain.Framework.sound;
+using FreeTrain.Framework.Sound;
using FreeTrain.Framework.plugin;
using FreeTrain.Framework.graphics;
using SDL.net;
Modified: branches/FreeTrainSDL/core/world/structs/StationListenerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/world/structs/StationListenerImpl.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/world/structs/StationListenerImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -21,7 +21,7 @@
using System;
using System.Collections;
using System.Diagnostics;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
using FreeTrain.Framework.plugin;
using FreeTrain.world.Rail;
@@ -41,7 +41,7 @@
/// <param name="pop">Population pattern</param>
/// <param name="loc">The location used to decide if this object
/// can subscribe to a given station.</param>
- public StationListenerImpl(Population pop, Location loc)
+ public StationListenerImpl(BasePopulation pop, Location loc)
{
this.population = pop;
this.location = loc;
@@ -58,7 +58,7 @@
private readonly Location location;
- private readonly Population population;
+ private readonly BasePopulation population;
/// <summary>
Modified: branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs
===================================================================
--- branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using FreeTrain.Contributions.Structs;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
using FreeTrain.Framework;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -30,7 +30,7 @@
using FreeTrain.Controllers.Structs;
using FreeTrain.Contributions;
using FreeTrain.Contributions.Common;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
using FreeTrain.Contributions.Structs;
using FreeTrain.Views;
using FreeTrain.Views.Map;
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -30,7 +30,7 @@
using FreeTrain.Controllers.Structs;
using FreeTrain.Contributions;
using FreeTrain.Contributions.Common;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
using FreeTrain.Contributions.Structs;
using FreeTrain.Views;
using FreeTrain.Views.Map;
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -28,7 +28,7 @@
using FreeTrain.Controllers;
using FreeTrain.Contributions;
using FreeTrain.Contributions.Common;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
using FreeTrain.Contributions.Structs;
using FreeTrain.Contributions.Land;
using FreeTrain.Framework;
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Contributions.Common;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
using FreeTrain.Framework.plugin.graphics;
@@ -608,7 +608,7 @@
///
/// </summary>
[CLSCompliant(false)]
- public virtual Population population
+ public virtual BasePopulation population
{
get { return contrib.population; }
}
@@ -650,7 +650,7 @@
/// <summary>
///
/// </summary>
- public override Population population { get { return null; } }
+ public override BasePopulation population { get { return null; } }
}
#endregion
#region SpriteSet
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.structure.hv.oldhouse/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.structure.hv.oldhouse/plugin.xml 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.structure.hv.oldhouse/plugin.xml 2008-03-19 21:51:34 UTC (rev 245)
@@ -2,13 +2,13 @@
<!DOCTYPE plug-in [
<!ENTITY housePopulation3 '
<population>
- <class name="FreeTrain.Contributions.population.ResidentialPopulation"/>
+ <class name="FreeTrain.Contributions.Population.ResidentialPopulation"/>
<base>3</base>
</population>
'>
<!ENTITY housePopulation6 '
<population>
- <class name="FreeTrain.Contributions.population.ResidentialPopulation"/>
+ <class name="FreeTrain.Contributions.Population.ResidentialPopulation"/>
<base>6</base>
</population>
'>
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs 2008-03-19 21:51:34 UTC (rev 245)
@@ -24,7 +24,7 @@
using System.Xml;
using SDL.net;
using FreeTrain.Contributions.Land;
-using FreeTrain.Contributions.population;
+using FreeTrain.Contributions.Population;
using FreeTrain.Controllers;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml 2008-03-19 21:51:34 UTC (rev 245)
@@ -2,7 +2,7 @@
<!DOCTYPE plug-in [
<!ENTITY Population '
<population>
- <class name="FreeTrain.Contributions.population.ResidentialPopulation"/>
+ <class name="FreeTrain.Contributions.Population.ResidentialPopulation"/>
<base>10</base>
</population>
'>
@@ -23,7 +23,7 @@
<picture ref="{5981B3EA-5CCF-4DB2-94DC-B7EC854987D7}" offset="0" />
<price>20</price>
<population>
- <class name="FreeTrain.Contributions.population.AgriculturalPopulation"/>
+ <class name="FreeTrain.Contributions.Population.AgriculturalPopulation"/>
<base>5</base>
</population>
</contribution>
@@ -35,7 +35,7 @@
<picture ref="{5981B3EA-5CCF-4DB2-94DC-B7EC854987D7}" offset="32" />
<price>20</price>
<population>
- <class name="FreeTrain.Contributions.population.AgriculturalPopulation"/>
+ <class name="FreeTrain.Contributions.Population.AgriculturalPopulation"/>
<base>5</base>
</population>
</contribution>
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.structure.c477/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.structure.c477/plugin.xml 2008-03-19 18:09:05 UTC (rev 244)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.structure.c477/plugin.xml 2008-03-19 21:51:34 UTC (rev 245)
@@ -46,19 +46,19 @@
<!ENTITY smallBuildingPopulation '
<population>
- <class name="FreeTrain.Contributions.population.OfficePopulation"/>
+ <class name="FreeTrain.Contributions.Population.OfficePopulation"/>
<base>35</base>
</population>
'>
<!ENTITY officeBuildingAPopulation '
<population>
- <class name="FreeTrain.Contributions.population.OfficePopulation"/>
+ <class name="FreeTrain.Contributions.Population.OfficePopulation"/>
<base>200</base>
</population>
'>
<!ENTITY officeBuildingWithHeliportPopulation '
<population>
- <class name="FreeTrain.Contributions.population.OfficePopulation"/>
+ <class name="FreeTrain.Contributions.Population.OfficePopulation"/>
<base>250</base>
</population>
'>
@@ -91,7 +91,7 @@
<size>1,1</size>
<height>1</height>
<population>
- <class name="FreeTrain.Contributions.population.ShopperPopulation"/>
+ <class name="FreeTrain.Contributions.Population.ShopperPopulation"/>
<base>35</base>
</population>
<sprite origin="0,0" offset="16">
@@ -114,7 +114,7 @@
<size>2,2</size>
<height>3</height>
<population>
- <class name="FreeTrain.Contributions.population.ShopperPopulation"/>
+ <class name="FreeTrain.Contributions.Population.ShopperPopulation"/>
<base>600</base>
</population>
<sprite origin="0,0" offset="49">
@@ -141,7 +141,7 @@
<picture ref="{C9FC2889-10D0-4699-ACB6-C62A4273BED9}" />
</sprite>
<population>
- <class name="FreeTrain.Contributions.population.ResidentialPopulation"/>
+ <class name="FreeTrain.Contributions.Population.ResidentialPopulation"/>
<base>200</base>
</population>
</contribution>
@@ -162,7 +162,7 @@
<picture ref="{A2C5271D-9EED-47AE-A5BB-A1BA0B776186}" />
</sprite>
<population>
- <class name="FreeTrain.Contributions.population.ResidentialPopulation"/>
+ <class name="FreeTrain.Contributions.Population.ResidentialPopulation"/>
<base>10</base>
</population>
</contribution>
@@ -183,7 +183,7 @@
<size>2,2</size>
<height>3</height>
<population>
- <class name="FreeTrain.Contributions.population.OfficePopulation"/>
+ <class name="FreeTrain.Contributions.Population.OfficePopulation"/>
<base>300</base>
</population>
&crSilver;
@@ -321,13 +321,13 @@
<minHeight>3</minHeight>
<maxHeight>10</maxHeight>
<population>
- <class name="FreeTrain.Contributions.population.CombinationPopulation"/>
+ <class name="FreeTrain.Contributions.Population.CombinationPopulation"/>
<population>
- <class name="FreeTrain.Contributions.population.OfficePopulation"/>
+ <class name="FreeTrain.Contributions.Population.OfficePopulation"/>
<base>1200</base>
</population>
<population>
- <class name="FreeTrain.Contributions.population.ShopperPopulation"/>
+ <class name="FreeTrain.Contributions.Population.ShopperPopulation"/>
<base>300</base>
</population>
</population>
@@ -394,13 +394,13 @@
<minHeight>3</minHeight>
<maxHeight>10</maxHeight>
<population>
- <class name="FreeTrain.Contributions.population.CombinationPopulation"/>
+ <class name="FreeTrain.Contributions.Population.CombinationPopulation"/>
<population>
- <class name="FreeTrain.Contributions.population.OfficePopulation"/>
+ <class name="FreeTrain.Contributions.Population.OfficePopulation"/>
<base>1000</base>
</population>
<population>
- <class name="FreeTrain.Contributions.population.ShopperPopulation"/>
+ <class name="FreeTrain.Contributions.Population.ShopperPopulation"/>
<base>200</base>
</population>
</population>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-19 22:24:35
|
Revision: 246
http://freetrain.svn.sourceforge.net/freetrain/?rev=246&view=rev
Author: jendave
Date: 2008-03-19 15:24:35 -0700 (Wed, 19 Mar 2008)
Log Message:
-----------
More namespace fixes
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs
branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs
branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs
branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs
branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
branches/FreeTrainSDL/core/controllers/land/LandController.cs
branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
branches/FreeTrainSDL/core/controllers/road/RoadController.cs
branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs
branches/FreeTrainSDL/core/framework/MainWindow.cs
branches/FreeTrainSDL/core/framework/ResourceUtil.cs
branches/FreeTrainSDL/core/framework/Splash.cs
branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
branches/FreeTrainSDL/core/framework/graphics/ColorLibrary.cs
branches/FreeTrainSDL/core/framework/graphics/ColorMap.cs
branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs
branches/FreeTrainSDL/core/framework/graphics/DefaultSpriteLoaderContributionImpl.cs
branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs
branches/FreeTrainSDL/core/framework/graphics/DirtyRect.cs
branches/FreeTrainSDL/core/framework/graphics/GraphicsException.cs
branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs
branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Picture.cs
branches/FreeTrainSDL/core/framework/graphics/PictureManager.cs
branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs
branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Sprite.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteFactory.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteLoaderContribution.cs
branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs
branches/FreeTrainSDL/core/framework/plugin/Contribution.cs
branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
branches/FreeTrainSDL/core/framework/plugin/PluginUtil.cs
branches/FreeTrainSDL/core/views/GlobalViewOptions.cs
branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs
branches/FreeTrainSDL/core/views/WeatherOverlaySpriteSet.cs
branches/FreeTrainSDL/core/views/map/MapView.cs
branches/FreeTrainSDL/core/world/Clock.cs
branches/FreeTrainSDL/core/world/RRCrossing.cs
branches/FreeTrainSDL/core/world/Traffic.cs
branches/FreeTrainSDL/core/world/Voxel.cs
branches/FreeTrainSDL/core/world/World.cs
branches/FreeTrainSDL/core/world/development/LandValue.cs
branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
branches/FreeTrainSDL/core/world/rail/FatPlatform.cs
branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs
branches/FreeTrainSDL/core/world/rail/RailPattern.cs
branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs
branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
branches/FreeTrainSDL/core/world/road/Bus.cs
branches/FreeTrainSDL/core/world/road/Road.cs
branches/FreeTrainSDL/core/world/road/RoadPattern.cs
branches/FreeTrainSDL/core/world/road/RoadStyle.cs
branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs
branches/FreeTrainSDL/core/world/structs/PThreeDimStructure.cs
branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs
branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HueShiftSprite.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigCommand.cs
branches/FreeTrainSDL/plugins/system/plugin.xml
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-19 22:24:35 UTC (rev 246)
@@ -86,6 +86,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
+ <None Include="ClassDiagram1.cd" />
<None Include="FreeTrainSdl.snk" />
</ItemGroup>
<ItemGroup>
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Util;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Controllers;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Windows.Forms;
using FreeTrain.Controllers;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
using FreeTrain.world;
using FreeTrain.world.Structs;
Modified: branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -20,7 +20,7 @@
using System;
using System.Drawing;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Controllers;
using FreeTrain.Contributions.Population;
Modified: branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Xml;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Contributions.Common
{
Modified: branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using FreeTrain.Contributions.Population;
using FreeTrain.Controllers;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.world;
using FreeTrain.world.Structs;
using SDL.net;
@@ -232,7 +232,7 @@
/// </summary>
/// <param name="pixelSize"></param>
/// <returns></returns>
- public virtual FreeTrain.Framework.graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize)
+ public virtual FreeTrain.Framework.Graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize)
{
throw new NotImplementedException();
}
Modified: branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using System.Xml;
using SDL.net;
using FreeTrain.Controllers;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Framework;
using FreeTrain.Views;
Modified: branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using System.Windows.Forms;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
using FreeTrain.Controllers;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -28,7 +28,7 @@
using FreeTrain.Contributions.Common;
using FreeTrain.Controllers;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
namespace FreeTrain.Contributions.Land
Modified: branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using SDL.net;
using FreeTrain.Controllers;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
using FreeTrain.world;
using FreeTrain.world.Land;
Modified: branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using SDL.net;
using FreeTrain.Controllers;
using FreeTrain.Contributions.Population;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Views;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Runtime.Serialization;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.world;
using FreeTrain.world.Structs;
Modified: branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Drawing;
using FreeTrain.Contributions.Common;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Controllers;
using FreeTrain.Contributions.Population;
@@ -80,7 +80,7 @@
/// </summary>
/// <param name="pixelSize"></param>
/// <returns></returns>
- public abstract FreeTrain.Framework.graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize);
+ public abstract FreeTrain.Framework.Graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize);
/// <summary>
///
/// </summary>
Modified: branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,8 +21,8 @@
using System;
using System.Drawing;
using System.Xml;
-using FreeTrain.Framework.graphics;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Graphics;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Road
{
Modified: branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,10 +23,10 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Graphics;
+using FreeTrain.Framework.Plugin;
using FreeTrain.world;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
namespace FreeTrain.Contributions.Road
{
@@ -103,7 +103,7 @@
Location here = from;
while (true)
{
- Road r = Road.get(here);
+ BaseRoad r = BaseRoad.get(here);
if (r == null)
{
RoadPattern p = RoadPattern.getStraight(d);
@@ -126,7 +126,7 @@
/// <summary>
/// Creates a new road with a given pattern.
/// </summary>
- protected virtual Road create(TrafficVoxel voxel, RoadPattern pattern)
+ protected virtual BaseRoad create(TrafficVoxel voxel, RoadPattern pattern)
{
return new RoadImpl(this, voxel, pattern);
}
@@ -144,7 +144,7 @@
while (true)
{
- Road r = Road.get(here);
+ BaseRoad r = BaseRoad.get(here);
if (r != null)
r.detach(d, d.opposite);
@@ -212,7 +212,7 @@
/// Road implementation
/// </summary>
[Serializable]
- internal class RoadImpl : Road
+ internal class RoadImpl : BaseRoad
{
/// <summary>
///
Modified: branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,11 +23,11 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Contributions.Common;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.world;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
-namespace FreeTrain.Contributions.road
+namespace FreeTrain.Contributions.Road
{
/// <summary>
/// Road for cars/buses
Modified: branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,12 +23,12 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
-namespace FreeTrain.Contributions.road
+namespace FreeTrain.Contributions.Road
{
/// <summary>
/// RoadContribution implemented by 15 sprites.
Modified: branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using FreeTrain.Util;
using FreeTrain.Controllers;
using FreeTrain.Contributions.Common;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world;
using FreeTrain.world.Structs;
Modified: branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.world;
using SDL.net;
Modified: branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Contributions.Common;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world;
using SDL.net;
Modified: branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world;
using SDL.net;
Modified: branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.world;
using FreeTrain.world.Rail;
Modified: branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using System.Windows.Forms;
using FreeTrain.Contributions.Common;
using FreeTrain.Contributions.Rail;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Views;
using FreeTrain.Views.Map;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -32,7 +32,7 @@
using FreeTrain.world;
using FreeTrain.world.Terrain;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/controllers/land/LandController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/land/LandController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -32,7 +32,7 @@
using FreeTrain.world;
using FreeTrain.world.Terrain;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -30,7 +30,7 @@
using FreeTrain.world.Accounting;
using FreeTrain.world.Land;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,8 +26,8 @@
using FreeTrain.Contributions.Common;
using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Graphics;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Util;
using FreeTrain.world;
using FreeTrain.world.Rail;
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using System.ComponentModel;
using System.Windows.Forms;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
using FreeTrain.world;
using FreeTrain.world.Rail;
Modified: branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using System.ComponentModel;
using System.Windows.Forms;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
using FreeTrain.world;
using FreeTrain.world.Rail;
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using System.Windows.Forms;
using FreeTrain.Contributions.Train;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Views;
using FreeTrain.world.Accounting;
Modified: branches/FreeTrainSDL/core/controllers/road/RoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/road/RoadController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/road/RoadController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,10 +26,10 @@
using System.Windows.Forms;
using FreeTrain.Contributions.Road;
using FreeTrain.Framework;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Views.Map;
using FreeTrain.world;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
using FreeTrain.Contributions.Common;
namespace FreeTrain.Controllers.Road
Modified: branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using System.Windows.Forms;
using FreeTrain.Contributions.Common;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Views.Map;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -31,7 +31,7 @@
using FreeTrain.world.Structs;
using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -29,7 +29,7 @@
using FreeTrain.world;
using FreeTrain.world.Structs;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/framework/MainWindow.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -32,7 +32,7 @@
//using freetrain.contributions.dock;
using FreeTrain.Contributions.Common;
using FreeTrain.Contributions.Rail;
-using FreeTrain.Contributions.road;
+using FreeTrain.Contributions.Road;
using FreeTrain.Contributions.Structs;
using FreeTrain.Contributions.Others;
using FreeTrain.Controls;
@@ -44,7 +44,7 @@
using FreeTrain.Controllers.Structs;
using FreeTrain.Framework.plugin;
using FreeTrain.Framework.Sound;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
using FreeTrain.Views.Map;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/framework/ResourceUtil.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -27,7 +27,7 @@
using SDL.net;
using SdlDotNet.Audio;
using FreeTrain.Util;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.world;
namespace FreeTrain.Framework
Modified: branches/FreeTrainSDL/core/framework/Splash.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/Splash.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/Splash.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -51,7 +51,7 @@
Application.DoEvents();
if (progress > 0.4 && exflag)
{
- Graphics g = pictureBox1.CreateGraphics();
+ System.Drawing.Graphics g = pictureBox1.CreateGraphics();
imageList.Draw(g, 232, 128, 0);
exflag = false;
}
Modified: branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using FreeTrain.world;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Builds a set of sprites for alpha-blending blit
Modified: branches/FreeTrainSDL/core/framework/graphics/ColorLibrary.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/ColorLibrary.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/ColorLibrary.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,10 +23,10 @@
using System.Drawing;
using System.Collections;
using FreeTrain.world;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain;
-namespace FreeTrain.Framework.plugin.graphics
+namespace FreeTrain.Framework.Plugin.Graphics
{
/// <summary>
/// ColorLibrary の概要の説明です。
Modified: branches/FreeTrainSDL/core/framework/graphics/ColorMap.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/ColorMap.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/ColorMap.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Determines the color mapping between daylight time and night time.
Modified: branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using FreeTrain.world;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Draw an image in the picture with color-mapping.
Modified: branches/FreeTrainSDL/core/framework/graphics/DefaultSpriteLoaderContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/DefaultSpriteLoaderContributionImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/DefaultSpriteLoaderContributionImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// DefaultSpriteLoaderContributionImpl の概要の説明です。
Modified: branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Sprite that directly draws from a surface.
Modified: branches/FreeTrainSDL/core/framework/graphics/DirtyRect.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/DirtyRect.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/DirtyRect.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using System.Drawing;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Maintain a set of dirty rects.
Modified: branches/FreeTrainSDL/core/framework/graphics/GraphicsException.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/GraphicsException.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/GraphicsException.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -20,7 +20,7 @@
using System;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
///
Modified: branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using FreeTrain.Framework.plugin;
using FreeTrain.world;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Draw an image in the picture with transforming colors by keying a hue.
Modified: branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Runtime.Serialization;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Sprite that draws nothing.
Modified: branches/FreeTrainSDL/core/framework/graphics/Picture.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/Picture.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/Picture.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using FreeTrain.world;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Wraps DirectDraw surface
Modified: branches/FreeTrainSDL/core/framework/graphics/PictureManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/PictureManager.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/PictureManager.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Diagnostics;
using FreeTrain.world;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Repository of pictures.
Modified: branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using FreeTrain.world;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Utility class that draws a preview image programatically.
Modified: branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -25,7 +25,7 @@
using FreeTrain.world;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Draw an image in the picture as-is.
Modified: branches/FreeTrainSDL/core/framework/graphics/Sprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/Sprite.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/Sprite.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// A sprite object that can draw itself to other surfaces.
Modified: branches/FreeTrainSDL/core/framework/graphics/SpriteFactory.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SpriteFactory.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/SpriteFactory.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Create a sprite from a picture.
Modified: branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Let SpriteFactories to be contributed.
Modified: branches/FreeTrainSDL/core/framework/graphics/SpriteLoaderContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SpriteLoaderContribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/SpriteLoaderContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// SpriteLoaderContribution encapsulates the details of how a set of sprites
Modified: branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using System.Runtime.InteropServices;
using SDL.net;
-namespace FreeTrain.Framework.graphics
+namespace FreeTrain.Framework.Graphics
{
/// <summary>
/// Function object that can load a picture into the given surface.
Modified: branches/FreeTrainSDL/core/framework/plugin/Contribution.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/Contribution.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/plugin/Contribution.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -27,10 +27,10 @@
using System.Windows.Forms;
using System.Xml;
using SDL.net;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
-namespace FreeTrain.Framework.plugin
+namespace FreeTrain.Framework.Plugin
{
/// <summary>
/// Common base class of contributions.
Modified: branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/Plugin.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/plugin/Plugin.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -28,7 +28,7 @@
using FreeTrain.Util;
using FreeTrain.Contributions.Train;
using FreeTrain.Contributions.Land;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework.plugin
{
Modified: branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -32,7 +32,7 @@
using FreeTrain.Contributions.Train;
using FreeTrain.Contributions.Common;
using FreeTrain.Contributions.Structs;
-using FreeTrain.Contributions.road;
+using FreeTrain.Contributions.Road;
namespace FreeTrain.Framework.plugin
{
Modified: branches/FreeTrainSDL/core/framework/plugin/PluginUtil.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/PluginUtil.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/framework/plugin/PluginUtil.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Reflection;
using System.Xml;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework.plugin
{
Modified: branches/FreeTrainSDL/core/views/GlobalViewOptions.cs
===================================================================
--- branches/FreeTrainSDL/core/views/GlobalViewOptions.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/views/GlobalViewOptions.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Diagnostics;
using FreeTrain.world;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Views
Modified: branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
===================================================================
--- branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -27,7 +27,7 @@
using FreeTrain.Util;
using FreeTrain.world;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Controllers;
namespace FreeTrain.Views
Modified: branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using SDL.net;
namespace FreeTrain.Views
Modified: branches/FreeTrainSDL/core/views/WeatherOverlaySpriteSet.cs
===================================================================
--- branches/FreeTrainSDL/core/views/WeatherOverlaySpriteSet.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/views/WeatherOverlaySpriteSet.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -20,7 +20,7 @@
using System;
using System.Drawing;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Views
{
Modified: branches/FreeTrainSDL/core/views/map/MapView.cs
===================================================================
--- branches/FreeTrainSDL/core/views/map/MapView.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/views/map/MapView.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -28,7 +28,7 @@
using FreeTrain.world;
using FreeTrain.Controllers;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using SDL.net;
namespace FreeTrain.Views.Map
Modified: branches/FreeTrainSDL/core/world/Clock.cs
===================================================================
--- branches/FreeTrainSDL/core/world/Clock.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/Clock.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Windows.Forms;
using FreeTrain.Util;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world
{
Modified: branches/FreeTrainSDL/core/world/RRCrossing.cs
===================================================================
--- branches/FreeTrainSDL/core/world/RRCrossing.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/RRCrossing.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Drawing;
using System.Runtime.Serialization;
using FreeTrain.world.Rail;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world
{
Modified: branches/FreeTrainSDL/core/world/Traffic.cs
===================================================================
--- branches/FreeTrainSDL/core/world/Traffic.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/Traffic.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -23,7 +23,7 @@
using System.Diagnostics;
using SDL.net;
using FreeTrain.world.Rail;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
namespace FreeTrain.world
{
@@ -44,7 +44,7 @@
private RailRoad _railRoad;
- private Road _road;
+ private BaseRoad _road;
private IAccessory _accessory;
/// <summary>
@@ -130,7 +130,7 @@
/// <summary>
/// Road that occupies this voxel, or null otherwise.
/// </summary>
- public Road road
+ public BaseRoad road
{
get
{
Modified: branches/FreeTrainSDL/core/world/Voxel.cs
===================================================================
--- branches/FreeTrainSDL/core/world/Voxel.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/Voxel.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using System.Drawing;
using SDL.net;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world
{
Modified: branches/FreeTrainSDL/core/world/World.cs
===================================================================
--- branches/FreeTrainSDL/core/world/World.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/World.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -30,7 +30,7 @@
using FreeTrain.Contributions.Train;
using FreeTrain.Controllers;
using FreeTrain.Framework;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.world;
using FreeTrain.world.Rail;
using FreeTrain.Views;
Modified: branches/FreeTrainSDL/core/world/development/LandValue.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/LandValue.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/development/LandValue.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -19,7 +19,7 @@
#endregion LICENSE
using System;
-using FreeTrain.world.road;
+using FreeTrain.world.Road;
namespace FreeTrain.world.Development
{
@@ -195,7 +195,7 @@
int h, v;
World.world.toHV(loc.x, loc.y, out h, out v);
- Road roadFound = null;
+ BaseRoad roadFound = null;
bool hasMountain = false;
// FIXME: this code shouldn't have the knowledge of any particular voxel type.
Modified: branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs
===================================================================
--- branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Diagnostics;
using System.Drawing;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using SDL.net;
namespace FreeTrain.world.Land
Modified: branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Drawing;
using SDL.net;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
namespace FreeTrain.world.Rail
Modified: branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/BridgeRail.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/BridgeRail.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using SDL.net;
using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
Modified: branches/FreeTrainSDL/core/world/rail/FatPlatform.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/FatPlatform.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/FatPlatform.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using System.Runtime.Serialization;
using SDL.net;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
namespace FreeTrain.world.Rail
Modified: branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using System.Drawing;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world.Rail
{
Modified: branches/FreeTrainSDL/core/world/rail/RailPattern.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/RailPattern.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/RailPattern.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -24,7 +24,7 @@
using System.Runtime.Serialization;
using System.Windows.Forms;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
using SDL.net;
Modified: branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using System.Drawing;
using System.Runtime.Serialization;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world.Rail
{
Modified: branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using SDL.net;
using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
Modified: branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using SDL.net;
using FreeTrain.Util;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.world.Rail
{
Modified: branches/FreeTrainSDL/core/world/rail/Train.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using FreeTrain.Contributions.Train;
using FreeTrain.Framework;
using FreeTrain.Framework.Sound;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.world.Accounting;
using System.Runtime.Serialization;
Modified: branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/TunnelRail.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/rail/TunnelRail.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -26,7 +26,7 @@
using SDL.net;
using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
-using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using FreeTrain.world.Terrain;
Modified: branches/FreeTrainSDL/core/world/road/Bus.cs
===================================================================
--- branches/FreeTrainSDL/core/world/road/Bus.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/road/Bus.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
-namespace FreeTrain.world.road
+namespace FreeTrain.world.Road
{
/// <summary>
/// Bus
Modified: branches/FreeTrainSDL/core/world/road/Road.cs
===================================================================
--- branches/FreeTrainSDL/core/world/road/Road.cs 2008-03-19 21:51:34 UTC (rev 245)
+++ branches/FreeTrainSDL/core/world/road/Road.cs 2008-03-19 22:24:35 UTC (rev 246)
@@ -21,13 +21,13 @@
using System;
using System.Drawing;
-namespace FreeTrain.world.road
+namespace FreeTrain.world.Road
{
/// <summary>
/// Automobile Road
/// </summary>
[Serializable]
- public abstract class Road
+ public abstract class BaseRoad
{
/// <summary>
///
@@ -35,7 +35,7 @@
/// <param name="tv"></param>
/// <param name="pattern"></param>
/// <param name="style"></param>
- protected Road(TrafficVoxel tv, RoadPattern pattern, RoadStyle style)
+ protected BaseRoad(TrafficVoxel tv, RoadPattern pattern, RoadStyle style)
{
this._style = style;
...
[truncated message content] |
|
From: <je...@us...> - 2008-03-19 23:00:23
|
Revision: 247
http://freetrain.svn.sourceforge.net/freetrain/?rev=247&view=rev
Author: jendave
Date: 2008-03-19 16:00:17 -0700 (Wed, 19 Mar 2008)
Log Message:
-----------
More namespace fixes
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
branches/FreeTrainSDL/core/contributions/common/IPreviewWorldBuilder.cs
branches/FreeTrainSDL/core/contributions/common/LineContribution.cs
branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs
branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
branches/FreeTrainSDL/core/contributions/others/EmptyNewGameContributionImpl.cs
branches/FreeTrainSDL/core/contributions/others/MenuContribution.cs
branches/FreeTrainSDL/core/contributions/others/NewGameContribution.cs
branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs
branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs
branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs
branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs
branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs
branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs
branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs
branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs
branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs
branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs
branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs
branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs
branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs
branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs
branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs
branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs
branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs
branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs
branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs
branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs
branches/FreeTrainSDL/core/contributions/structs/CommercialStructureContribution.cs
branches/FreeTrainSDL/core/contributions/structs/SpecialStructureContribution.cs
branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs
branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ParamTrainImpl.cs
branches/FreeTrainSDL/core/contributions/train/PatternTrainImpl.cs
branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs
branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
branches/FreeTrainSDL/core/contributions/train/TrainContributionFactory.cs
branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs
branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs
branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
branches/FreeTrainSDL/core/controllers/ControllerHostForm.cs
branches/FreeTrainSDL/core/controllers/CubeSelectorController.cs
branches/FreeTrainSDL/core/controllers/Disambiguators.cs
branches/FreeTrainSDL/core/controllers/LocationDisambiguator.cs
branches/FreeTrainSDL/core/controllers/LocationStore.cs
branches/FreeTrainSDL/core/controllers/ModalController.cs
branches/FreeTrainSDL/core/controllers/PointSelectorController.cs
branches/FreeTrainSDL/core/controllers/RectSelectorController.cs
branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
branches/FreeTrainSDL/core/controllers/land/LandController.cs
branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformPropertyDialog.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/SpecialPurposeRailController.cs
branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs
branches/FreeTrainSDL/core/controllers/rail/StationPropertyDialog.cs
branches/FreeTrainSDL/core/controllers/rail/StationaryStructPlacementController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainControllerDialog.cs
branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTrackingWindow.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
branches/FreeTrainSDL/core/controllers/road/RoadController.cs
branches/FreeTrainSDL/core/controllers/structs/CommercialStructPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs
branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs
branches/FreeTrainSDL/core/framework/BGMManager.cs
branches/FreeTrainSDL/core/framework/ConfigDialog.cs
branches/FreeTrainSDL/core/framework/Core.cs
branches/FreeTrainSDL/core/framework/ExternToolsHelper.cs
branches/FreeTrainSDL/core/framework/GlobalOptions.cs
branches/FreeTrainSDL/core/framework/MainWindow.cs
branches/FreeTrainSDL/core/framework/NewWorldDialog.cs
branches/FreeTrainSDL/core/framework/ResourceUtil.cs
branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
branches/FreeTrainSDL/core/framework/graphics/ColorLibrary.cs
branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs
branches/FreeTrainSDL/core/framework/graphics/DefaultSpriteLoaderContributionImpl.cs
branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Picture.cs
branches/FreeTrainSDL/core/framework/graphics/PictureManager.cs
branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs
branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteFactory.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteLoaderContribution.cs
branches/FreeTrainSDL/core/framework/plugin/Contribution.cs
branches/FreeTrainSDL/core/framework/plugin/ContributionFactory.cs
branches/FreeTrainSDL/core/framework/plugin/DynamicContributionFactory.cs
branches/FreeTrainSDL/core/framework/plugin/FixedClassContributionFactory.cs
branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
branches/FreeTrainSDL/core/framework/plugin/PluginListDialog.cs
branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
branches/FreeTrainSDL/core/framework/plugin/PluginSerializationBinder.cs
branches/FreeTrainSDL/core/framework/plugin/PluginUtil.cs
branches/FreeTrainSDL/core/framework/plugin/XmlUtil.cs
branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs
branches/FreeTrainSDL/core/views/AbstractView.cs
branches/FreeTrainSDL/core/views/GlobalViewOptions.cs
branches/FreeTrainSDL/core/views/MapOverlay.cs
branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
branches/FreeTrainSDL/core/views/map/HeightCutWindow.cs
branches/FreeTrainSDL/core/views/map/MapView.cs
branches/FreeTrainSDL/core/world/Car.cs
branches/FreeTrainSDL/core/world/CarState.cs
branches/FreeTrainSDL/core/world/Clock.cs
branches/FreeTrainSDL/core/world/Cube.cs
branches/FreeTrainSDL/core/world/Direction.cs
branches/FreeTrainSDL/core/world/DrawContext.cs
branches/FreeTrainSDL/core/world/EmptyVoxel.cs
branches/FreeTrainSDL/core/world/Entity.cs
branches/FreeTrainSDL/core/world/Location.cs
branches/FreeTrainSDL/core/world/Matrix.cs
branches/FreeTrainSDL/core/world/RRCrossing.cs
branches/FreeTrainSDL/core/world/SIZE.cs
branches/FreeTrainSDL/core/world/SparseVoxelArray.cs
branches/FreeTrainSDL/core/world/Time.cs
branches/FreeTrainSDL/core/world/TimeLength.cs
branches/FreeTrainSDL/core/world/Traffic.cs
branches/FreeTrainSDL/core/world/Voxel.cs
branches/FreeTrainSDL/core/world/VoxelOutlookListener.cs
branches/FreeTrainSDL/core/world/accounting/AccountGenre.cs
branches/FreeTrainSDL/core/world/accounting/AccountManager.cs
branches/FreeTrainSDL/core/world/accounting/AccountSummaryWindow.cs
branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs
branches/FreeTrainSDL/core/world/accounting/Debt.cs
branches/FreeTrainSDL/core/world/accounting/GenreSelectorDialog.cs
branches/FreeTrainSDL/core/world/accounting/TransactionHistory.cs
branches/FreeTrainSDL/core/world/development/CommercialStructurePlan.cs
branches/FreeTrainSDL/core/world/development/DevelopConfigure.cs
branches/FreeTrainSDL/core/world/development/DevelopConfigurePlugin.cs
branches/FreeTrainSDL/core/world/development/DevelopmentAlgorithm.cs
branches/FreeTrainSDL/core/world/development/LandPlan.cs
branches/FreeTrainSDL/core/world/development/LandValue.cs
branches/FreeTrainSDL/core/world/development/LandValueInspector.cs
branches/FreeTrainSDL/core/world/development/LandValueInspectorPlugin.cs
branches/FreeTrainSDL/core/world/development/Plan.cs
branches/FreeTrainSDL/core/world/development/ULV.cs
branches/FreeTrainSDL/core/world/development/ULVFactory.cs
branches/FreeTrainSDL/core/world/development/VarHeightBuildingPlan.cs
branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs
branches/FreeTrainSDL/core/world/land/LandVoxel.cs
branches/FreeTrainSDL/core/world/land/StaticLandVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
branches/FreeTrainSDL/core/world/rail/DelegationTrainControllerImpl.cs
branches/FreeTrainSDL/core/world/rail/FatPlatform.cs
branches/FreeTrainSDL/core/world/rail/GlobalTrafficMonitor.cs
branches/FreeTrainSDL/core/world/rail/JunctionRailRoad.cs
branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs
branches/FreeTrainSDL/core/world/rail/Platform.cs
branches/FreeTrainSDL/core/world/rail/PlatformHost.cs
branches/FreeTrainSDL/core/world/rail/RailPattern.cs
branches/FreeTrainSDL/core/world/rail/RailRoad.cs
branches/FreeTrainSDL/core/world/rail/RailStationaryStructure.cs
branches/FreeTrainSDL/core/world/rail/SimpleTrainControllerImpl.cs
branches/FreeTrainSDL/core/world/rail/SingleRailRoad.cs
branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs
branches/FreeTrainSDL/core/world/rail/SpecialPurposeRailRoad.cs
branches/FreeTrainSDL/core/world/rail/Station.cs
branches/FreeTrainSDL/core/world/rail/StationListener.cs
branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/core/world/rail/TrainController.cs
branches/FreeTrainSDL/core/world/rail/TrainGroup.cs
branches/FreeTrainSDL/core/world/rail/TrainHarbor.cs
branches/FreeTrainSDL/core/world/rail/TrainItem.cs
branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
branches/FreeTrainSDL/core/world/rail/YardRailRoad.cs
branches/FreeTrainSDL/core/world/road/Bus.cs
branches/FreeTrainSDL/core/world/road/Road.cs
branches/FreeTrainSDL/core/world/road/RoadPattern.cs
branches/FreeTrainSDL/core/world/road/RoadStyle.cs
branches/FreeTrainSDL/core/world/structs/Commercial.cs
branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs
branches/FreeTrainSDL/core/world/structs/PThreeDimStructure.cs
branches/FreeTrainSDL/core/world/structs/PopulatedStructure.cs
branches/FreeTrainSDL/core/world/structs/StationListenerImpl.cs
branches/FreeTrainSDL/core/world/structs/Structure.cs
branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs
branches/FreeTrainSDL/core/world/subsidiaries/MarketWindow.cs
branches/FreeTrainSDL/core/world/subsidiaries/Parameters.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryEntity.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryMarket.cs
branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/CategoryTreeWnd.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/StructCategory.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HueShiftSprite.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseVoxel.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigCommand.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorTestTrainCar.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml
branches/FreeTrainSDL/plugins/system/plugin.xml
Added Paths:
-----------
branches/FreeTrainSDL/core/world/WorldDefinition.cs
Removed Paths:
-------------
branches/FreeTrainSDL/core/world/World.cs
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-19 23:00:17 UTC (rev 247)
@@ -86,7 +86,6 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
- <None Include="ClassDiagram1.cd" />
<None Include="FreeTrainSdl.snk" />
</ItemGroup>
<ItemGroup>
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/Program.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -32,7 +32,7 @@
using SdlDotNet.Input;
using SDL.net;
-using FreeTrain.world;
+using FreeTrain.World;
using FreeTrain.Controllers;
using FreeTrain.Controllers.Rail;
using FreeTrain.Controllers.Terrain;
@@ -62,7 +62,7 @@
Point dragStartScrollPosition;
Point autoScrollPosition;
QuarterViewDrawer qView = null;
- World world = null;
+ WorldDefinition world = null;
WeatherOverlay weatherOverlay;
Sdl.SDL_Rect sourceRect;
Sdl.SDL_Rect dst;
@@ -115,13 +115,13 @@
controller = MainWindow.mainWindow.currentController;
qView.updateScreen();
- if (World.world.satellite == null ||
- World.world.satellite.surface.w != 150 ||
- World.world.satellite.surface.h != 150)
+ if (WorldDefinition.world.satellite == null ||
+ WorldDefinition.world.satellite.surface.w != 150 ||
+ WorldDefinition.world.satellite.surface.h != 150)
{
- World.world.satellite = new Surface(150, 150, 32);
- World.world.satellite.sourceColorKey = Color.Magenta;
- World.world.satellite.Fill(Color.FromArgb(222, 195, 132));
+ WorldDefinition.world.satellite = new Surface(150, 150, 32);
+ WorldDefinition.world.satellite.sourceColorKey = Color.Magenta;
+ WorldDefinition.world.satellite.Fill(Color.FromArgb(222, 195, 132));
}
}
Application.DoEvents();
@@ -215,8 +215,8 @@
{
if (qView != null)
{
- World.world.clock.tick();
- World.world.clock.tick();
+ WorldDefinition.world.clock.tick();
+ WorldDefinition.world.clock.tick();
sourceRect = new Sdl.SDL_Rect((short)ScrollPosition.X, (short)ScrollPosition.Y, (short)width, (short)height);
dst = new Sdl.SDL_Rect(0, 0, (short)width, (short)height);
@@ -231,7 +231,7 @@
if (gui != null)
{
gui.updateGUIElements(width, height);
- if (World.world != null) gui.clock_text = World.world.clock.displayString;
+ if (WorldDefinition.world != null) gui.clock_text = WorldDefinition.world.clock.displayString;
gui.drawGUI(width, height, screen.Handle);
}
screen.Update();
@@ -350,8 +350,8 @@
UpdateMessage("Loading plugins...", -1);
finalDraw();
Core.init(null, null, null, new ProgressHandler(UpdateMessage), true);
- world = new World(new Distance(150, 150, 7), 3);
- World.world = world;
+ world = new WorldDefinition(new Distance(150, 150, 7), 3);
+ WorldDefinition.world = world;
weatherOverlay = NullWeatherOverlay.theInstance;
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-19 23:00:17 UTC (rev 247)
@@ -826,9 +826,7 @@
<Compile Include="world\VoxelOutlookListener.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="world\World.cs">
- <SubType>Code</SubType>
- </Compile>
+ <Compile Include="world\WorldDefinition.cs" />
<Content Include="..\plugins\system\plugin.xml">
<Link>plugin.xml</Link>
</Content>
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -24,10 +24,10 @@
using System.Xml;
using FreeTrain.Util;
using FreeTrain.Framework.Graphics;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Controllers;
-using FreeTrain.world;
-using FreeTrain.world.Structs;
+using FreeTrain.World;
+using FreeTrain.World.Structs;
using FreeTrain.Contributions.Common;
using SDL.net;
@@ -113,7 +113,7 @@
/// <param name="baseLoc"></param>
public Structure create(Location baseLoc, bool initiallyOwned)
{
- return create(new WorldLocator(World.world, baseLoc), initiallyOwned);
+ return create(new WorldLocator(WorldDefinition.world, baseLoc), initiallyOwned);
}
/// <summary>
///
@@ -131,7 +131,7 @@
/// <param name="baseLoc"></param>
public void create2(Location baseLoc)
{
- create(new WorldLocator(World.world, baseLoc), false);
+ create(new WorldLocator(WorldDefinition.world, baseLoc), false);
}
/// <summary>
@@ -184,9 +184,9 @@
/// <param name="minsizePixel"></param>
/// <param name="options"></param>
/// <returns></returns>
- public World CreatePreviewWorld(Size minsizePixel, IDictionary options)
+ public WorldDefinition CreatePreviewWorld(Size minsizePixel, IDictionary options)
{
- World w = World.CreatePreviewWorld(minsizePixel, size);
+ WorldDefinition w = WorldDefinition.CreatePreviewWorld(minsizePixel, size);
Location l = w.toXYZ((w.size.x - size.x + size.y) / 2, w.size.y - size.y - 2, 0);
create(new WorldLocator(w, l), false);
return w;
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -25,8 +25,8 @@
using FreeTrain.Framework;
using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
-using FreeTrain.world;
-using FreeTrain.world.Structs;
+using FreeTrain.World;
+using FreeTrain.World.Structs;
namespace FreeTrain.Contributions.Common
{
@@ -153,7 +153,7 @@
/// <param name="cube"></param>
protected override void onSelected(Cube cube)
{
- PThreeDimStructure s = World.world.getEntityAt(cube.corner) as PThreeDimStructure;
+ PThreeDimStructure s = WorldDefinition.world.getEntityAt(cube.corner) as PThreeDimStructure;
if (s == null || s.type != contrib)
{
MainWindow.showError("Wrong type");
Modified: branches/FreeTrainSDL/core/contributions/common/IPreviewWorldBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/IPreviewWorldBuilder.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/common/IPreviewWorldBuilder.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using System.Collections;
-using FreeTrain.world;
+using FreeTrain.World;
namespace FreeTrain.Contributions.Common
{
@@ -36,6 +36,6 @@
/// <param name="minsizePixel"></param>
/// <param name="options"></param>
/// <returns></returns>
- World CreatePreviewWorld(Size minsizePixel, IDictionary options);
+ WorldDefinition CreatePreviewWorld(Size minsizePixel, IDictionary options);
}
}
Modified: branches/FreeTrainSDL/core/contributions/common/LineContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/LineContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/common/LineContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,8 +20,8 @@
using System;
using System.Drawing;
-using FreeTrain.world;
-using FreeTrain.Framework.plugin;
+using FreeTrain.World;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Common
{
Modified: branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Framework.Graphics;
namespace FreeTrain.Contributions.Common
Modified: branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -25,10 +25,10 @@
using FreeTrain.Util;
using FreeTrain.Contributions.Population;
using FreeTrain.Controllers;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Framework.Graphics;
-using FreeTrain.world;
-using FreeTrain.world.Structs;
+using FreeTrain.World;
+using FreeTrain.World.Structs;
using SDL.net;
namespace FreeTrain.Contributions.Common
Modified: branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -25,13 +25,13 @@
using SDL.net;
using FreeTrain.Controllers;
using FreeTrain.Framework.Graphics;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Framework;
using FreeTrain.Views;
-using FreeTrain.world;
-using FreeTrain.world.Rail;
-using FreeTrain.world.Terrain;
-using FreeTrain.world.Land;
+using FreeTrain.World;
+using FreeTrain.World.Rail;
+using FreeTrain.World.Terrain;
+using FreeTrain.World.Land;
namespace FreeTrain.Contributions.Land
{
@@ -55,7 +55,7 @@
public override void create(int x1, int y1, int x2, int y2, int z, bool owned)
{
bulldoze(new Location(x1, y1, z), new Location(x2, y2, z));
- World.world.onVoxelUpdated(new Cube(x1, y1, z, x2 - x1 + 1, y2 - y1 + 1, 1));
+ WorldDefinition.world.onVoxelUpdated(new Cube(x1, y1, z, x2 - x1 + 1, y2 - y1 + 1, 1));
}
/// <summary>
///
@@ -71,14 +71,14 @@
{
// edited by 477 (04/02/14)
//if( World.world.isReusable(x,y,z) && World.world[x,y,z]!=null )
- Voxel v = World.world[x, y, z];
+ Voxel v = WorldDefinition.world[x, y, z];
if (v != null)
{
if (v is MountainVoxel)
{
MountainVoxel mv = v as MountainVoxel;
if (mv.isFlattened)
- World.world.remove(x, y, z);
+ WorldDefinition.world.remove(x, y, z);
else
mv.removeTrees();
}
@@ -88,7 +88,7 @@
}
else
{
- World.world.remove(x, y, z);
+ WorldDefinition.world.remove(x, y, z);
}
}
}
Modified: branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -24,7 +24,7 @@
using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
using FreeTrain.Controllers;
-using FreeTrain.world;
+using FreeTrain.World;
namespace FreeTrain.Contributions.Land
{
Modified: branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -23,13 +23,13 @@
using System.Drawing;
using System.Xml;
using SDL.net;
-using FreeTrain.world;
-using FreeTrain.world.Terrain;
+using FreeTrain.World;
+using FreeTrain.World.Terrain;
using FreeTrain.Contributions.Common;
using FreeTrain.Controllers;
using FreeTrain.Framework;
using FreeTrain.Framework.Graphics;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Land
{
Modified: branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -24,11 +24,11 @@
using System.Xml;
using SDL.net;
using FreeTrain.Controllers;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
-using FreeTrain.world;
-using FreeTrain.world.Land;
+using FreeTrain.World;
+using FreeTrain.World.Land;
namespace FreeTrain.Contributions.Land
{
Modified: branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -26,10 +26,10 @@
using FreeTrain.Controllers;
using FreeTrain.Contributions.Population;
using FreeTrain.Framework.Graphics;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Views;
-using FreeTrain.world;
-using FreeTrain.world.Land;
+using FreeTrain.World;
+using FreeTrain.World.Land;
namespace FreeTrain.Contributions.Land
{
Modified: branches/FreeTrainSDL/core/contributions/others/EmptyNewGameContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/others/EmptyNewGameContributionImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/others/EmptyNewGameContributionImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -22,7 +22,7 @@
using System.Xml;
using System.Windows.Forms;
using FreeTrain.Framework;
-using FreeTrain.world;
+using FreeTrain.World;
namespace FreeTrain.Contributions.Others
{
@@ -54,7 +54,7 @@
///
/// </summary>
/// <returns></returns>
- public override World createNewGame()
+ public override WorldDefinition createNewGame()
{
using (NewWorldDialog dialog = new NewWorldDialog())
{
Modified: branches/FreeTrainSDL/core/contributions/others/MenuContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/others/MenuContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/others/MenuContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -22,7 +22,7 @@
using System.Reflection;
using System.Windows.Forms;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Others
{
Modified: branches/FreeTrainSDL/core/contributions/others/NewGameContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/others/NewGameContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/others/NewGameContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,8 +20,8 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world;
+using FreeTrain.Framework.Plugin;
+using FreeTrain.World;
namespace FreeTrain.Contributions.Others
{
@@ -55,6 +55,6 @@
/// Creates a new game by creating a new instance of the World object.
/// </summary>
/// <returns>null to indicate that the operation was cancelled.</returns>
- public abstract World createNewGame();
+ public abstract WorldDefinition createNewGame();
}
}
Modified: branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -23,7 +23,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.world;
+using FreeTrain.World;
namespace FreeTrain.Contributions.Others
{
@@ -223,11 +223,11 @@
/// <summary>
/// Creates a new empty world as specified by the user.
/// </summary>
- public World createWorld() {
+ public WorldDefinition createWorld() {
int x = int.Parse(sizeX.Text);
int y = int.Parse(sizeY.Text);
int z = int.Parse(sizeZ.Text);
- World w = new World( new Distance(x,y+z*2,z), z/4 );
+ WorldDefinition w = new WorldDefinition( new Distance(x,y+z*2,z), z/4 );
w.name = this.name.Text;
if(w.name==null || w.name.Length==0)
w.name = "Terra Incognita";
Modified: branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/BasePopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -22,8 +22,8 @@
using System.Runtime.Serialization;
using System.Xml;
using FreeTrain.Framework.Plugin;
-using FreeTrain.world;
-using FreeTrain.world.Structs;
+using FreeTrain.World;
+using FreeTrain.World.Structs;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Xml;
-using FreeTrain.world;
+using FreeTrain.World;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,9 +20,9 @@
using System;
using System.Xml;
-using FreeTrain.world;
-using FreeTrain.world.Structs;
-using FreeTrain.Framework.plugin;
+using FreeTrain.World;
+using FreeTrain.World.Structs;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,9 +20,9 @@
using System;
using System.Diagnostics;
-using FreeTrain.world;
-using FreeTrain.world.Structs;
-using FreeTrain.Framework.plugin;
+using FreeTrain.World;
+using FreeTrain.World.Structs;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,8 +20,8 @@
using System;
using System.Runtime.Serialization;
-using FreeTrain.world;
-using FreeTrain.Framework.plugin;
+using FreeTrain.World;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Runtime.Serialization;
-using FreeTrain.world;
+using FreeTrain.World;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Population
{
Modified: branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -22,9 +22,9 @@
using System.Xml;
using FreeTrain.Contributions.Common;
using FreeTrain.Framework;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Framework.Sound;
-using FreeTrain.world;
+using FreeTrain.World;
namespace FreeTrain.Contributions.Rail
{
Modified: branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -22,7 +22,7 @@
using System.Xml;
using System.Drawing;
using FreeTrain.Contributions.Common;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Framework.Graphics;
using FreeTrain.Controllers;
using FreeTrain.Contributions.Population;
Modified: branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -21,10 +21,10 @@
using System;
using System.Xml;
using FreeTrain.Contributions.Common;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world;
-using FreeTrain.world.Rail;
-using FreeTrain.world.Structs;
+using FreeTrain.Framework.Plugin;
+using FreeTrain.World;
+using FreeTrain.World.Rail;
+using FreeTrain.World.Structs;
namespace FreeTrain.Contributions.Rail
{
Modified: branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Contributions.Common;
-using FreeTrain.world;
+using FreeTrain.World;
namespace FreeTrain.Contributions.Rail
{
Modified: branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -21,10 +21,10 @@
using System;
using System.Xml;
using FreeTrain.Contributions.Common;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world;
-using FreeTrain.world.Rail;
-using FreeTrain.world.Structs;
+using FreeTrain.Framework.Plugin;
+using FreeTrain.World;
+using FreeTrain.World.Rail;
+using FreeTrain.World.Structs;
namespace FreeTrain.Contributions.Rail
{
Modified: branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,8 +20,8 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world.Rail;
+using FreeTrain.Framework.Plugin;
+using FreeTrain.World.Rail;
namespace FreeTrain.Contributions.Rail
{
Modified: branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -25,8 +25,8 @@
using FreeTrain.Framework;
using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
-using FreeTrain.world;
-using FreeTrain.world.Road;
+using FreeTrain.World;
+using FreeTrain.World.Road;
namespace FreeTrain.Contributions.Road
{
@@ -72,7 +72,7 @@
while (true)
{
- if (World.world[here] != null)
+ if (WorldDefinition.world[here] != null)
{
TrafficVoxel v = TrafficVoxel.get(here);
if (v == null) return false; // occupied
@@ -269,7 +269,7 @@
voxel.road = new RoadImpl(contribution, voxel, RoadPattern.get(dirs));
}
- World.world.onVoxelUpdated(location);
+ WorldDefinition.world.onVoxelUpdated(location);
}
/// <summary>
///
Modified: branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -24,8 +24,8 @@
using System.Xml;
using FreeTrain.Contributions.Common;
using FreeTrain.Framework.Graphics;
-using FreeTrain.world;
-using FreeTrain.world.Road;
+using FreeTrain.World;
+using FreeTrain.World.Road;
namespace FreeTrain.Contributions.Road
{
Modified: branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -24,9 +24,9 @@
using System.Xml;
using FreeTrain.Framework;
using FreeTrain.Framework.Graphics;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world;
-using FreeTrain.world.Road;
+using FreeTrain.Framework.Plugin;
+using FreeTrain.World;
+using FreeTrain.World.Road;
namespace FreeTrain.Contributions.Road
{
Modified: branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Sound
{
Modified: branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -21,7 +21,7 @@
using System;
using System.Net;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Sound
{
@@ -67,7 +67,7 @@
/// <param name="owner"></param>
/// <param name="e"></param>
/// <returns></returns>
- public Contribution load(Plugin owner, XmlElement e)
+ public Contribution load(PluginDefinition owner, XmlElement e)
{
BGMFactoryContribution contrib =
(BGMFactoryContribution)PluginUtil.loadObjectFromManifest(e);
Modified: branches/FreeTrainSDL/core/contributions/structs/CommercialStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/CommercialStructureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/structs/CommercialStructureContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -21,9 +21,9 @@
using System;
using System.Xml;
using FreeTrain.Contributions.Common;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world;
-using FreeTrain.world.Structs;
+using FreeTrain.Framework.Plugin;
+using FreeTrain.World;
+using FreeTrain.World.Structs;
namespace FreeTrain.Contributions.Structs
{
Modified: branches/FreeTrainSDL/core/contributions/structs/SpecialStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/SpecialStructureContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/structs/SpecialStructureContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Structs
{
Modified: branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -27,9 +27,9 @@
using FreeTrain.Controllers;
using FreeTrain.Contributions.Common;
using FreeTrain.Framework.Graphics;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world;
-using FreeTrain.world.Structs;
+using FreeTrain.Framework.Plugin;
+using FreeTrain.World;
+using FreeTrain.World.Structs;
using SDL.net;
namespace FreeTrain.Contributions.Structs
@@ -180,7 +180,7 @@
public Structure create(Location baseLoc, int height, bool initiallyOwned)
{
Debug.Assert(canBeBuilt(baseLoc, height));
- return create(new WorldLocator(World.world, baseLoc), height, initiallyOwned);
+ return create(new WorldLocator(WorldDefinition.world, baseLoc), height, initiallyOwned);
}
/// <summary>
@@ -191,7 +191,7 @@
for (int z = 0; z < height; z++)
for (int y = 0; y < size.y; y++)
for (int x = 0; x < size.x; x++)
- if (World.world[baseLoc.x + x, baseLoc.y + y, baseLoc.z + z] != null)
+ if (WorldDefinition.world[baseLoc.x + x, baseLoc.y + y, baseLoc.z + z] != null)
return false;
return true;
@@ -268,10 +268,10 @@
/// <param name="minsizePixel"></param>
/// <param name="options"></param>
/// <returns></returns>
- public World CreatePreviewWorld(Size minsizePixel, IDictionary options)
+ public WorldDefinition CreatePreviewWorld(Size minsizePixel, IDictionary options)
{
Distance d = new Distance(size.x * 2 + 1, size.y * 2 + 1, maxHeight);
- World w = World.CreatePreviewWorld(minsizePixel, d);
+ WorldDefinition w = WorldDefinition.CreatePreviewWorld(minsizePixel, d);
int v = w.size.y - size.y - 2;
Location l = w.toXYZ((w.size.x - size.x - size.y - 1) / 2, v, 0);
create(new WorldLocator(w, l), maxHeight, false);
Modified: branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -21,7 +21,7 @@
using System;
using System.Xml;
using FreeTrain.Framework;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Train
{
Modified: branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -22,9 +22,9 @@
using System.Drawing;
using System.Xml;
using FreeTrain.Framework;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Framework.Graphics;
-using FreeTrain.world;
+using FreeTrain.World;
using SDL.net;
namespace FreeTrain.Contributions.Train
Modified: branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -24,8 +24,8 @@
using FreeTrain.Contributions.Common;
using FreeTrain.Framework;
using FreeTrain.Framework.Graphics;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world;
+using FreeTrain.Framework.Plugin;
+using FreeTrain.World;
using SDL.net;
namespace FreeTrain.Contributions.Train
Modified: branches/FreeTrainSDL/core/contributions/train/ParamTrainImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ParamTrainImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/train/ParamTrainImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -21,7 +21,7 @@
using System;
using System.Xml;
using FreeTrain.Framework;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Train
{
Modified: branches/FreeTrainSDL/core/contributions/train/PatternTrainImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/PatternTrainImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/train/PatternTrainImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -22,7 +22,7 @@
using System.Collections;
using System.Xml;
using FreeTrain.Framework;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Train
{
Modified: branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -22,9 +22,9 @@
using System.Drawing;
using System.Xml;
using SDL.net;
-using FreeTrain.world;
+using FreeTrain.World;
using FreeTrain.Framework;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Train
{
Modified: branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -23,8 +23,8 @@
using System.Xml;
using FreeTrain.Framework;
using FreeTrain.Framework.Graphics;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world;
+using FreeTrain.Framework.Plugin;
+using FreeTrain.World;
using SDL.net;
namespace FreeTrain.Contributions.Train
Modified: branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -22,8 +22,8 @@
using System.Drawing;
using System.Xml;
using SDL.net;
-using FreeTrain.Framework.plugin;
-using FreeTrain.world;
+using FreeTrain.Framework.Plugin;
+using FreeTrain.World;
namespace FreeTrain.Contributions.Train
{
Modified: branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -21,10 +21,10 @@
using System;
using System.Drawing;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
using FreeTrain.Framework.Graphics;
-using FreeTrain.world;
-using FreeTrain.world.Rail;
+using FreeTrain.World;
+using FreeTrain.World.Rail;
namespace FreeTrain.Contributions.Train
{
Modified: branches/FreeTrainSDL/core/contributions/train/TrainContributionFactory.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainContributionFactory.cs 2008-03-19 22:24:35 UTC (rev 246)
+++ branches/FreeTrainSDL/core/contributions/train/TrainContributionFactory.cs 2008-03-19 23:00:17 UTC (rev 247)
@@ -20,7 +20,7 @@
using System;
using System.Xml;
-using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Train
{
@@ -47,7 +47,7 @@
/// <param name="owner"></param>
/// <param name="e"></param>
/// <returns></returns>
- public Contribution load(Plugin owner, XmlElement e)
+ public Contribution load(PluginDefinition owner, XmlElement ...
[truncated message content] |
|
From: <je...@us...> - 2008-03-20 07:13:23
|
Revision: 248
http://freetrain.svn.sourceforge.net/freetrain/?rev=248&view=rev
Author: jendave
Date: 2008-03-20 00:13:27 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
more cleanup
Modified Paths:
--------------
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml
Property Changed:
----------------
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-20 07:13:27 UTC (rev 248)
@@ -8,14 +8,14 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>FreeTrain.Core</AssemblyName>
+ <AssemblyName>FreeTrain</AssemblyName>
<AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>FreeTrain.Core</RootNamespace>
+ <RootNamespace>FreeTrain</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<FileUpgradeFlags>
</FileUpgradeFlags>
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib
___________________________________________________________________
Name: svn:ignore
- SDLGFX.net.xml
DummyCars.dll
DummyCars.pdb
RoadAccessory.dll
RoadAccessory.pdb
RoadAccessory.XML
SDLGFX.net.dll
SDLGFX.net.pdb
*.XML
FreeTrain.DummyCars.dll
FreeTrain.DummyCars.pdb
FreeTrain.DummyCars.xml
FreeTrain.RoadAccessory.dll
FreeTrain.RoadAccessory.pdb
FreeTrain.RoadAccessory.xml
+ SDLGFX.net.xml
DummyCars.dll
DummyCars.pdb
RoadAccessory.dll
RoadAccessory.pdb
RoadAccessory.XML
SDLGFX.net.dll
SDLGFX.net.pdb
*.XML
FreeTrain.DummyCars.dll
FreeTrain.DummyCars.pdb
FreeTrain.DummyCars.xml
FreeTrain.RoadAccessory.dll
FreeTrain.RoadAccessory.pdb
FreeTrain.RoadAccessory.xml
.plugin.xml.swp
FreeTrain.World.Road.Accessory.dll
FreeTrain.World.Road.Accessory.pdb
FreeTrain.World.Road.DummyCars.dll
FreeTrain.World.Road.DummyCars.pdb
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml 2008-03-20 07:13:27 UTC (rev 248)
@@ -12,26 +12,26 @@
<name>roadAccessory</name>
<class name="FreeTrain.Framework.Plugin.FixedClassContributionFactory"/>
<implementation name="FreeTrain.World.Road.Accessory.RoadAccessoryContribution"
- codebase="FreeTrain.RoadAccessory.dll" />
+ codebase="FreeTrain.World.Road.Accessory.dll" />
</contribution>
<!-- temporary -->
<contribution type="menu" id="{3773CA2C-11B5-4DCC-C477-2296E9EBEBA7}">
<class name="FreeTrain.World.Road.Accessory.MenuContributionImpl"
- codebase="FreeTrain.RoadAccessory.dll" />
+ codebase="FreeTrain.World.Road.Accessory.dll" />
</contribution>
<contribution type="contribution" id="{0A73F9C6-BDCC-43DF-C477-E28B76058E8C}">
<name>DummyCar</name>
<class name="FreeTrain.Framework.Plugin.FixedClassContributionFactory"/>
- <implementation name="FreeTrain.World.Road.DummyCar.DummyCarContribution"
- codebase="FreeTrain.DummyCars.dll" />
+ <implementation name="FreeTrain.World.Road.DummyCars.DummyCarContribution"
+ codebase="FreeTrain.World.Road.DummyCars.dll" />
</contribution>
<!-- temporary -->
<contribution type="menu" id="{BFC035E9-8B0E-41D6-C477-72F99D820290}">
- <class name="FreeTrain.World.Road.DummyCar.MenuContributionImpl"
- codebase="FreeTrain.DummyCars.dll" />
+ <class name="FreeTrain.World.Road.DummyCars.MenuContributionImpl"
+ codebase="FreeTrain.World.Road.DummyCars.dll" />
</contribution>
</plug-in>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs 2008-03-20 07:13:27 UTC (rev 248)
@@ -36,7 +36,7 @@
using FreeTrain.Util;
using SDL.net;
-namespace FreeTrain.World.Road.DummyCar
+namespace FreeTrain.World.Road.DummyCars
{
/// <summary>
/// Controller that allows the user to
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerImpl.cs 2008-03-20 07:13:27 UTC (rev 248)
@@ -27,7 +27,7 @@
using FreeTrain.Controllers;
-namespace FreeTrain.World.Road.DummyCar
+namespace FreeTrain.World.Road.DummyCars
{
/// <summary>
/// ModalController implementation for DummyCar contribution
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs 2008-03-20 07:13:27 UTC (rev 248)
@@ -22,7 +22,7 @@
using System.Drawing;
using FreeTrain.World;
-namespace FreeTrain.World.Road.DummyCar
+namespace FreeTrain.World.Road.DummyCars
{
/// <summary>
/// Accessory implementation.
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs 2008-03-20 07:13:27 UTC (rev 248)
@@ -32,7 +32,7 @@
using FreeTrain.World.Rail;
using FreeTrain.Contributions.Common;
-namespace FreeTrain.World.Road.DummyCar
+namespace FreeTrain.World.Road.DummyCars
{
/// <summary>
///
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj 2008-03-20 07:13:27 UTC (rev 248)
@@ -10,14 +10,14 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>FreeTrain.DummyCars</AssemblyName>
+ <AssemblyName>FreeTrain.World.Road.DummyCars</AssemblyName>
<AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>FreeTrain.DummyCars</RootNamespace>
+ <RootNamespace>FreeTrain.World.Road.DummyCars</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/MenuContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/MenuContributionImpl.cs 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/MenuContributionImpl.cs 2008-03-20 07:13:27 UTC (rev 248)
@@ -24,7 +24,7 @@
using FreeTrain.Framework;
using FreeTrain.Contributions.Others;
-namespace FreeTrain.World.Road.DummyCar
+namespace FreeTrain.World.Road.DummyCars
{
/// <summary>
/// Adds "automobile" menu to the main window
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj 2008-03-20 07:13:27 UTC (rev 248)
@@ -10,14 +10,14 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>FreeTrain.RoadAccessory</AssemblyName>
+ <AssemblyName>FreeTrain.World.Road.Accessory</AssemblyName>
<AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>FreeTrain.RoadAccessory</RootNamespace>
+ <RootNamespace>FreeTrain.World.Road.Accessory</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic
___________________________________________________________________
Name: svn:ignore
- obj
FreeTrain.ExpandedContributions.dll
FreeTrain.ExpandedContributions.pdb
FreeTrain.ExpandedContributions.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
*.tmp
+ obj
FreeTrain.ExpandedContributions.dll
FreeTrain.ExpandedContributions.pdb
FreeTrain.ExpandedContributions.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
*.tmp
.plugin.xml.swp
bin
FreeTrain.Framework.Plugin.Generic.dll
FreeTrain.Framework.Plugin.Generic.pdb
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj 2008-03-20 07:13:27 UTC (rev 248)
@@ -10,14 +10,14 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>FreeTrain.ExpandedContributions</AssemblyName>
+ <AssemblyName>FreeTrain.Framework.Plugin.Generic</AssemblyName>
<AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>FreeTrain.ExpandedContributions</RootNamespace>
+ <RootNamespace>FreeTrain.Framework.Plugin.Generic</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/plugin.xml 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/plugin.xml 2008-03-20 07:13:27 UTC (rev 248)
@@ -34,20 +34,20 @@
<contribution type="menu" id="{2E1EE15E-101A-43E5-C477-95363F8E8AF0}">
<class name="FreeTrain.Framework.Plugin.Generic.MenuContributionImpl"
- codebase="FreeTrain.ExpandedContributions.dll" />
+ codebase="FreeTrain.Framework.Plugin.Generic.dll" />
</contribution>
<contribution type="contribution" id="{F9C26336-8D20-44FE-C477-453A270EC37D}">
<name>GenericStructure</name>
<class name="FreeTrain.Framework.Plugin.FixedClassContributionFactory"/>
<implementation name="FreeTrain.Framework.Plugin.Generic.GenericStructureContribution"
- codebase="FreeTrain.ExpandedContributions.dll" />
+ codebase="FreeTrain.Framework.Plugin.Generic.dll" />
</contribution>
<contribution type="contribution" id="{E58C4314-E57B-4F02-C477-A86CF1E1D655}">
<name>GenericLand</name>
<class name="FreeTrain.Framework.Plugin.FixedClassContributionFactory"/>
<implementation name="FreeTrain.Framework.Plugin.Generic.GenericLandContribution"
- codebase="FreeTrain.ExpandedContributions.dll" />
+ codebase="FreeTrain.Framework.Plugin.Generic.dll" />
</contribution>
<!--<contribution type="dockingContent" id="{C7E08038-DADA-46FD-C477-AEB5A4112B1C}">-->
<!-- <name>StructureTypeTree</name>-->
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel
___________________________________________________________________
Name: svn:ignore
- bin
obj
AxSHDocVw.dll
FreeTrain.Controls.dll
FreeTrain.Controls.pdb
FreeTrain.Controls.xml
FreeTrain.HalfVoxelStructure.dll
FreeTrain.HalfVoxelStructure.pdb
FreeTrain.HalfVoxelStructure.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
+ bin
obj
AxSHDocVw.dll
FreeTrain.Controls.dll
FreeTrain.Controls.pdb
FreeTrain.Controls.xml
FreeTrain.HalfVoxelStructure.dll
FreeTrain.HalfVoxelStructure.pdb
FreeTrain.HalfVoxelStructure.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
.plugin.xml.swp
FreeTrain.World.Structs.HalfVoxelStructure.dll
FreeTrain.World.Structs.HalfVoxelStructure.pdb
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2008-03-20 07:13:27 UTC (rev 248)
@@ -10,14 +10,14 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>FreeTrain.HalfVoxelStructure</AssemblyName>
+ <AssemblyName>FreeTrain.World.Structs.HalfVoxelStructure</AssemblyName>
<AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>FreeTrain.HalfVoxelStructure</RootNamespace>
+ <RootNamespace>FreeTrain.World.Structs.HalfVoxelStructure</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml 2008-03-20 07:13:27 UTC (rev 248)
@@ -38,13 +38,13 @@
<name>HalfVoxelStructure</name>
<class name="FreeTrain.Framework.Plugin.FixedClassContributionFactory"/>
<implementation name="FreeTrain.World.Structs.HalfVoxelStructure.HalfVoxelContribution"
- codebase="FreeTrain.HalfVoxelStructure.dll" />
+ codebase="FreeTrain.World.Structs.HalfVoxelStructure.dll" />
</contribution>
<!-- temporary -->
<contribution type="menu" id="{01AA051B-6112-4C00-C477-DE82E240F19F}">
<class name="FreeTrain.World.Structs.HalfVoxelStructure.MenuContributionImpl"
- codebase="FreeTrain.HalfVoxelStructure.dll" />
+ codebase="FreeTrain.World.Structs.HalfVoxelStructure.dll" />
</contribution>
<!--ここまでの順序は大切-->
Property changes on: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477
___________________________________________________________________
Name: svn:ignore
- bin
obj
FreeTrain.VinylHouse.dll
FreeTrain.VinylHouse.pdb
FreeTrain.VinylHouse.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
+ bin
obj
FreeTrain.VinylHouse.dll
FreeTrain.VinylHouse.pdb
FreeTrain.VinylHouse.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
.plugin.xml.swp
FreeTrain.World.Land.VinylHouse.dll
FreeTrain.World.Land.VinylHouse.pdb
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj 2008-03-20 07:13:27 UTC (rev 248)
@@ -10,14 +10,14 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>FreeTrain.VinylHouse</AssemblyName>
+ <AssemblyName>FreeTrain.World.Land.VinylHouse</AssemblyName>
<AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>FreeTrain.VinylHouse</RootNamespace>
+ <RootNamespace>FreeTrain.World.Land.VinylHouse</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml 2008-03-20 07:13:27 UTC (rev 248)
@@ -19,7 +19,7 @@
<contribution type="land" id="{66B81CAD-8B41-416C-8624-137C2D8110F2}">
<group>Greenhouse</group>
<class name="FreeTrain.World.Land.VinylHouse.XVinylHouseBuilder"
- codebase="FreeTrain.VinylHouse.dll"/>
+ codebase="FreeTrain.World.Land.VinylHouse.dll"/>
<picture ref="{5981B3EA-5CCF-4DB2-94DC-B7EC854987D7}" offset="0" />
<price>20</price>
<population>
@@ -31,7 +31,7 @@
<contribution type="land" id="{4F97D7DD-749E-4B65-BF13-5733B10D8570}">
<group>Greenhouse</group>
<class name="FreeTrain.World.Land.VinylHouse.YVinylHouseBuilder"
- codebase="FreeTrain.VinylHouse.dll"/>
+ codebase="FreeTrain.World.Land.VinylHouse.dll"/>
<picture ref="{5981B3EA-5CCF-4DB2-94DC-B7EC854987D7}" offset="32" />
<price>20</price>
<population>
Property changes on: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest
___________________________________________________________________
Name: svn:ignore
- bin
obj
FreeTrain.ColorTestTrain.dll
FreeTrain.ColorTestTrain.pdb
FreeTrain.ColorTestTrain.xml
+ bin
obj
FreeTrain.ColorTestTrain.dll
FreeTrain.ColorTestTrain.pdb
FreeTrain.ColorTestTrain.xml
FreeTrain.World.Rail.ColorTestTrain.dll
FreeTrain.World.Rail.ColorTestTrain.pdb
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-20 07:13:27 UTC (rev 248)
@@ -4,8 +4,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4380999E-CA4C-4AA2-8848-12FFABF72535}</ProjectGuid>
- <RootNamespace>FreeTrain.ColorTestTrain</RootNamespace>
- <AssemblyName>FreeTrain.ColorTestTrain</AssemblyName>
+ <RootNamespace>FreeTrain.World.Rail.ColorTestTrain</RootNamespace>
+ <AssemblyName>FreeTrain.World.Rail.ColorTestTrain</AssemblyName>
<OutputType>Library</OutputType>
<ApplicationIcon />
<PreBuildEvent />
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml 2008-03-19 23:00:17 UTC (rev 247)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml 2008-03-20 07:13:27 UTC (rev 248)
@@ -6,14 +6,14 @@
<contribution type="menu" id="{8CA8F000-4DC6-4441-8F53-A628C952BD9F}">
<class name="FreeTrain.World.Rail.ColorTestTrain.ColorConfigCommand"
- codebase="FreeTrain.ColorTestTrain.dll" />
+ codebase="FreeTrain.World.Rail.ColorTestTrain.dll" />
</contribution>
<!-- Test Train -->
<contribution type="trainCar" id="{6E5E12DD-69CB-4DF2-B4F0-2BCDA703CBB0}">
<class
name="FreeTrain.World.Rail.ColorTestTrain.ColorTestTrainCar"
- codebase="FreeTrain.ColorTestTrain.dll" />
+ codebase="FreeTrain.World.Rail.ColorTestTrain.dll" />
</contribution>
<contribution type="train" id="{719F0922-EA74-409C-B829-C4950201C226}">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-20 07:24:03
|
Revision: 249
http://freetrain.svn.sourceforge.net/freetrain/?rev=249&view=rev
Author: jendave
Date: 2008-03-20 00:24:08 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
rename some assemblies
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.sln
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
Added Paths:
-----------
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.Generic.csproj
Removed Paths:
-------------
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj
Property Changed:
----------------
branches/FreeTrainSDL/core/
branches/FreeTrainSDL/lib/Controls/
branches/FreeTrainSDL/lib/SDLGFX.net/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/
Modified: branches/FreeTrainSDL/FreeTrainSDL.sln
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.sln 2008-03-20 07:13:27 UTC (rev 248)
+++ branches/FreeTrainSDL/FreeTrainSDL.sln 2008-03-20 07:24:08 UTC (rev 249)
@@ -19,7 +19,7 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.VinylHouse", "plugins\org.kohsuke.freetrain.land.477\FreeTrain.VinylHouse.csproj", "{D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.ExpandedContributions", "plugins\jp.co.tripod.chiname.lib.generic\FreeTrain.ExpandedContributions.csproj", "{14C6D588-E391-49CE-A1D2-2A8A2A60A540}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.Generic", "plugins\jp.co.tripod.chiname.lib.generic\FreeTrain.Generic.csproj", "{14C6D588-E391-49CE-A1D2-2A8A2A60A540}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Property changes on: branches/FreeTrainSDL/core
___________________________________________________________________
Name: svn:ignore
- obj
Debug
bin
+ obj
Debug
bin
FreeTrain.xml
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-20 07:13:27 UTC (rev 248)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-20 07:24:08 UTC (rev 249)
@@ -32,7 +32,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>bin\Debug\FreeTrain.Core.xml</DocumentationFile>
+ <DocumentationFile>FreeTrain.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -830,9 +830,6 @@
<Content Include="..\plugins\system\plugin.xml">
<Link>plugin.xml</Link>
</Content>
- <Content Include="..\whatsnew.txt">
- <Link>whatsnew.txt</Link>
- </Content>
<Content Include="contributions\readme.txt" />
<Content Include="res\Arrows.bmp" />
<Content Include="res\BridgePier.bmp" />
Property changes on: branches/FreeTrainSDL/lib/Controls
___________________________________________________________________
Name: svn:ignore
- obj
bin
+ obj
bin
FreeTrain.Controls.xml
Modified: branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
===================================================================
--- branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2008-03-20 07:13:27 UTC (rev 248)
+++ branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2008-03-20 07:24:08 UTC (rev 249)
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>bin\Debug\FreeTrain.Controls.xml</DocumentationFile>
+ <DocumentationFile>FreeTrain.Controls.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Property changes on: branches/FreeTrainSDL/lib/SDLGFX.net
___________________________________________________________________
Name: svn:ignore
- obj
bin
*.swp
+ obj
bin
*.swp
SDLGFX.net.xml
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj 2008-03-20 07:13:27 UTC (rev 248)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj 2008-03-20 07:24:08 UTC (rev 249)
@@ -16,7 +16,7 @@
<DebugType>Full</DebugType>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>bin\Debug\SDLGFX.net.XML</DocumentationFile>
+ <DocumentationFile>SDLGFX.net.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>bin\Release\</OutputPath>
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib
___________________________________________________________________
Name: svn:ignore
- SDLGFX.net.xml
DummyCars.dll
DummyCars.pdb
RoadAccessory.dll
RoadAccessory.pdb
RoadAccessory.XML
SDLGFX.net.dll
SDLGFX.net.pdb
*.XML
FreeTrain.DummyCars.dll
FreeTrain.DummyCars.pdb
FreeTrain.DummyCars.xml
FreeTrain.RoadAccessory.dll
FreeTrain.RoadAccessory.pdb
FreeTrain.RoadAccessory.xml
.plugin.xml.swp
FreeTrain.World.Road.Accessory.dll
FreeTrain.World.Road.Accessory.pdb
FreeTrain.World.Road.DummyCars.dll
FreeTrain.World.Road.DummyCars.pdb
+ SDLGFX.net.xml
DummyCars.dll
DummyCars.pdb
RoadAccessory.dll
RoadAccessory.pdb
RoadAccessory.XML
SDLGFX.net.dll
SDLGFX.net.pdb
*.XML
FreeTrain.DummyCars.dll
FreeTrain.DummyCars.pdb
FreeTrain.DummyCars.xml
FreeTrain.RoadAccessory.dll
FreeTrain.RoadAccessory.pdb
FreeTrain.RoadAccessory.xml
.plugin.xml.swp
FreeTrain.World.Road.Accessory.dll
FreeTrain.World.Road.Accessory.pdb
FreeTrain.World.Road.DummyCars.dll
FreeTrain.World.Road.DummyCars.pdb
FreeTrain.World.Road.Accessory.xml
FreeTrain.World.Road.DummyCars.xml
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars
___________________________________________________________________
Name: svn:ignore
- obj
+ obj
FreeTrain.World.Road.DummyCars.xml
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj 2008-03-20 07:13:27 UTC (rev 248)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj 2008-03-20 07:24:08 UTC (rev 249)
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>..\..\FreeTrain.DummyCars.xml</DocumentationFile>
+ <DocumentationFile>FreeTrain.World.Road.DummyCars.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory
___________________________________________________________________
Name: svn:ignore
- obj
+ obj
FreeTrain.World.Road.Accessory.xml
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj 2008-03-20 07:13:27 UTC (rev 248)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj 2008-03-20 07:24:08 UTC (rev 249)
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>..\..\FreeTrain.RoadAccessory.xml</DocumentationFile>
+ <DocumentationFile>FreeTrain.World.Road.Accessory.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic
___________________________________________________________________
Name: svn:ignore
- obj
FreeTrain.ExpandedContributions.dll
FreeTrain.ExpandedContributions.pdb
FreeTrain.ExpandedContributions.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
*.tmp
.plugin.xml.swp
bin
FreeTrain.Framework.Plugin.Generic.dll
FreeTrain.Framework.Plugin.Generic.pdb
+ obj
FreeTrain.ExpandedContributions.dll
FreeTrain.ExpandedContributions.pdb
FreeTrain.ExpandedContributions.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
*.tmp
.plugin.xml.swp
bin
FreeTrain.Framework.Plugin.Generic.dll
FreeTrain.Framework.Plugin.Generic.pdb
FreeTrain.Framework.Plugin.Generic.xml
Deleted: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj 2008-03-20 07:13:27 UTC (rev 248)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj 2008-03-20 07:24:08 UTC (rev 249)
@@ -1,149 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>8.0.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{14C6D588-E391-49CE-A1D2-2A8A2A60A540}</ProjectGuid>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
- <AssemblyName>FreeTrain.Framework.Plugin.Generic</AssemblyName>
- <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
- <DefaultClientScript>JScript</DefaultClientScript>
- <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
- <DefaultTargetSchema>IE50</DefaultTargetSchema>
- <DelaySign>false</DelaySign>
- <OutputType>Library</OutputType>
- <RootNamespace>FreeTrain.Framework.Plugin.Generic</RootNamespace>
- <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <SignAssembly>true</SignAssembly>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>.\</OutputPath>
- <PlatformTarget>x86</PlatformTarget>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>FreeTrain.ExpandedContributions.xml</DocumentationFile>
- <DebugSymbols>true</DebugSymbols>
- <FileAlignment>4096</FileAlignment>
- <NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
- <Optimize>false</Optimize>
- <RegisterForComInterop>false</RegisterForComInterop>
- <RemoveIntegerChecks>false</RemoveIntegerChecks>
- <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <WarningLevel>4</WarningLevel>
- <DebugType>full</DebugType>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>bin\Release\</OutputPath>
- <PlatformTarget>x86</PlatformTarget>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
- <DebugSymbols>false</DebugSymbols>
- <FileAlignment>4096</FileAlignment>
- <NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
- <Optimize>true</Optimize>
- <RegisterForComInterop>false</RegisterForComInterop>
- <RemoveIntegerChecks>false</RemoveIntegerChecks>
- <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <WarningLevel>4</WarningLevel>
- <DebugType>none</DebugType>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System">
- <Name>System</Name>
- </Reference>
- <Reference Include="System.Drawing">
- <Name>System.Drawing</Name>
- </Reference>
- <Reference Include="System.Windows.Forms">
- <Name>System.Windows.Forms</Name>
- </Reference>
- <Reference Include="System.Xml">
- <Name>System.XML</Name>
- </Reference>
- <ProjectReference Include="..\..\core\FreeTrain.Core.csproj">
- <Name>FreeTrain.Core</Name>
- <Project>{7746CF50-D84E-4E7B-83FB-AB43DB854DA8}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\lib\Controls\FreeTrain.Controls.csproj">
- <Name>FreeTrain.Controls</Name>
- <Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\lib\SDLGFX.net\SDL.net.csproj">
- <Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
- <Name>SDL.net</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Content Include="CategoryTree.xml" />
- <Content Include="icons.bmp" />
- <Content Include="icons_sp.bmp" />
- <Content Include="mouse.ico" />
- <Compile Include="CategoryTreeWnd.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="GenericLandContribution.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="GenericStructureContribution.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="MenuContributionImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="MultiSelectorController.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="StructCategory.cs">
- <SubType>Code</SubType>
- </Compile>
- <EmbeddedResource Include="CategoryTreeWnd.resx">
- <DependentUpon>CategoryTreeWnd.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="MultiSelectorController.resx">
- <DependentUpon>MultiSelectorController.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <None Include="FreeTrainSdl.snk" />
- <None Include="plugin.xml" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Copied: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.Generic.csproj (from rev 248, branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj)
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.Generic.csproj (rev 0)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.Generic.csproj 2008-03-20 07:24:08 UTC (rev 249)
@@ -0,0 +1,149 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{14C6D588-E391-49CE-A1D2-2A8A2A60A540}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>FreeTrain.Framework.Plugin.Generic</AssemblyName>
+ <AssemblyOriginatorKeyFile>FreeTrainSdl.snk</AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FreeTrain.Framework.Plugin.Generic</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>.\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>FreeTrain.Framework.Plugin.Generic.xml</DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Drawing">
+ <Name>System.Drawing</Name>
+ </Reference>
+ <Reference Include="System.Windows.Forms">
+ <Name>System.Windows.Forms</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ <ProjectReference Include="..\..\core\FreeTrain.Core.csproj">
+ <Name>FreeTrain.Core</Name>
+ <Project>{7746CF50-D84E-4E7B-83FB-AB43DB854DA8}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\lib\Controls\FreeTrain.Controls.csproj">
+ <Name>FreeTrain.Controls</Name>
+ <Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\lib\SDLGFX.net\SDL.net.csproj">
+ <Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
+ <Name>SDL.net</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="CategoryTree.xml" />
+ <Content Include="icons.bmp" />
+ <Content Include="icons_sp.bmp" />
+ <Content Include="mouse.ico" />
+ <Compile Include="CategoryTreeWnd.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GenericLandContribution.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="GenericStructureContribution.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="MenuContributionImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="MultiSelectorController.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="StructCategory.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <EmbeddedResource Include="CategoryTreeWnd.resx">
+ <DependentUpon>CategoryTreeWnd.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MultiSelectorController.resx">
+ <DependentUpon>MultiSelectorController.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <None Include="FreeTrainSdl.snk" />
+ <None Include="plugin.xml" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel
___________________________________________________________________
Name: svn:ignore
- bin
obj
AxSHDocVw.dll
FreeTrain.Controls.dll
FreeTrain.Controls.pdb
FreeTrain.Controls.xml
FreeTrain.HalfVoxelStructure.dll
FreeTrain.HalfVoxelStructure.pdb
FreeTrain.HalfVoxelStructure.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
.plugin.xml.swp
FreeTrain.World.Structs.HalfVoxelStructure.dll
FreeTrain.World.Structs.HalfVoxelStructure.pdb
+ bin
obj
AxSHDocVw.dll
FreeTrain.Controls.dll
FreeTrain.Controls.pdb
FreeTrain.Controls.xml
FreeTrain.HalfVoxelStructure.dll
FreeTrain.HalfVoxelStructure.pdb
FreeTrain.HalfVoxelStructure.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
.plugin.xml.swp
FreeTrain.World.Structs.HalfVoxelStructure.dll
FreeTrain.World.Structs.HalfVoxelStructure.pdb
FreeTrain.World.Structs.HalfVoxelStructure.xml
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2008-03-20 07:13:27 UTC (rev 248)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2008-03-20 07:24:08 UTC (rev 249)
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>FreeTrain.HalfVoxelStructure.xml</DocumentationFile>
+ <DocumentationFile>FreeTrain.World.Structs.HalfVoxelStructure.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Property changes on: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477
___________________________________________________________________
Name: svn:ignore
- bin
obj
FreeTrain.VinylHouse.dll
FreeTrain.VinylHouse.pdb
FreeTrain.VinylHouse.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
.plugin.xml.swp
FreeTrain.World.Land.VinylHouse.dll
FreeTrain.World.Land.VinylHouse.pdb
+ bin
obj
FreeTrain.VinylHouse.dll
FreeTrain.VinylHouse.pdb
FreeTrain.VinylHouse.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
.plugin.xml.swp
FreeTrain.World.Land.VinylHouse.dll
FreeTrain.World.Land.VinylHouse.pdb
FreeTrain.World.Land.VinylHouse.xml
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj 2008-03-20 07:13:27 UTC (rev 248)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj 2008-03-20 07:24:08 UTC (rev 249)
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>FreeTrain.VinylHouse.xml</DocumentationFile>
+ <DocumentationFile>FreeTrain.World.Land.VinylHouse.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Property changes on: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest
___________________________________________________________________
Name: svn:ignore
- bin
obj
FreeTrain.ColorTestTrain.dll
FreeTrain.ColorTestTrain.pdb
FreeTrain.ColorTestTrain.xml
FreeTrain.World.Rail.ColorTestTrain.dll
FreeTrain.World.Rail.ColorTestTrain.pdb
+ bin
obj
FreeTrain.ColorTestTrain.dll
FreeTrain.ColorTestTrain.pdb
FreeTrain.ColorTestTrain.xml
FreeTrain.World.Rail.ColorTestTrain.dll
FreeTrain.World.Rail.ColorTestTrain.pdb
FreeTrain.World.Rail.ColorTestTrain.xml
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-20 07:13:27 UTC (rev 248)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-20 07:24:08 UTC (rev 249)
@@ -27,7 +27,7 @@
<OutputPath>.\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <DocumentationFile>FreeTrain.ColorTestTrain.xml</DocumentationFile>
+ <DocumentationFile>FreeTrain.World.Rail.ColorTestTrain.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<NoStdLib>false</NoStdLib>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-20 07:52:11
|
Revision: 254
http://freetrain.svn.sourceforge.net/freetrain/?rev=254&view=rev
Author: jendave
Date: 2008-03-20 00:52:17 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
seprating the two projects
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.sln
branches/FreeTrainSDL/plugins/Chiname.DummyCars/FreeTrain.DummyCars.csproj
branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/FreeTrain.RoadAccessory.csproj
Property Changed:
----------------
branches/FreeTrainSDL/plugins/Chiname.DummyCars/
branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/
Modified: branches/FreeTrainSDL/FreeTrainSDL.sln
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.sln 2008-03-20 07:45:59 UTC (rev 253)
+++ branches/FreeTrainSDL/FreeTrainSDL.sln 2008-03-20 07:52:17 UTC (rev 254)
@@ -9,17 +9,17 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL.net", "lib\SDLGFX.net\SDL.net.csproj", "{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.HalfVoxelStructure", "plugins\jp.co.tripod.chiname.lib.halfvoxel\FreeTrain.HalfVoxelStructure.csproj", "{FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.ColorTestTrain", "plugins\Kohsuke.ColorTestTrain\FreeTrain.ColorTestTrain.csproj", "{4380999E-CA4C-4AA2-8848-12FFABF72535}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.ColorTestTrain", "plugins\org.kohsuke.freetrain.trains.colorTest\FreeTrain.ColorTestTrain.csproj", "{4380999E-CA4C-4AA2-8848-12FFABF72535}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.VinylHouse", "plugins\Kohsuke.VinylHouse\FreeTrain.VinylHouse.csproj", "{D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.DummyCars", "plugins\jp.co.tripod.chiname.lib\src\DummyCars\FreeTrain.DummyCars.csproj", "{733996EC-7260-4A94-B118-D1E957F0474D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.Generic", "plugins\Chiname.Generic\FreeTrain.Generic.csproj", "{14C6D588-E391-49CE-A1D2-2A8A2A60A540}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.RoadAccessory", "plugins\jp.co.tripod.chiname.lib\src\RoadAccessory\FreeTrain.RoadAccessory.csproj", "{7264D32E-75DB-4C13-9EE4-E6263FD5B652}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.HalfVoxelStructure", "plugins\Chiname.Structure.HalfVoxel\FreeTrain.HalfVoxelStructure.csproj", "{FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.VinylHouse", "plugins\org.kohsuke.freetrain.land.477\FreeTrain.VinylHouse.csproj", "{D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.DummyCars", "plugins\Chiname.DummyCars\FreeTrain.DummyCars.csproj", "{733996EC-7260-4A94-B118-D1E957F0474D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.Generic", "plugins\jp.co.tripod.chiname.lib.generic\FreeTrain.Generic.csproj", "{14C6D588-E391-49CE-A1D2-2A8A2A60A540}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.RoadAccessory", "plugins\Chiname.RoadAccessory\FreeTrain.RoadAccessory.csproj", "{7264D32E-75DB-4C13-9EE4-E6263FD5B652}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -43,14 +43,22 @@
{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4380999E-CA4C-4AA2-8848-12FFABF72535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4380999E-CA4C-4AA2-8848-12FFABF72535}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4380999E-CA4C-4AA2-8848-12FFABF72535}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4380999E-CA4C-4AA2-8848-12FFABF72535}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Release|Any CPU.Build.0 = Release|Any CPU
{FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}.Release|Any CPU.Build.0 = Release|Any CPU
- {4380999E-CA4C-4AA2-8848-12FFABF72535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4380999E-CA4C-4AA2-8848-12FFABF72535}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4380999E-CA4C-4AA2-8848-12FFABF72535}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4380999E-CA4C-4AA2-8848-12FFABF72535}.Release|Any CPU.Build.0 = Release|Any CPU
{733996EC-7260-4A94-B118-D1E957F0474D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{733996EC-7260-4A94-B118-D1E957F0474D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{733996EC-7260-4A94-B118-D1E957F0474D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -59,14 +67,6 @@
{7264D32E-75DB-4C13-9EE4-E6263FD5B652}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7264D32E-75DB-4C13-9EE4-E6263FD5B652}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7264D32E-75DB-4C13-9EE4-E6263FD5B652}.Release|Any CPU.Build.0 = Release|Any CPU
- {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Release|Any CPU.Build.0 = Release|Any CPU
- {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Property changes on: branches/FreeTrainSDL/plugins/Chiname.DummyCars
___________________________________________________________________
Name: svn:ignore
- SDLGFX.net.xml
DummyCars.dll
DummyCars.pdb
RoadAccessory.dll
RoadAccessory.pdb
RoadAccessory.XML
SDLGFX.net.dll
SDLGFX.net.pdb
*.XML
FreeTrain.DummyCars.dll
FreeTrain.DummyCars.pdb
FreeTrain.DummyCars.xml
FreeTrain.RoadAccessory.dll
FreeTrain.RoadAccessory.pdb
FreeTrain.RoadAccessory.xml
.plugin.xml.swp
FreeTrain.World.Road.Accessory.dll
FreeTrain.World.Road.Accessory.pdb
FreeTrain.World.Road.DummyCars.dll
FreeTrain.World.Road.DummyCars.pdb
FreeTrain.World.Road.Accessory.xml
FreeTrain.World.Road.DummyCars.xml
+ SDLGFX.net.xml
DummyCars.dll
DummyCars.pdb
RoadAccessory.dll
RoadAccessory.pdb
RoadAccessory.XML
SDLGFX.net.dll
SDLGFX.net.pdb
*.XML
FreeTrain.DummyCars.dll
FreeTrain.DummyCars.pdb
FreeTrain.DummyCars.xml
FreeTrain.RoadAccessory.dll
FreeTrain.RoadAccessory.pdb
FreeTrain.RoadAccessory.xml
.plugin.xml.swp
FreeTrain.World.Road.Accessory.dll
FreeTrain.World.Road.Accessory.pdb
FreeTrain.World.Road.DummyCars.dll
FreeTrain.World.Road.DummyCars.pdb
FreeTrain.World.Road.Accessory.xml
FreeTrain.World.Road.DummyCars.xml
obj
Modified: branches/FreeTrainSDL/plugins/Chiname.DummyCars/FreeTrain.DummyCars.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.DummyCars/FreeTrain.DummyCars.csproj 2008-03-20 07:45:59 UTC (rev 253)
+++ branches/FreeTrainSDL/plugins/Chiname.DummyCars/FreeTrain.DummyCars.csproj 2008-03-20 07:52:17 UTC (rev 254)
@@ -28,7 +28,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\</OutputPath>
+ <OutputPath>.\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
@@ -87,19 +87,19 @@
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
- <ProjectReference Include="..\..\..\..\core\FreeTrain.Core.csproj">
+ <ProjectReference Include="..\..\core\FreeTrain.Core.csproj">
<Name>FreeTrain.Core</Name>
<Project>{7746CF50-D84E-4E7B-83FB-AB43DB854DA8}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Controls\FreeTrain.Controls.csproj">
+ <ProjectReference Include="..\..\lib\Controls\FreeTrain.Controls.csproj">
<Name>FreeTrain.Controls</Name>
<Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\SDLGFX.net\SDL.net.csproj">
+ <ProjectReference Include="..\..\lib\SDLGFX.net\SDL.net.csproj">
<Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
<Name>SDL.net</Name>
</ProjectReference>
Property changes on: branches/FreeTrainSDL/plugins/Chiname.RoadAccessory
___________________________________________________________________
Name: svn:ignore
- SDLGFX.net.xml
DummyCars.dll
DummyCars.pdb
RoadAccessory.dll
RoadAccessory.pdb
RoadAccessory.XML
SDLGFX.net.dll
SDLGFX.net.pdb
*.XML
FreeTrain.DummyCars.dll
FreeTrain.DummyCars.pdb
FreeTrain.DummyCars.xml
FreeTrain.RoadAccessory.dll
FreeTrain.RoadAccessory.pdb
FreeTrain.RoadAccessory.xml
.plugin.xml.swp
FreeTrain.World.Road.Accessory.dll
FreeTrain.World.Road.Accessory.pdb
FreeTrain.World.Road.DummyCars.dll
FreeTrain.World.Road.DummyCars.pdb
FreeTrain.World.Road.Accessory.xml
FreeTrain.World.Road.DummyCars.xml
+ SDLGFX.net.xml
DummyCars.dll
DummyCars.pdb
RoadAccessory.dll
RoadAccessory.pdb
RoadAccessory.XML
SDLGFX.net.dll
SDLGFX.net.pdb
*.XML
FreeTrain.DummyCars.dll
FreeTrain.DummyCars.pdb
FreeTrain.DummyCars.xml
FreeTrain.RoadAccessory.dll
FreeTrain.RoadAccessory.pdb
FreeTrain.RoadAccessory.xml
.plugin.xml.swp
FreeTrain.World.Road.Accessory.dll
FreeTrain.World.Road.Accessory.pdb
FreeTrain.World.Road.DummyCars.dll
FreeTrain.World.Road.DummyCars.pdb
FreeTrain.World.Road.Accessory.xml
FreeTrain.World.Road.DummyCars.xml
obj
Modified: branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/FreeTrain.RoadAccessory.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/FreeTrain.RoadAccessory.csproj 2008-03-20 07:45:59 UTC (rev 253)
+++ branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/FreeTrain.RoadAccessory.csproj 2008-03-20 07:52:17 UTC (rev 254)
@@ -28,7 +28,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\</OutputPath>
+ <OutputPath>.\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
@@ -87,19 +87,19 @@
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
- <ProjectReference Include="..\..\..\..\core\FreeTrain.Core.csproj">
+ <ProjectReference Include="..\..\core\FreeTrain.Core.csproj">
<Name>FreeTrain.Core</Name>
<Project>{7746CF50-D84E-4E7B-83FB-AB43DB854DA8}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Controls\FreeTrain.Controls.csproj">
+ <ProjectReference Include="..\..\lib\Controls\FreeTrain.Controls.csproj">
<Name>FreeTrain.Controls</Name>
<Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\SDLGFX.net\SDL.net.csproj">
+ <ProjectReference Include="..\..\lib\SDLGFX.net\SDL.net.csproj">
<Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
<Name>SDL.net</Name>
</ProjectReference>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-20 08:06:07
|
Revision: 255
http://freetrain.svn.sourceforge.net/freetrain/?rev=255&view=rev
Author: jendave
Date: 2008-03-20 01:06:10 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
some more renames
Modified Paths:
--------------
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/plugins/Chiname.DummyCars/plugin.xml
branches/FreeTrainSDL/plugins/Chiname.Generic/plugin.xml
branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/plugin.xml
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel.OldHouse/plugin.xml
branches/FreeTrainSDL/plugins/Kohsuke.Structure/plugin.xml
Added Paths:
-----------
branches/FreeTrainSDL/core/framework/plugin/PluginDefinition.cs
branches/FreeTrainSDL/plugins/Kohsuke.Structure.OsakaCastle/
branches/FreeTrainSDL/plugins/Kohsuke.Structure.Station/
Removed Paths:
-------------
branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
branches/FreeTrainSDL/plugins/Kohsuke.OsakaCastle/
branches/FreeTrainSDL/plugins/Kohsuke.Station/
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-20 07:52:17 UTC (rev 254)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-20 08:06:10 UTC (rev 255)
@@ -465,9 +465,7 @@
<Compile Include="framework\plugin\FixedClassContributionFactory.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="framework\plugin\Plugin.cs">
- <SubType>Code</SubType>
- </Compile>
+ <Compile Include="framework\plugin\PluginDefinition.cs" />
<Compile Include="framework\plugin\PluginListDialog.cs">
<SubType>Form</SubType>
</Compile>
Deleted: branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/Plugin.cs 2008-03-20 07:52:17 UTC (rev 254)
+++ branches/FreeTrainSDL/core/framework/plugin/Plugin.cs 2008-03-20 08:06:10 UTC (rev 255)
@@ -1,273 +0,0 @@
-#region LICENSE
-/*
- * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#endregion LICENSE
-
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.IO;
-using System.Windows.Forms;
-using System.Text;
-using System.Xml;
-using FreeTrain.Util;
-using FreeTrain.Contributions.Train;
-using FreeTrain.Contributions.Land;
-using FreeTrain.Framework.Graphics;
-
-namespace FreeTrain.Framework.Plugin
-{
- /// <summary>
- /// Represents a loaded plug-in
- /// </summary>
- public class PluginDefinition
- {
- private readonly string _title;
- /// <summary>
- ///
- /// </summary>
- public string title { get { return _title; } }
-
- private readonly string _author;
- /// <summary>
- ///
- /// </summary>
- public string author { get { return _author; } }
-
- private readonly string _homepage;
- /// <summary>
- ///
- /// </summary>
- public string homepage { get { return _homepage; } }
-
- /// <summary>
- /// Base directory of this plug-in
- /// </summary>
- public readonly string dirName;
-
- /// <summary>
- /// Name of the plug-in
- /// </summary>
- public string name { get { return Path.GetFileName(dirName); } }
-
- /// <summary>
- /// All the contributions in this plug-in
- /// </summary>
- public readonly IList contributions = new ArrayList();
-
- /// <summary>
- /// Contents of plugin.xml
- /// Available only during the initialization phase.
- /// </summary>
- private XmlDocument doc;
- /// <summary>
- ///
- /// </summary>
- public XmlDocument Document
- {
- get { return doc; }
- }
-
- /// <summary>
- /// Stub instance to show information on parse error.
- /// </summary>
- /// <param name="dirname"></param>
- /// <param name="title"></param>
- /// <param name="homepage"></param>
- /// <param name="author"></param>
- protected PluginDefinition(string dirname, string title, string homepage, string author)
- {
- this.dirName = dirname;
- this._title = title;
- this._homepage = homepage;
- this._author = author;
- Debug.WriteLine(title + "," + author);
- }
-
- /// <summary>
- /// Loads a plug-in from manifest XML "plugin.xml".
- /// </summary>
- public PluginDefinition(string dirName)
- {
- this.dirName = dirName;
- doc = loadManifest(dirName);
-
- XmlElement root = doc.DocumentElement;
- _title = XmlUtil.selectSingleNode(root, "title").InnerText;
- _homepage = XmlUtil.selectSingleNode(root, "homepage").InnerText;
-
- if (root.SelectSingleNode("author") == null)
- _author = "";
- else
- _author = XmlUtil.selectSingleNode(root, "author").InnerText;
-
- Debug.WriteLine("loading plug-in: " + title);
- Debug.WriteLine(" base dir: " + dirName);
-
- }
- /// <summary>
- ///
- /// </summary>
- internal protected virtual void loadContributionFactories()
- {
- XmlElement root = doc.DocumentElement;
- // locate contribution factories first,
- // because we'll need them to load contributions.
- foreach (XmlElement contrib in root.SelectNodes("contribution"))
- {
- string type = contrib.Attributes["type"].Value;
- if (type == "contribution")
- {
- // load a contribution factory
-
- string contributionName = XmlUtil.selectSingleNode(contrib, "name").InnerText;
-
- ContributionFactory factory =
- (ContributionFactory)PluginUtil.loadObjectFromManifest(contrib);
-
- // register it
- PluginManager.theInstance.addContributionFactory(
- contributionName,
- factory);
- }
- }
- }
-
- /// <summary>
- /// Get all the dependent plug-ins.
- /// </summary>
- public PluginDefinition[] getDependencies()
- {
- ArrayList a = new ArrayList();
- if (!this.name.Equals("system"))
- a.Add(PluginManager.theInstance.getPlugin("system"));
-
- foreach (XmlElement depend in doc.DocumentElement.SelectNodes("depend"))
- {
- string name = depend.Attributes["on"].Value;
- PluginDefinition p = PluginManager.theInstance.getPlugin(name);
- if (p == null)
- throw new Exception(String.Format(
- "Plugin {1} that is needed for plugin {0} could not be found", this.name, name));
- //! "プラグイン{0}に必要なプラグイン{1}がみつかりません",this.name,name));
-
- a.Add(p);
- }
- return (PluginDefinition[])a.ToArray(typeof(PluginDefinition));
- }
-
- /// <summary>
- /// Loads plugin.xml file from the directory.
- /// </summary>
- private static XmlDocument loadManifest(string dirName)
- {
- string path = Path.Combine(dirName, "plugin.xml");
- using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
- {
- XmlDocument doc = new XmlDocument();
- XmlReaderSettings settings = new XmlReaderSettings();
- settings.XmlResolver = null;
- settings.ValidationType = ValidationType.None;
- settings.ProhibitDtd = false;
- XmlReader reader = XmlReader.Create(new XmlTextReader(path, file), settings);
- doc.Load(reader);
- return doc;
- }
- }
-
- /// <summary>
- /// Loads plugin.xml file as plain text.
- /// </summary>
- public static PluginDefinition loadFailSafe(string dirName)
- {
- string path = Path.Combine(dirName, "plugin.xml");
- string title = "s";
- string homepage = "";
- string author = "s";
- StreamReader sr = null;
- try
- {
- sr = new StreamReader(path, Encoding.GetEncoding("utf-8"));
- string s = sr.ReadToEnd();
- title = extractNodeText(s, "title");
- homepage = extractNodeText(s, "homepage");
- author = extractNodeText(s, "author");
- }
- finally
- {
- if (sr != null)
- sr.Close();
- }
- return new PluginDefinition(dirName, title, homepage, author);
- }
-
- private static string extractNodeText(string buffer, string tagname)
- {
- if (buffer == null || tagname == null)
- return "";
- int begin = buffer.IndexOf(string.Format("<{0}>", tagname));
- if (begin == -1)
- return "";
- begin += tagname.Length + 2;
- int end = buffer.IndexOf(string.Format("</{0}>", tagname), begin);
- if (end == -1)
- end = buffer.Length;
- return buffer.Substring(begin, end - begin);
- }
-
- /// <summary>
- /// Loads contributions from this plug-in
- /// </summary>
- internal protected virtual void loadContributions()
- {
- Debug.WriteLine("loading contributions from " + name);
- XmlElement root = doc.DocumentElement;
-
- Uri baseUri = new Uri(root.BaseURI);
-
- // load contributions
- foreach (XmlElement contrib in root.SelectNodes("contribution"))
- {
- try
- {
- string type = contrib.Attributes["type"].Value;
- if (type == "contribution") continue; // ignore
-
- ContributionFactory factory = PluginManager.theInstance.getContributionFactory(type);
- Contribution c = factory.load(this, contrib);
- contributions.Add(c);
- PluginManager.theInstance.addContribution(c);
- c.init(this, baseUri);
- }
- catch (Exception e)
- {
- throw new Exception("failed to load contribution " + contrib.Attributes["id"].Value, e);
- }
- }
- }
-
-
- /// <summary>
- /// Loads a stream from the plug-in directory.
- /// </summary>
- public Stream loadStream(string name)
- {
- return new FileStream(Path.Combine(dirName, name), FileMode.Open, FileAccess.Read, FileShare.Read);
- }
- }
-}
Copied: branches/FreeTrainSDL/core/framework/plugin/PluginDefinition.cs (from rev 253, branches/FreeTrainSDL/core/framework/plugin/Plugin.cs)
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/PluginDefinition.cs (rev 0)
+++ branches/FreeTrainSDL/core/framework/plugin/PluginDefinition.cs 2008-03-20 08:06:10 UTC (rev 255)
@@ -0,0 +1,273 @@
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+using System.Windows.Forms;
+using System.Text;
+using System.Xml;
+using FreeTrain.Util;
+using FreeTrain.Contributions.Train;
+using FreeTrain.Contributions.Land;
+using FreeTrain.Framework.Graphics;
+
+namespace FreeTrain.Framework.Plugin
+{
+ /// <summary>
+ /// Represents a loaded plug-in
+ /// </summary>
+ public class PluginDefinition
+ {
+ private readonly string _title;
+ /// <summary>
+ ///
+ /// </summary>
+ public string title { get { return _title; } }
+
+ private readonly string _author;
+ /// <summary>
+ ///
+ /// </summary>
+ public string author { get { return _author; } }
+
+ private readonly string _homepage;
+ /// <summary>
+ ///
+ /// </summary>
+ public string homepage { get { return _homepage; } }
+
+ /// <summary>
+ /// Base directory of this plug-in
+ /// </summary>
+ public readonly string dirName;
+
+ /// <summary>
+ /// Name of the plug-in
+ /// </summary>
+ public string name { get { return Path.GetFileName(dirName); } }
+
+ /// <summary>
+ /// All the contributions in this plug-in
+ /// </summary>
+ public readonly IList contributions = new ArrayList();
+
+ /// <summary>
+ /// Contents of plugin.xml
+ /// Available only during the initialization phase.
+ /// </summary>
+ private XmlDocument doc;
+ /// <summary>
+ ///
+ /// </summary>
+ public XmlDocument Document
+ {
+ get { return doc; }
+ }
+
+ /// <summary>
+ /// Stub instance to show information on parse error.
+ /// </summary>
+ /// <param name="dirname"></param>
+ /// <param name="title"></param>
+ /// <param name="homepage"></param>
+ /// <param name="author"></param>
+ protected PluginDefinition(string dirname, string title, string homepage, string author)
+ {
+ this.dirName = dirname;
+ this._title = title;
+ this._homepage = homepage;
+ this._author = author;
+ Debug.WriteLine(title + "," + author);
+ }
+
+ /// <summary>
+ /// Loads a plug-in from manifest XML "plugin.xml".
+ /// </summary>
+ public PluginDefinition(string dirName)
+ {
+ this.dirName = dirName;
+ doc = loadManifest(dirName);
+
+ XmlElement root = doc.DocumentElement;
+ _title = XmlUtil.selectSingleNode(root, "title").InnerText;
+ _homepage = XmlUtil.selectSingleNode(root, "homepage").InnerText;
+
+ if (root.SelectSingleNode("author") == null)
+ _author = "";
+ else
+ _author = XmlUtil.selectSingleNode(root, "author").InnerText;
+
+ Debug.WriteLine("loading plug-in: " + title);
+ Debug.WriteLine(" base dir: " + dirName);
+
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ internal protected virtual void loadContributionFactories()
+ {
+ XmlElement root = doc.DocumentElement;
+ // locate contribution factories first,
+ // because we'll need them to load contributions.
+ foreach (XmlElement contrib in root.SelectNodes("contribution"))
+ {
+ string type = contrib.Attributes["type"].Value;
+ if (type == "contribution")
+ {
+ // load a contribution factory
+
+ string contributionName = XmlUtil.selectSingleNode(contrib, "name").InnerText;
+
+ ContributionFactory factory =
+ (ContributionFactory)PluginUtil.loadObjectFromManifest(contrib);
+
+ // register it
+ PluginManager.theInstance.addContributionFactory(
+ contributionName,
+ factory);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Get all the dependent plug-ins.
+ /// </summary>
+ public PluginDefinition[] getDependencies()
+ {
+ ArrayList a = new ArrayList();
+ if (!this.name.Equals("system"))
+ a.Add(PluginManager.theInstance.getPlugin("system"));
+
+ foreach (XmlElement depend in doc.DocumentElement.SelectNodes("depend"))
+ {
+ string name = depend.Attributes["on"].Value;
+ PluginDefinition p = PluginManager.theInstance.getPlugin(name);
+ if (p == null)
+ throw new Exception(String.Format(
+ "Plugin {1} that is needed for plugin {0} could not be found", this.name, name));
+ //! "プラグイン{0}に必要なプラグイン{1}がみつかりません",this.name,name));
+
+ a.Add(p);
+ }
+ return (PluginDefinition[])a.ToArray(typeof(PluginDefinition));
+ }
+
+ /// <summary>
+ /// Loads plugin.xml file from the directory.
+ /// </summary>
+ private static XmlDocument loadManifest(string dirName)
+ {
+ string path = Path.Combine(dirName, "plugin.xml");
+ using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+ {
+ XmlDocument doc = new XmlDocument();
+ XmlReaderSettings settings = new XmlReaderSettings();
+ settings.XmlResolver = null;
+ settings.ValidationType = ValidationType.None;
+ settings.ProhibitDtd = false;
+ XmlReader reader = XmlReader.Create(new XmlTextReader(path, file), settings);
+ doc.Load(reader);
+ return doc;
+ }
+ }
+
+ /// <summary>
+ /// Loads plugin.xml file as plain text.
+ /// </summary>
+ public static PluginDefinition loadFailSafe(string dirName)
+ {
+ string path = Path.Combine(dirName, "plugin.xml");
+ string title = "s";
+ string homepage = "";
+ string author = "s";
+ StreamReader sr = null;
+ try
+ {
+ sr = new StreamReader(path, Encoding.GetEncoding("utf-8"));
+ string s = sr.ReadToEnd();
+ title = extractNodeText(s, "title");
+ homepage = extractNodeText(s, "homepage");
+ author = extractNodeText(s, "author");
+ }
+ finally
+ {
+ if (sr != null)
+ sr.Close();
+ }
+ return new PluginDefinition(dirName, title, homepage, author);
+ }
+
+ private static string extractNodeText(string buffer, string tagname)
+ {
+ if (buffer == null || tagname == null)
+ return "";
+ int begin = buffer.IndexOf(string.Format("<{0}>", tagname));
+ if (begin == -1)
+ return "";
+ begin += tagname.Length + 2;
+ int end = buffer.IndexOf(string.Format("</{0}>", tagname), begin);
+ if (end == -1)
+ end = buffer.Length;
+ return buffer.Substring(begin, end - begin);
+ }
+
+ /// <summary>
+ /// Loads contributions from this plug-in
+ /// </summary>
+ internal protected virtual void loadContributions()
+ {
+ Debug.WriteLine("loading contributions from " + name);
+ XmlElement root = doc.DocumentElement;
+
+ Uri baseUri = new Uri(root.BaseURI);
+
+ // load contributions
+ foreach (XmlElement contrib in root.SelectNodes("contribution"))
+ {
+ try
+ {
+ string type = contrib.Attributes["type"].Value;
+ if (type == "contribution") continue; // ignore
+
+ ContributionFactory factory = PluginManager.theInstance.getContributionFactory(type);
+ Contribution c = factory.load(this, contrib);
+ contributions.Add(c);
+ PluginManager.theInstance.addContribution(c);
+ c.init(this, baseUri);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("failed to load contribution " + contrib.Attributes["id"].Value, e);
+ }
+ }
+ }
+
+
+ /// <summary>
+ /// Loads a stream from the plug-in directory.
+ /// </summary>
+ public Stream loadStream(string name)
+ {
+ return new FileStream(Path.Combine(dirName, name), FileMode.Open, FileAccess.Read, FileShare.Read);
+ }
+ }
+}
Modified: branches/FreeTrainSDL/plugins/Chiname.DummyCars/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.DummyCars/plugin.xml 2008-03-20 07:52:17 UTC (rev 254)
+++ branches/FreeTrainSDL/plugins/Chiname.DummyCars/plugin.xml 2008-03-20 08:06:10 UTC (rev 255)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<plug-in>
- <title>Pedestrian Crossing</title>
<title>Parking Area</title>
<!--//!<title>横断歩道</title>
<title>駐車場</title>-->
@@ -8,19 +7,6 @@
<!--!<author>C477@2両目</author>-->
<homepage>http://www.rocket.ne.jp/~nao/</homepage>
- <contribution type="contribution" id="{782BAFD9-2698-4C0E-C477-FFEA0F7D1B8A}">
- <name>roadAccessory</name>
- <class name="FreeTrain.Framework.Plugin.FixedClassContributionFactory"/>
- <implementation name="FreeTrain.World.Road.Accessory.RoadAccessoryContribution"
- codebase="FreeTrain.World.Road.Accessory.dll" />
- </contribution>
-
- <!-- temporary -->
- <contribution type="menu" id="{3773CA2C-11B5-4DCC-C477-2296E9EBEBA7}">
- <class name="FreeTrain.World.Road.Accessory.MenuContributionImpl"
- codebase="FreeTrain.World.Road.Accessory.dll" />
- </contribution>
-
<contribution type="contribution" id="{0A73F9C6-BDCC-43DF-C477-E28B76058E8C}">
<name>DummyCar</name>
<class name="FreeTrain.Framework.Plugin.FixedClassContributionFactory"/>
Modified: branches/FreeTrainSDL/plugins/Chiname.Generic/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.Generic/plugin.xml 2008-03-20 07:52:17 UTC (rev 254)
+++ branches/FreeTrainSDL/plugins/Chiname.Generic/plugin.xml 2008-03-20 08:06:10 UTC (rev 255)
@@ -24,7 +24,7 @@
]>
<plug-in>
- <depend on="org.kohsuke.freetrain.structure.c477"/>
+ <depend on="Kohsuke.Structure"/>
<title>Generic Plugin</title>
<!--<title>汎用プラグイン</title> -->
Modified: branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/plugin.xml 2008-03-20 07:52:17 UTC (rev 254)
+++ branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/plugin.xml 2008-03-20 08:06:10 UTC (rev 255)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<plug-in>
<title>Pedestrian Crossing</title>
- <title>Parking Area</title>
<!--//!<title>横断歩道</title>
<title>駐車場</title>-->
<author>C477</author>
@@ -21,17 +20,4 @@
codebase="FreeTrain.World.Road.Accessory.dll" />
</contribution>
- <contribution type="contribution" id="{0A73F9C6-BDCC-43DF-C477-E28B76058E8C}">
- <name>DummyCar</name>
- <class name="FreeTrain.Framework.Plugin.FixedClassContributionFactory"/>
- <implementation name="FreeTrain.World.Road.DummyCars.DummyCarContribution"
- codebase="FreeTrain.World.Road.DummyCars.dll" />
- </contribution>
-
- <!-- temporary -->
- <contribution type="menu" id="{BFC035E9-8B0E-41D6-C477-72F99D820290}">
- <class name="FreeTrain.World.Road.DummyCars.MenuContributionImpl"
- codebase="FreeTrain.World.Road.DummyCars.dll" />
- </contribution>
-
</plug-in>
Modified: branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel.OldHouse/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel.OldHouse/plugin.xml 2008-03-20 07:52:17 UTC (rev 254)
+++ branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel.OldHouse/plugin.xml 2008-03-20 08:06:10 UTC (rev 255)
@@ -19,7 +19,7 @@
<title>Half-tile Houses</title>
<author>C477</author>
<homepage>http://www.rocket.ne.jp/~nao/</homepage>
- <depend on="jp.co.tripod.chiname.lib.halfvoxel" />
+ <depend on="Chiname.Structure.HalfVoxel" />
<contribution type="picture" id="{170B8A99-4A14-42EE-C477-AA5C3FB3F387}">
<picture src="oldhouses_hv.bmp"/>
Modified: branches/FreeTrainSDL/plugins/Kohsuke.Structure/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/Kohsuke.Structure/plugin.xml 2008-03-20 07:52:17 UTC (rev 254)
+++ branches/FreeTrainSDL/plugins/Kohsuke.Structure/plugin.xml 2008-03-20 08:06:10 UTC (rev 255)
@@ -72,7 +72,7 @@
<title>Structure Set</title>
<homepage>http://www.rocket.ne.jp/~nao/</homepage>
<author>C477</author>
- <depend on="org.kohsuke.freetrain.structure.osakaCastle"/>
+ <depend on="Kohsuke.Structure.OsakaCastle"/>
<contribution type="picture" id="{5E1F4ECE-06AF-4D23-BF80-E9FC47E4B167}">
<picture src="store_s01.bmp" >
Copied: branches/FreeTrainSDL/plugins/Kohsuke.Structure.OsakaCastle (from rev 253, branches/FreeTrainSDL/plugins/Kohsuke.OsakaCastle)
Copied: branches/FreeTrainSDL/plugins/Kohsuke.Structure.Station (from rev 253, branches/FreeTrainSDL/plugins/Kohsuke.Station)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-20 09:07:33
|
Revision: 256
http://freetrain.svn.sourceforge.net/freetrain/?rev=256&view=rev
Author: jendave
Date: 2008-03-20 02:07:37 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
fix issue with dir name
Modified Paths:
--------------
branches/FreeTrainSDL/plugins/Chiname.Generic/StructCategory.cs
Removed Paths:
-------------
branches/FreeTrainSDL/lib/Controls/.cvsignore
Property Changed:
----------------
branches/FreeTrainSDL/plugins/Kohsuke.Structure/
branches/FreeTrainSDL/plugins/Kohsuke.Structure.OsakaCastle/
Deleted: branches/FreeTrainSDL/lib/Controls/.cvsignore
===================================================================
--- branches/FreeTrainSDL/lib/Controls/.cvsignore 2008-03-20 08:06:10 UTC (rev 255)
+++ branches/FreeTrainSDL/lib/Controls/.cvsignore 2008-03-20 09:07:37 UTC (rev 256)
@@ -1,2 +0,0 @@
-bin
-obj
Modified: branches/FreeTrainSDL/plugins/Chiname.Generic/StructCategory.cs
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.Generic/StructCategory.cs 2008-03-20 08:06:10 UTC (rev 255)
+++ branches/FreeTrainSDL/plugins/Chiname.Generic/StructCategory.cs 2008-03-20 09:07:37 UTC (rev 256)
@@ -272,7 +272,7 @@
/// </summary>
static public void loadDefaultTree()
{
- PluginDefinition p = PluginManager.theInstance.getPlugin("jp.co.tripod.chiname.lib.generic");
+ PluginDefinition p = PluginManager.theInstance.getPlugin("Chiname.Generic");
_baseDir = p.dirName;
string filename = Path.Combine(p.dirName, "CategoryTree.xml");
using (Stream file = p.loadStream(filename))
Property changes on: branches/FreeTrainSDL/plugins/Kohsuke.Structure
___________________________________________________________________
Name: svn:ignore
+ .plugin.xml.swp
Property changes on: branches/FreeTrainSDL/plugins/Kohsuke.Structure.OsakaCastle
___________________________________________________________________
Name: svn:ignore
+ .plugin.xml.swp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-20 09:09:46
|
Revision: 257
http://freetrain.svn.sourceforge.net/freetrain/?rev=257&view=rev
Author: jendave
Date: 2008-03-20 02:09:52 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
remove obselete files
Removed Paths:
-------------
branches/FreeTrainSDL/core/.cvsignore
branches/FreeTrainSDL/core/res/.cvsignore
branches/FreeTrainSDL/plugins/Chiname.DummyCars/.cvsignore
branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/.cvsignore
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/.cvsignore
branches/FreeTrainSDL/plugins/Kohsuke.ColorTestTrain/.cvsignore
branches/FreeTrainSDL/plugins/Kohsuke.VinylHouse/.cvsignore
Deleted: branches/FreeTrainSDL/core/.cvsignore
===================================================================
--- branches/FreeTrainSDL/core/.cvsignore 2008-03-20 09:07:37 UTC (rev 256)
+++ branches/FreeTrainSDL/core/.cvsignore 2008-03-20 09:09:52 UTC (rev 257)
@@ -1,3 +0,0 @@
-obj
-bin
-*.user
Deleted: branches/FreeTrainSDL/core/res/.cvsignore
===================================================================
--- branches/FreeTrainSDL/core/res/.cvsignore 2008-03-20 09:07:37 UTC (rev 256)
+++ branches/FreeTrainSDL/core/res/.cvsignore 2008-03-20 09:09:52 UTC (rev 257)
@@ -1 +0,0 @@
-Thumbs.db
Deleted: branches/FreeTrainSDL/plugins/Chiname.DummyCars/.cvsignore
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.DummyCars/.cvsignore 2008-03-20 09:07:37 UTC (rev 256)
+++ branches/FreeTrainSDL/plugins/Chiname.DummyCars/.cvsignore 2008-03-20 09:09:52 UTC (rev 257)
@@ -1,5 +0,0 @@
-bin
-obj
-*.user
-*.dll
-*.pdb
\ No newline at end of file
Deleted: branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/.cvsignore
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/.cvsignore 2008-03-20 09:07:37 UTC (rev 256)
+++ branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/.cvsignore 2008-03-20 09:09:52 UTC (rev 257)
@@ -1,5 +0,0 @@
-bin
-obj
-*.user
-*.dll
-*.pdb
\ No newline at end of file
Deleted: branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/.cvsignore
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/.cvsignore 2008-03-20 09:07:37 UTC (rev 256)
+++ branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/.cvsignore 2008-03-20 09:09:52 UTC (rev 257)
@@ -1,3 +0,0 @@
-bin
-obj
-*.user
Deleted: branches/FreeTrainSDL/plugins/Kohsuke.ColorTestTrain/.cvsignore
===================================================================
--- branches/FreeTrainSDL/plugins/Kohsuke.ColorTestTrain/.cvsignore 2008-03-20 09:07:37 UTC (rev 256)
+++ branches/FreeTrainSDL/plugins/Kohsuke.ColorTestTrain/.cvsignore 2008-03-20 09:09:52 UTC (rev 257)
@@ -1,3 +0,0 @@
-bin
-obj
-*.user
Deleted: branches/FreeTrainSDL/plugins/Kohsuke.VinylHouse/.cvsignore
===================================================================
--- branches/FreeTrainSDL/plugins/Kohsuke.VinylHouse/.cvsignore 2008-03-20 09:07:37 UTC (rev 256)
+++ branches/FreeTrainSDL/plugins/Kohsuke.VinylHouse/.cvsignore 2008-03-20 09:09:52 UTC (rev 257)
@@ -1,3 +0,0 @@
-bin
-obj
-*.user
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-20 15:23:35
|
Revision: 262
http://freetrain.svn.sourceforge.net/freetrain/?rev=262&view=rev
Author: jendave
Date: 2008-03-20 08:23:41 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
Translation updates
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/world/Time.cs
Added Paths:
-----------
branches/FreeTrainSDL/core/lang/
branches/FreeTrainSDL/core/lang/freetrain.en-US.txt
branches/FreeTrainSDL/core/lang/freetrain.ja-JP.txt
branches/FreeTrainSDL/core/util/Translation.cs
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-20 09:18:04 UTC (rev 261)
+++ branches/FreeTrainSDL/Program.cs 2008-03-20 15:23:41 UTC (rev 262)
@@ -39,6 +39,7 @@
using FreeTrain.Controllers.Structs;
using FreeTrain.Framework;
using FreeTrain.Views;
+using FreeTrain.Util;
namespace FreeTrain
{
@@ -294,6 +295,9 @@
private void Go()
{
+ //set the current language (autodetected)
+ //Application.CurrentCulture = new System.Globalization.CultureInfo("ja-JP");
+
timer = new System.Windows.Forms.Timer();
Events.KeyboardDown += new EventHandler<KeyboardEventArgs>(this.KeyDown);
Events.MouseButtonDown +=
@@ -310,9 +314,18 @@
dragStartScrollPosition = new Point(0, 0);
ScrollPosition = new Point(0, 0);
- SdlDotNet.Graphics.Video.WindowIcon();
- SdlDotNet.Graphics.Video.WindowCaption = "FreeTrain SDL";
- SdlDotNet.Graphics.Video.Initialize();
+ try
+ {
+ SdlDotNet.Graphics.Video.WindowIcon();
+ SdlDotNet.Graphics.Video.WindowCaption = Translation.GetString("MAIN_WINDOW_TITLE");
+ SdlDotNet.Graphics.Video.Initialize();
+ }
+ catch
+ {
+ MessageBox.Show(Translation.GetString("SDL_NOT_FOUND"));
+ return;
+ }
+
Mixer.Initialize();
SdlMixer.MusicFinishedDelegate musicStopped = new SdlMixer.MusicFinishedDelegate(MusicHasStopped);
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-20 09:18:04 UTC (rev 261)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-20 15:23:41 UTC (rev 262)
@@ -533,6 +533,7 @@
<Compile Include="util\Set.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="util\Translation.cs" />
<Compile Include="util\UrlInvoker.cs">
<SubType>Code</SubType>
</Compile>
@@ -829,6 +830,8 @@
<Link>plugin.xml</Link>
</Content>
<Content Include="contributions\readme.txt" />
+ <Content Include="lang\freetrain.en-US.txt" />
+ <Content Include="lang\freetrain.ja-JP.txt" />
<Content Include="res\Arrows.bmp" />
<Content Include="res\BridgePier.bmp" />
<Content Include="res\ConstructionBones.bmp" />
@@ -989,7 +992,10 @@
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent>mkdir "$(SolutionDir)bin\Debug\lang"
+"$(SolutionDir)resgen.exe" "$(ProjectDir)lang\freetrain.en-US.txt" "$(SolutionDir)bin\Debug\lang\freetrain.resources"
+"$(SolutionDir)resgen.exe" "$(ProjectDir)lang\freetrain.en-US.txt" "$(SolutionDir)bin\Debug\lang\freetrain.en-US.resources"
+"$(SolutionDir)resgen.exe" "$(ProjectDir)lang\freetrain.en-US.txt" "$(SolutionDir)bin\Debug\lang\freetrain.en-AU.resources"
+"$(SolutionDir)resgen.exe" "$(ProjectDir)lang\freetrain.ja-JP.txt" "$(SolutionDir)bin\Debug\lang\freetrain.ja-JP.resources"</PostBuildEvent>
</PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs 2008-03-20 09:18:04 UTC (rev 261)
+++ branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs 2008-03-20 15:23:41 UTC (rev 262)
@@ -27,6 +27,7 @@
using FreeTrain.Framework;
using FreeTrain.Views;
using FreeTrain.World;
+using FreeTrain.Util;
namespace FreeTrain.Controllers
{
@@ -132,7 +133,7 @@
this.lblExit.Name = "lblExit";
this.lblExit.Size = new System.Drawing.Size(39, 15);
this.lblExit.TabIndex = 1;
- this.lblExit.Text = "EXIT";
+ this.lblExit.Text = Translation.GetString("CONTROLLER_EXIT_BUTTON");
this.lblExit.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.lblExit.MouseLeave += new System.EventHandler(this.lblExit_MouseLeave);
this.lblExit.Click += new System.EventHandler(this.lblExit_Click);
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-20 09:18:04 UTC (rev 261)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-20 15:23:41 UTC (rev 262)
@@ -104,8 +104,8 @@
private void updateDialog()
{
message.Text = anchor != UNPLACED ?
- "Select end point" : "Select starting point";
- //! "終点を選んでください":"始点を選んでください";
+ Translation.GetString("CONTROLLER_RAIL_END_POINT") :
+ Translation.GetString("CONTROLLER_RAIL_START_POINT");
}
/// <summary>
@@ -145,7 +145,7 @@
this.message.Name = "message";
this.message.Size = new System.Drawing.Size(105, 26);
this.message.TabIndex = 1;
- this.message.Text = "Click on two points on the map to place tracks";
+ this.message.Text = Translation.GetString("CONTROLLER_RAIL_INITIAL_MESSAGE");
this.message.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//this.message.MouseDown += new MouseEventHandler(this.AbstractControllerForm_MouseDown);
//this.message.MouseMove += new MouseEventHandler(this.AbstractControllerForm_MouseMove);
@@ -161,7 +161,7 @@
this.buttonPlace.Size = new System.Drawing.Size(46, 26);
this.buttonPlace.TabIndex = 2;
this.buttonPlace.TabStop = true;
- this.buttonPlace.Text = "Place";
+ this.buttonPlace.Text = Translation.GetString("CONTROLLER_PLACE_BUTTON");
this.buttonPlace.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.buttonPlace.UseVisualStyleBackColor = false;
this.buttonPlace.CheckedChanged += new System.EventHandler(this.modeChanged);
@@ -176,7 +176,7 @@
this.buttonRemove.Name = "buttonRemove";
this.buttonRemove.Size = new System.Drawing.Size(59, 26);
this.buttonRemove.TabIndex = 3;
- this.buttonRemove.Text = "Remove";
+ this.buttonRemove.Text = Translation.GetString("CONTROLLER_REMOVE_BUTTON");
this.buttonRemove.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.buttonRemove.UseVisualStyleBackColor = false;
this.buttonRemove.CheckedChanged += new System.EventHandler(this.modeChanged);
@@ -186,7 +186,7 @@
this.costBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.costBox.cost = 0;
- this.costBox.label = "Cost:";
+ this.costBox.label = Translation.GetString("CONTROLLER_COST_LABEL");
this.costBox.Location = new System.Drawing.Point(12, 84);
this.costBox.Name = "costBox";
this.costBox.Size = new System.Drawing.Size(105, 25);
@@ -203,9 +203,9 @@
this.Controls.Add(this.buttonPlace);
this.Controls.Add(this.costBox);
this.Controls.Add(this.message);
- this.Name = "RailRoadController";
- this.Text = "Track construction";
- this.lblTitle.Text = "RAILROAD";
+ this.Name = "RailRoadController"; //internal, no need for translation.
+ this.Text = Translation.GetString("CONTROLLER_RAIL_TOOLTIP");
+ this.lblTitle.Text = Translation.GetString("CONTROLLER_RAIL_TITLE");
this.Resize += new System.EventHandler(this.updateAfterResize);
this.Load += new System.EventHandler(this.RailRoadController_Load);
this.Controls.SetChildIndex(this.message, 0);
@@ -238,8 +238,7 @@
{
// build new railroads.
if (!SingleRailRoad.build(anchor, loc))
- MainWindow.showError("There are obstacles");
- //! MainWindow.showError("障害物があります");
+ MainWindow.showError(Translation.GetString("CONTROLLER_RAIL_OBSTACLES"));
}
else
// remove existing ones
@@ -401,7 +400,7 @@
private void RailRoadController_Load(object sender, EventArgs e)
{
- this.lblTitle.Text = "Railroad";
+ this.lblTitle.Text = Translation.GetString("CONTROLLER_RAIL_TITLE");
}
}
Added: branches/FreeTrainSDL/core/lang/freetrain.en-US.txt
===================================================================
--- branches/FreeTrainSDL/core/lang/freetrain.en-US.txt (rev 0)
+++ branches/FreeTrainSDL/core/lang/freetrain.en-US.txt 2008-03-20 15:23:41 UTC (rev 262)
@@ -0,0 +1,120 @@
+SDL_NOT_FOUND=We could not find the TAO SDL Framework\nPlease download it from http://www.taoframework.com/\n\nThis application will now close.
+
+
+MAIN_WINDOW_TITLE=FreeTrain SDL
+CLOCK_FORMAT=Year {0} Month {1} Day {2} ({3}) {4,2:d}:{5,1:d}0
+MONDAY=Mon
+TUESDAY=Tue
+WEDNESDAY=Wed
+THURSDAY=Thurs
+FRIDAY=Fri
+SATURDAY=Sat
+SUNDAY=Sun
+
+CONTROLLER_EXIT_BUTTON=EXIT
+CONTROLLER_PLACE_BUTTON=Place
+CONTROLLER_REMOVE_BUTTON=Remove
+CONTROLLER_COST_LABEL=Cost:
+
+CONTROLLER_RAIL_TITLE=RAILROAD
+CONTROLLER_RAIL_TOOLTIP=Track Construction
+CONTROLLER_RAIL_INITIAL_MESSAGE=Click two points on the map to place tracks
+CONTROLLER_RAIL_OBSTACLES=There are obstacles in the way
+CONTROLLER_RAIL_START_POINT=Select starting point
+CONTROLLER_RAIL_END_POINT=Select end point
+SDL_NOT_FOUND=We could not find the TAO SDL Framework\nPlease download it from http://www.taoframework.com/\n\nThis application will now close.
+
+
+MAIN_WINDOW_TITLE=FreeTrain SDL
+CLOCK_FORMAT=Year {0} Month {1} Day {2} ({3}) {4,2:d}:{5,1:d}0
+MONDAY=Mon
+TUESDAY=Tue
+WEDNESDAY=Wed
+THURSDAY=Thurs
+FRIDAY=Fri
+SATURDAY=Sat
+SUNDAY=Sun
+
+CONTROLLER_EXIT_BUTTON=EXIT
+CONTROLLER_PLACE_BUTTON=Place
+CONTROLLER_REMOVE_BUTTON=Remove
+CONTROLLER_COST_LABEL=Cost:
+
+CONTROLLER_RAIL_TITLE=RAILROAD
+CONTROLLER_RAIL_TOOLTIP=Track Construction
+CONTROLLER_RAIL_INITIAL_MESSAGE=Click two points on the map to place tracks
+CONTROLLER_RAIL_OBSTACLES=There are obstacles in the way
+CONTROLLER_RAIL_START_POINT=Select starting point
+CONTROLLER_RAIL_END_POINT=Select end point
+SDL_NOT_FOUND=We could not find the TAO SDL Framework\nPlease download it from http://www.taoframework.com/\n\nThis application will now close.
+
+
+MAIN_WINDOW_TITLE=FreeTrain SDL
+CLOCK_FORMAT=Year {0} Month {1} Day {2} ({3}) {4,2:d}:{5,1:d}0
+MONDAY=Mon
+TUESDAY=Tue
+WEDNESDAY=Wed
+THURSDAY=Thurs
+FRIDAY=Fri
+SATURDAY=Sat
+SUNDAY=Sun
+
+CONTROLLER_EXIT_BUTTON=EXIT
+CONTROLLER_PLACE_BUTTON=Place
+CONTROLLER_REMOVE_BUTTON=Remove
+CONTROLLER_COST_LABEL=Cost:
+
+CONTROLLER_RAIL_TITLE=RAILROAD
+CONTROLLER_RAIL_TOOLTIP=Track Construction
+CONTROLLER_RAIL_INITIAL_MESSAGE=Click two points on the map to place tracks
+CONTROLLER_RAIL_OBSTACLES=There are obstacles in the way
+CONTROLLER_RAIL_START_POINT=Select starting point
+CONTROLLER_RAIL_END_POINT=Select end point
+SDL_NOT_FOUND=We could not find the TAO SDL Framework\nPlease download it from http://www.taoframework.com/\n\nThis application will now close.
+
+
+MAIN_WINDOW_TITLE=FreeTrain SDL
+CLOCK_FORMAT=Year {0} Month {1} Day {2} ({3}) {4,2:d}:{5,1:d}0
+MONDAY=Mon
+TUESDAY=Tue
+WEDNESDAY=Wed
+THURSDAY=Thurs
+FRIDAY=Fri
+SATURDAY=Sat
+SUNDAY=Sun
+
+CONTROLLER_EXIT_BUTTON=EXIT
+CONTROLLER_PLACE_BUTTON=Place
+CONTROLLER_REMOVE_BUTTON=Remove
+CONTROLLER_COST_LABEL=Cost:
+
+CONTROLLER_RAIL_TITLE=RAILROAD
+CONTROLLER_RAIL_TOOLTIP=Track Construction
+CONTROLLER_RAIL_INITIAL_MESSAGE=Click two points on the map to place tracks
+CONTROLLER_RAIL_OBSTACLES=There are obstacles in the way
+CONTROLLER_RAIL_START_POINT=Select starting point
+CONTROLLER_RAIL_END_POINT=Select end point
+SDL_NOT_FOUND=We could not find the TAO SDL Framework\nPlease download it from http://www.taoframework.com/\n\nThis application will now close.
+
+
+MAIN_WINDOW_TITLE=FreeTrain SDL
+CLOCK_FORMAT=Year {0} Month {1} Day {2} ({3}) {4,2:d}:{5,1:d}0
+MONDAY=Mon
+TUESDAY=Tue
+WEDNESDAY=Wed
+THURSDAY=Thurs
+FRIDAY=Fri
+SATURDAY=Sat
+SUNDAY=Sun
+
+CONTROLLER_EXIT_BUTTON=EXIT
+CONTROLLER_PLACE_BUTTON=Place
+CONTROLLER_REMOVE_BUTTON=Remove
+CONTROLLER_COST_LABEL=Cost:
+
+CONTROLLER_RAIL_TITLE=RAILROAD
+CONTROLLER_RAIL_TOOLTIP=Track Construction
+CONTROLLER_RAIL_INITIAL_MESSAGE=Click two points on the map to place tracks
+CONTROLLER_RAIL_OBSTACLES=There are obstacles in the way
+CONTROLLER_RAIL_START_POINT=Select starting point
+CONTROLLER_RAIL_END_POINT=Select end point
Property changes on: branches/FreeTrainSDL/core/lang/freetrain.en-US.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/FreeTrainSDL/core/lang/freetrain.ja-JP.txt
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/core/lang/freetrain.ja-JP.txt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/core/util/Translation.cs
===================================================================
--- branches/FreeTrainSDL/core/util/Translation.cs (rev 0)
+++ branches/FreeTrainSDL/core/util/Translation.cs 2008-03-20 15:23:41 UTC (rev 262)
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Resources;
+using System.Windows.Forms;
+using System.IO;
+using System.Globalization;
+
+namespace FreeTrain.Util
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public sealed class Translation
+ {
+ static readonly Translation instance = new Translation();
+ static private ResourceManager resman;
+
+ Translation()
+ {
+ //uncomment to get a popup right before launch of the current locale.
+ //MessageBox.Show(Application.CurrentCulture.DisplayName);
+ resman = ResourceManager.CreateFileBasedResourceManager(
+ "freetrain", Path.Combine(Application.StartupPath, "lang"),
+ null);
+ }
+
+ private static Translation Instance
+ {
+ get
+ {
+ return instance;
+ }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="code"></param>
+ /// <returns></returns>
+ public static string GetString(string code)
+ {
+ return resman.GetString(code, Application.CurrentCulture);
+ }
+ }
+}
Property changes on: branches/FreeTrainSDL/core/util/Translation.cs
___________________________________________________________________
Name: svn:mime-type
+ text/x-csharp
Name: svn:eol-style
+ native
Modified: branches/FreeTrainSDL/core/world/Time.cs
===================================================================
--- branches/FreeTrainSDL/core/world/Time.cs 2008-03-20 09:18:04 UTC (rev 261)
+++ branches/FreeTrainSDL/core/world/Time.cs 2008-03-20 15:23:41 UTC (rev 262)
@@ -21,6 +21,8 @@
using System;
using System.Diagnostics;
+using FreeTrain.Util;
+
namespace FreeTrain.World
{
/// <summary>
@@ -71,10 +73,9 @@
{
get
{
- return string.Format("Year {0} Month {1} Day {2} ({3}) {4,2:d}:{5,1:d}0",
- //! return string.Format("{0}年{1}月{2}日({3}) {4,2:d}時{5,1:d}0分",
+ return string.Format(Translation.GetString("CLOCK_FORMAT"),
year, month, day,
- dayOfWeekChar(dayOfWeek),
+ daysOfWeek[dayOfWeek],
hour, minutes / 10);
}
}
@@ -193,17 +194,14 @@
/// <summary>
///
/// </summary>
- /// <param name="dow"></param>
- /// <returns></returns>
- public static char dayOfWeekChar(int dow)
- {
- return "7123456"[dow];
- //! Translator's comment: The string above is a temporary
- //! solution, since the weekday can only be one character
- //! long in the current solution.
- //! return "SunMonTueWedThuFriSat "[dow];
- //! return "日月火水木金土"[dow];
- }
+ protected static readonly string[] daysOfWeek = {Translation.GetString("SUNDAY"),
+ Translation.GetString("MONDAY"),
+ Translation.GetString("TUESDAY"),
+ Translation.GetString("WEDNESDAY"),
+ Translation.GetString("THURSDAY"),
+ Translation.GetString("FRIDAY"),
+ Translation.GetString("SATURDAY")};
+
/// <summary>
///
/// </summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2008-03-21 09:58:25
|
Revision: 267
http://freetrain.svn.sourceforge.net/freetrain/?rev=267&view=rev
Author: stevenhoefel
Date: 2008-03-21 02:58:26 -0700 (Fri, 21 Mar 2008)
Log Message:
-----------
Opened the PlatformController in design mode to resize a label and realised that it had overwritten all my hard work at translations... seems if we throw them in InitializeComponent then they get wiped when you redesign the GUI.
So I re-added it to PlatformController in the constructor and did the same for the RailRoadController.
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/core/Properties/Resources.Designer.cs
branches/FreeTrainSDL/core/Properties/Resources.ja-JP.resx
branches/FreeTrainSDL/core/Properties/Resources.resx
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-21 08:58:53 UTC (rev 266)
+++ branches/FreeTrainSDL/Program.cs 2008-03-21 09:58:26 UTC (rev 267)
@@ -295,9 +295,6 @@
private void Go()
{
- //set the current language (autodetected)
- //Application.CurrentCulture = new System.Globalization.CultureInfo("ja-JP");
-
timer = new System.Windows.Forms.Timer();
Events.KeyboardDown += new EventHandler<KeyboardEventArgs>(this.KeyDown);
Events.MouseButtonDown +=
Modified: branches/FreeTrainSDL/core/Properties/Resources.Designer.cs
===================================================================
--- branches/FreeTrainSDL/core/Properties/Resources.Designer.cs 2008-03-21 08:58:53 UTC (rev 266)
+++ branches/FreeTrainSDL/core/Properties/Resources.Designer.cs 2008-03-21 09:58:26 UTC (rev 267)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.832
+// Runtime Version:2.0.50727.42
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -70,6 +70,42 @@
}
/// <summary>
+ /// Looks up a localized string similar to Cannot build object.
+ /// </summary>
+ internal static string CONSTRUCTION_CANNOT_BUILD {
+ get {
+ return ResourceManager.GetString("CONSTRUCTION_CANNOT_BUILD", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to remove object.
+ /// </summary>
+ internal static string CONSTRUCTION_CANNOT_REMOVE {
+ get {
+ return ResourceManager.GetString("CONSTRUCTION_CANNOT_REMOVE", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Build.
+ /// </summary>
+ internal static string CONTROLLER_BUILD_BUTTON {
+ get {
+ return ResourceManager.GetString("CONTROLLER_BUILD_BUTTON", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Cost:.
+ /// </summary>
+ internal static string CONTROLLER_COST_LABEL {
+ get {
+ return ResourceManager.GetString("CONTROLLER_COST_LABEL", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to EXIT.
/// </summary>
internal static string CONTROLLER_EXIT_BUTTON {
@@ -133,6 +169,141 @@
}
/// <summary>
+ /// Looks up a localized string similar to Colour:.
+ /// </summary>
+ internal static string CONTROLLER_STATION_COLOUR {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_COLOUR", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Station construction.
+ /// </summary>
+ internal static string CONTROLLER_STATION_CONSTRUCTION {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_CONSTRUCTION", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Cost.
+ /// </summary>
+ internal static string CONTROLLER_STATION_COST {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_COST", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Design.
+ /// </summary>
+ internal static string CONTROLLER_STATION_DESIGN {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_DESIGN", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Direction:.
+ /// </summary>
+ internal static string CONTROLLER_STATION_DIRECTION {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_DIRECTION", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to &Length:.
+ /// </summary>
+ internal static string CONTROLLER_STATION_LENGTH {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_LENGTH", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Maintenance.
+ /// </summary>
+ internal static string CONTROLLER_STATION_MAINTENANCE {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_MAINTENANCE", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Material.
+ /// </summary>
+ internal static string CONTROLLER_STATION_MATERIALCONTROLLER_STATION_MATERIAL {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_MATERIALCONTROLLER_STATION_MATERIAL", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Name.
+ /// </summary>
+ internal static string CONTROLLER_STATION_NAME {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_NAME", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Station.
+ /// </summary>
+ internal static string CONTROLLER_STATION_PAGE {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_PAGE", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Platform.
+ /// </summary>
+ internal static string CONTROLLER_STATION_PLATFORM {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_PLATFORM", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Scale.
+ /// </summary>
+ internal static string CONTROLLER_STATION_SCALE {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_SCALE", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Size.
+ /// </summary>
+ internal static string CONTROLLER_STATION_SIZE {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_SIZE", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Slim platform.
+ /// </summary>
+ internal static string CONTROLLER_STATION_SLIMPLATFORM {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_SLIMPLATFORM", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to STATION.
+ /// </summary>
+ internal static string CONTROLLER_STATION_TITLE {
+ get {
+ return ResourceManager.GetString("CONTROLLER_STATION_TITLE", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Fri.
/// </summary>
internal static string FRIDAY {
Modified: branches/FreeTrainSDL/core/Properties/Resources.ja-JP.resx
===================================================================
--- branches/FreeTrainSDL/core/Properties/Resources.ja-JP.resx 2008-03-21 08:58:53 UTC (rev 266)
+++ branches/FreeTrainSDL/core/Properties/Resources.ja-JP.resx 2008-03-21 09:58:26 UTC (rev 267)
@@ -120,6 +120,15 @@
<data name="CLOCK_FORMAT" xml:space="preserve">
<value>{0}年{1}月{2}日({3}) {4,2:d}時{5,1:d}0分</value>
</data>
+ <data name="CONSTRUCTION_CANNOT_BUILD" xml:space="preserve">
+ <value>設置できません</value>
+ </data>
+ <data name="CONSTRUCTION_CANNOT_REMOVE" xml:space="preserve">
+ <value>撤去できません</value>
+ </data>
+ <data name="CONTROLLER_BUILD_BUTTON" xml:space="preserve">
+ <value>設置</value>
+ </data>
<data name="CONTROLLER_COST_LABEL" xml:space="preserve">
<value>費用：</value>
</data>
@@ -147,6 +156,51 @@
<data name="CONTROLLER_REMOVE_BUTTON" xml:space="preserve">
<value>撤去</value>
</data>
+ <data name="CONTROLLER_STATION_COLOUR" xml:space="preserve">
+ <value>色：</value>
+ </data>
+ <data name="CONTROLLER_STATION_CONSTRUCTION" xml:space="preserve">
+ <value>駅工事</value>
+ </data>
+ <data name="CONTROLLER_STATION_COST" xml:space="preserve">
+ <value>建造費</value>
+ </data>
+ <data name="CONTROLLER_STATION_DESIGN" xml:space="preserve">
+ <value>デザイン：</value>
+ </data>
+ <data name="CONTROLLER_STATION_DIRECTION" xml:space="preserve">
+ <value>方向：</value>
+ </data>
+ <data name="CONTROLLER_STATION_LENGTH" xml:space="preserve">
+ <value>長さ(&L)：</value>
+ </data>
+ <data name="CONTROLLER_STATION_MAINTENANCE" xml:space="preserve">
+ <value>維持費</value>
+ </data>
+ <data name="CONTROLLER_STATION_MATERIAL" xml:space="preserve">
+ <value>材質</value>
+ </data>
+ <data name="CONTROLLER_STATION_NAME" xml:space="preserve">
+ <value>名前</value>
+ </data>
+ <data name="CONTROLLER_STATION_PAGE" xml:space="preserve">
+ <value>駅舎</value>
+ </data>
+ <data name="CONTROLLER_STATION_PLATFORM" xml:space="preserve">
+ <value>ホーム</value>
+ </data>
+ <data name="CONTROLLER_STATION_SCALE" xml:space="preserve">
+ <value>規模</value>
+ </data>
+ <data name="CONTROLLER_STATION_SIZE" xml:space="preserve">
+ <value>サイズ</value>
+ </data>
+ <data name="CONTROLLER_STATION_SLIMPLATFORM" xml:space="preserve">
+ <value>スリムなホーム</value>
+ </data>
+ <data name="CONTROLLER_STATION_TITLE" xml:space="preserve">
+ <value>駅</value>
+ </data>
<data name="FRIDAY" xml:space="preserve">
<value>金</value>
</data>
Modified: branches/FreeTrainSDL/core/Properties/Resources.resx
===================================================================
--- branches/FreeTrainSDL/core/Properties/Resources.resx 2008-03-21 08:58:53 UTC (rev 266)
+++ branches/FreeTrainSDL/core/Properties/Resources.resx 2008-03-21 09:58:26 UTC (rev 267)
@@ -120,6 +120,18 @@
<data name="CLOCK_FORMAT" xml:space="preserve">
<value>Year {0} Month {1} Day {2} ({3}) {4,2:d}:{5,1:d}0</value>
</data>
+ <data name="CONSTRUCTION_CANNOT_BUILD" xml:space="preserve">
+ <value>Cannot build object</value>
+ </data>
+ <data name="CONSTRUCTION_CANNOT_REMOVE" xml:space="preserve">
+ <value>Unable to remove object</value>
+ </data>
+ <data name="CONTROLLER_BUILD_BUTTON" xml:space="preserve">
+ <value>Build</value>
+ </data>
+ <data name="CONTROLLER_COST_LABEL" xml:space="preserve">
+ <value>Cost:</value>
+ </data>
<data name="CONTROLLER_EXIT_BUTTON" xml:space="preserve">
<value>EXIT</value>
</data>
@@ -141,6 +153,51 @@
<data name="CONTROLLER_REMOVE_BUTTON" xml:space="preserve">
<value>Remove</value>
</data>
+ <data name="CONTROLLER_STATION_COLOUR" xml:space="preserve">
+ <value>Colour:</value>
+ </data>
+ <data name="CONTROLLER_STATION_CONSTRUCTION" xml:space="preserve">
+ <value>Station construction</value>
+ </data>
+ <data name="CONTROLLER_STATION_COST" xml:space="preserve">
+ <value>Cost</value>
+ </data>
+ <data name="CONTROLLER_STATION_DESIGN" xml:space="preserve">
+ <value>Design</value>
+ </data>
+ <data name="CONTROLLER_STATION_DIRECTION" xml:space="preserve">
+ <value>Direction:</value>
+ </data>
+ <data name="CONTROLLER_STATION_LENGTH" xml:space="preserve">
+ <value>&Length:</value>
+ </data>
+ <data name="CONTROLLER_STATION_MAINTENANCE" xml:space="preserve">
+ <value>Maintenance</value>
+ </data>
+ <data name="CONTROLLER_STATION_MATERIALCONTROLLER_STATION_MATERIAL" xml:space="preserve">
+ <value>Material</value>
+ </data>
+ <data name="CONTROLLER_STATION_NAME" xml:space="preserve">
+ <value>Name</value>
+ </data>
+ <data name="CONTROLLER_STATION_PAGE" xml:space="preserve">
+ <value>Station</value>
+ </data>
+ <data name="CONTROLLER_STATION_PLATFORM" xml:space="preserve">
+ <value>Platform</value>
+ </data>
+ <data name="CONTROLLER_STATION_SCALE" xml:space="preserve">
+ <value>Scale</value>
+ </data>
+ <data name="CONTROLLER_STATION_SIZE" xml:space="preserve">
+ <value>Size</value>
+ </data>
+ <data name="CONTROLLER_STATION_SLIMPLATFORM" xml:space="preserve">
+ <value>Slim platform</value>
+ </data>
+ <data name="CONTROLLER_STATION_TITLE" xml:space="preserve">
+ <value>STATION</value>
+ </data>
<data name="FRIDAY" xml:space="preserve">
<value>Fri</value>
</data>
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-21 08:58:53 UTC (rev 266)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-21 09:58:26 UTC (rev 267)
@@ -105,6 +105,27 @@
//// (IColorLibrary)PluginManager.theInstance.getContribution("{COLORLIB-ROOF}")
// };
+ //do translation, if you put this in InitialiseComponent then it will get overridden by the
+ //visual studio when you edit the form in designer view...
+
+ this.lblTitle.Text = Translation.GetString("CONTROLLER_STATION_TITLE");
+ this.stationPage.Text = Translation.GetString("CONTROLLER_STATION_PAGE");
+ this.label3.Text = Translation.GetString("CONTROLLER_STATION_DESIGN");
+ this.columnHeader1.Text = Translation.GetString("CONTROLLER_STATION_NAME");
+ this.columnHeader2.Text = Translation.GetString("CONTROLLER_STATION_SCALE");
+ this.columnHeader3.Text = Translation.GetString("CONTROLLER_STATION_MATERIAL");
+ this.columnHeader4.Text = Translation.GetString("CONTROLLER_STATION_SIZE");
+ this.columnHeader5.Text = Translation.GetString("CONTROLLER_STATION_COST");
+ this.columnHeader6.Text = Translation.GetString("CONTROLLER_STATION_MAINTENANCE");
+ this.label4.Text = Translation.GetString("CONTROLLER_STATION_DIRECTION");
+ this.label5.Text = Translation.GetString("CONTROLLER_STATION_COLOUR");
+ this.platformPage.Text = Translation.GetString("CONTROLLER_STATION_PLATFORM");
+ this.checkSlim.Text = Translation.GetString("CONTROLLER_STATION_SLIMPLATFORM");
+ this.label1.Text = Translation.GetString("CONTROLLER_STATION_LENGTH");
+ this.Text = Translation.GetString("CONTROLLER_STATION_CONSTRUCTION");
+ this.buttonRemove.Text = Translation.GetString("CONTROLLER_REMOVE_BUTTON");
+ this.buttonPlace.Text = Translation.GetString("CONTROLLER_BUILD_BUTTON");
+
dirN.Tag = Direction.NORTH;
dirE.Tag = Direction.EAST;
dirS.Tag = Direction.SOUTH;
@@ -249,6 +270,7 @@
// lblTitle
//
this.lblTitle.Size = new System.Drawing.Size(187, 15);
+ this.lblTitle.Text = "STATION";
//
// lblExit
//
@@ -264,7 +286,6 @@
this.buttonRemove.Size = new System.Drawing.Size(76, 26);
this.buttonRemove.TabIndex = 1;
this.buttonRemove.Text = "Remove";
- //! this.buttonRemove.Text = "撤去";
this.buttonRemove.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.buttonRemove.UseVisualStyleBackColor = false;
//
@@ -280,7 +301,6 @@
this.buttonPlace.TabIndex = 0;
this.buttonPlace.TabStop = true;
this.buttonPlace.Text = "Build";
- //! this.buttonPlace.Text = "設置";
this.buttonPlace.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.buttonPlace.UseVisualStyleBackColor = false;
//
@@ -297,30 +317,28 @@
this.stationPage.Controls.Add(this.label4);
this.stationPage.Controls.Add(this.indexSelector2);
this.stationPage.Controls.Add(this.label5);
- this.stationPage.Location = new System.Drawing.Point(5, 21);
+ this.stationPage.Location = new System.Drawing.Point(4, 21);
this.stationPage.Margin = new System.Windows.Forms.Padding(0);
this.stationPage.Name = "stationPage";
- this.stationPage.Size = new System.Drawing.Size(185, 157);
+ this.stationPage.Size = new System.Drawing.Size(178, 155);
this.stationPage.TabIndex = 1;
this.stationPage.Text = "Station";
this.stationPage.UseVisualStyleBackColor = true;
- //! this.stationPage.Text = "駅舎";
//
// label3
//
this.label3.Location = new System.Drawing.Point(3, 35);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(47, 17);
+ this.label3.Size = new System.Drawing.Size(61, 17);
this.label3.TabIndex = 6;
- this.label3.Text = "Design:";
- //! this.label3.Text = "デザイン：";
+ this.label3.Text = "Design";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label2
//
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.label2.Location = new System.Drawing.Point(286, 35);
+ this.label2.Location = new System.Drawing.Point(279, 33);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(100, 17);
this.label2.TabIndex = 5;
@@ -330,13 +348,13 @@
//
this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.columnHeader1,
- this.columnHeader2,
- this.columnHeader3,
- this.columnHeader4,
- this.columnHeader5,
- this.columnHeader6});
- this.listView1.Location = new System.Drawing.Point(198, 9);
+ this.columnHeader1,
+ this.columnHeader2,
+ this.columnHeader3,
+ this.columnHeader4,
+ this.columnHeader5,
+ this.columnHeader6});
+ this.listView1.Location = new System.Drawing.Point(191, 9);
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(103, 156);
this.listView1.TabIndex = 4;
@@ -346,59 +364,53 @@
// columnHeader1
//
this.columnHeader1.Text = "Name";
- //! this.columnHeader1.Text = "名前";
this.columnHeader1.Width = 120;
//
// columnHeader2
//
this.columnHeader2.Text = "Scale";
- //! this.columnHeader2.Text = "規模";
this.columnHeader2.Width = 54;
//
// columnHeader3
//
this.columnHeader3.Text = "Material";
- //! this.columnHeader3.Text = "材質";
this.columnHeader3.Width = 54;
//
// columnHeader4
//
this.columnHeader4.Text = "Size";
- //! this.columnHeader4.Text = "サイズ";
this.columnHeader4.Width = 64;
//
// columnHeader5
//
- this.columnHeader5.Text = "Construction cost";
- //! this.columnHeader5.Text = "建造費";
+ this.columnHeader5.Text = "Cost";
//
// columnHeader6
//
this.columnHeader6.Text = "Maintenance";
- //! this.columnHeader6.Text = "維持費";
//
// indexSelector
//
this.indexSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ | System.Windows.Forms.AnchorStyles.Right)));
this.indexSelector.count = 10;
this.indexSelector.current = 0;
this.indexSelector.dataSource = null;
- this.indexSelector.Location = new System.Drawing.Point(56, 35);
+ this.indexSelector.Location = new System.Drawing.Point(70, 35);
this.indexSelector.Name = "indexSelector";
- this.indexSelector.Size = new System.Drawing.Size(124, 17);
+ this.indexSelector.Size = new System.Drawing.Size(103, 17);
this.indexSelector.TabIndex = 3;
this.indexSelector.indexChanged += new System.EventHandler(this.onStationChanged);
//
// stationType
//
this.stationType.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ | System.Windows.Forms.AnchorStyles.Right)));
this.stationType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.stationType.ItemHeight = 13;
this.stationType.Location = new System.Drawing.Point(3, 9);
this.stationType.Name = "stationType";
- this.stationType.Size = new System.Drawing.Size(177, 21);
+ this.stationType.Size = new System.Drawing.Size(170, 21);
this.stationType.Sorted = true;
this.stationType.TabIndex = 2;
this.stationType.SelectedIndexChanged += new System.EventHandler(this.onGroupChanged);
@@ -406,12 +418,12 @@
// stationPicture
//
this.stationPicture.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.stationPicture.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.stationPicture.Location = new System.Drawing.Point(3, 54);
this.stationPicture.Name = "stationPicture";
- this.stationPicture.Size = new System.Drawing.Size(177, 93);
+ this.stationPicture.Size = new System.Drawing.Size(170, 91);
this.stationPicture.TabIndex = 1;
this.stationPicture.TabStop = false;
//
@@ -421,7 +433,7 @@
this.indexSelector1.count = 10;
this.indexSelector1.current = 0;
this.indexSelector1.dataSource = null;
- this.indexSelector1.Location = new System.Drawing.Point(242, 87);
+ this.indexSelector1.Location = new System.Drawing.Point(235, 85);
this.indexSelector1.Name = "indexSelector1";
this.indexSelector1.Size = new System.Drawing.Size(96, 17);
this.indexSelector1.TabIndex = 3;
@@ -429,12 +441,11 @@
// label4
//
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label4.Location = new System.Drawing.Point(252, 87);
+ this.label4.Location = new System.Drawing.Point(245, 85);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(56, 17);
this.label4.TabIndex = 6;
this.label4.Text = "Direction:";
- //! this.label4.Text = "方向：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// indexSelector2
@@ -443,7 +454,7 @@
this.indexSelector2.count = 10;
this.indexSelector2.current = 0;
this.indexSelector2.dataSource = null;
- this.indexSelector2.Location = new System.Drawing.Point(242, 104);
+ this.indexSelector2.Location = new System.Drawing.Point(235, 102);
this.indexSelector2.Name = "indexSelector2";
this.indexSelector2.Size = new System.Drawing.Size(96, 17);
this.indexSelector2.TabIndex = 3;
@@ -451,12 +462,11 @@
// label5
//
this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label5.Location = new System.Drawing.Point(252, 104);
+ this.label5.Location = new System.Drawing.Point(245, 102);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.TabIndex = 6;
- this.label5.Text = "Color:";
- //! this.label5.Text = "色：";
+ this.label5.Text = "Colour:";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// platformPage
@@ -471,22 +481,20 @@
this.platformPage.Controls.Add(this.dirN);
this.platformPage.Location = new System.Drawing.Point(4, 21);
this.platformPage.Name = "platformPage";
- this.platformPage.Size = new System.Drawing.Size(185, 157);
+ this.platformPage.Size = new System.Drawing.Size(178, 155);
this.platformPage.TabIndex = 0;
this.platformPage.Text = "Platform";
this.platformPage.UseVisualStyleBackColor = true;
- //! this.platformPage.Text = "ホーム";
//
// checkSlim
//
this.checkSlim.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.checkSlim.Location = new System.Drawing.Point(8, 111);
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.checkSlim.Location = new System.Drawing.Point(8, 109);
this.checkSlim.Name = "checkSlim";
- this.checkSlim.Size = new System.Drawing.Size(171, 17);
+ this.checkSlim.Size = new System.Drawing.Size(164, 17);
this.checkSlim.TabIndex = 7;
this.checkSlim.Text = "Slim platform";
- //!this.checkSlim.Text = "スリムなホーム";
this.checkSlim.CheckedChanged += new System.EventHandler(this.onModeChanged);
//
// dirS
@@ -528,28 +536,27 @@
// label1
//
this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.label1.Location = new System.Drawing.Point(3, 128);
+ this.label1.Location = new System.Drawing.Point(3, 126);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(53, 20);
this.label1.TabIndex = 2;
this.label1.Text = "&Length:";
- //! this.label1.Text = "長さ(&L)：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lengthBox
//
this.lengthBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lengthBox.Location = new System.Drawing.Point(64, 130);
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lengthBox.Location = new System.Drawing.Point(64, 128);
this.lengthBox.Name = "lengthBox";
- this.lengthBox.Size = new System.Drawing.Size(115, 20);
+ this.lengthBox.Size = new System.Drawing.Size(108, 20);
this.lengthBox.TabIndex = 3;
this.lengthBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
this.lengthBox.Value = new decimal(new int[] {
- 5,
- 0,
- 0,
- 0});
+ 5,
+ 0,
+ 0,
+ 0});
this.lengthBox.Validating += new System.ComponentModel.CancelEventHandler(this.validateLength);
this.lengthBox.TextChanged += new System.EventHandler(this.onLengthChanged);
//
@@ -568,8 +575,8 @@
// tabControl
//
this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.tabControl.Controls.Add(this.stationPage);
this.tabControl.Controls.Add(this.platformPage);
this.tabControl.ItemSize = new System.Drawing.Size(42, 17);
@@ -590,7 +597,6 @@
this.Controls.Add(this.buttonRemove);
this.Name = "PlatformController";
this.Text = "Station construction";
- //! this.Text = "駅工事";
this.Resize += new System.EventHandler(this.updateAfterResize);
this.Controls.SetChildIndex(this.buttonRemove, 0);
this.Controls.SetChildIndex(this.buttonPlace, 0);
@@ -598,7 +604,6 @@
this.Controls.SetChildIndex(this.lblTitle, 0);
this.Controls.SetChildIndex(this.lblExit, 0);
this.stationPage.ResumeLayout(false);
- this.lblTitle.Text = "STATION";
((System.ComponentModel.ISupportInitialize)(this.stationPicture)).EndInit();
this.platformPage.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dirS)).EndInit();
@@ -742,8 +747,7 @@
{
if (!selectedStation.canBeBuilt(loc, ControlMode.player))
{
- MainWindow.showError("Can not build");
- //! MainWindow.showError("設置できません");
+ MainWindow.showError(Translation.GetString("CONSTRUCTION_CANNOT_BUILD"));
}
else
{
@@ -762,8 +766,7 @@
{
if (!FatPlatform.canBeBuilt(loc, direction, length))
{
- MainWindow.showError("Can not build");
- //! MainWindow.showError("設置できません");
+ MainWindow.showError(Translation.GetString("CONSTRUCTION_CANNOT_BUILD"));
return;
}
new FatPlatform(loc, direction, length);
@@ -776,8 +779,7 @@
if (p.canRemove)
p.remove();
else
- MainWindow.showError("Can not remove");
- //! MainWindow.showError("撤去できません");
+ MainWindow.showError(Translation.GetString("CONSTRUCTION_CANNOT_REMOVE"));
}
}
return;
@@ -787,8 +789,7 @@
{
if (!ThinPlatform.canBeBuilt(loc, direction, length))
{
- MainWindow.showError("Can not build");
- //! MainWindow.showError("設置できません");
+ MainWindow.showError(Translation.GetString("CONSTRUCTION_CANNOT_BUILD"));
return;
}
new ThinPlatform(loc, direction, length);
@@ -801,8 +802,7 @@
if (p.canRemove)
p.remove();
else
- MainWindow.showError("Can not remove");
- //! MainWindow.showError("撤去できません");
+ MainWindow.showError(Translation.GetString("CONSTRUCTION_CANNOT_REMOVE"));
}
}
return;
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-21 08:58:53 UTC (rev 266)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-21 09:58:26 UTC (rev 267)
@@ -72,6 +72,14 @@
private RailRoadController()
{
InitializeComponent();
+
+ this.message.Text = Translation.GetString("CONTROLLER_RAIL_INITIAL_MESSAGE");
+ this.buttonPlace.Text = Translation.GetString("CONTROLLER_PLACE_BUTTON");
+ this.buttonRemove.Text = Translation.GetString("CONTROLLER_REMOVE_BUTTON");
+ this.costBox.label = Translation.GetString("CONTROLLER_COST_LABEL");
+ this.Text = Translation.GetString("CONTROLLER_RAIL_TOOLTIP");
+ this.lblTitle.Text = Translation.GetString("CONTROLLER_RAIL_TITLE");
+
updatePreview();
}
/// <summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-23 09:16:38
|
Revision: 272
http://freetrain.svn.sourceforge.net/freetrain/?rev=272&view=rev
Author: jendave
Date: 2008-03-23 02:16:42 -0700 (Sun, 23 Mar 2008)
Log Message:
-----------
update TrainPlacementController to run on Linux
Modified Paths:
--------------
branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs
branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
branches/FreeTrainSDL/core/controllers/CubeSelectorController.cs
branches/FreeTrainSDL/core/controllers/ModalController.cs
branches/FreeTrainSDL/core/controllers/PointSelectorController.cs
branches/FreeTrainSDL/core/controllers/RectSelectorController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs
branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
branches/FreeTrainSDL/core/world/development/LandValueInspector.cs
branches/FreeTrainSDL/plugins/Chiname.DummyCars/ControllerImpl.cs
branches/FreeTrainSDL/plugins/Chiname.Generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/ControllerImpl.cs
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HVControllerImpl.cs
Modified: branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -90,7 +90,7 @@
/// <summary>
///
/// </summary>
- public virtual LocationDisambiguator disambiguator { get { return null; } }
+ public virtual LocationDisambiguator Disambiguator { get { return null; } }
/// <summary>
///
Modified: branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -280,7 +280,7 @@
/// <summary>
///
/// </summary>
- public override LocationDisambiguator disambiguator
+ public override LocationDisambiguator Disambiguator
{
get
{
Modified: branches/FreeTrainSDL/core/controllers/CubeSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/CubeSelectorController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/CubeSelectorController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -114,7 +114,7 @@
/// <summary>
///
/// </summary>
- public virtual LocationDisambiguator disambiguator { get { return GroundDisambiguator.theInstance; } }
+ public virtual LocationDisambiguator Disambiguator { get { return GroundDisambiguator.theInstance; } }
/// <summary>
///
Modified: branches/FreeTrainSDL/core/controllers/ModalController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/ModalController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/ModalController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -81,7 +81,7 @@
/// <summary>
/// Gets the disambiguator associated with this controller, if any.
/// </summary>
- LocationDisambiguator disambiguator { get; }
+ LocationDisambiguator Disambiguator { get; }
/// <summary>
/// If this controller needs to modify the map view, return non-null value.
Modified: branches/FreeTrainSDL/core/controllers/PointSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/PointSelectorController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/PointSelectorController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -154,7 +154,7 @@
/// <summary>
///
/// </summary>
- public abstract LocationDisambiguator disambiguator { get; }
+ public abstract LocationDisambiguator Disambiguator { get; }
/// <summary>
///
/// </summary>
Modified: branches/FreeTrainSDL/core/controllers/RectSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/RectSelectorController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/RectSelectorController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -136,7 +136,7 @@
/// <summary>
///
/// </summary>
- public LocationDisambiguator disambiguator { get { return this; } }
+ public LocationDisambiguator Disambiguator { get { return this; } }
/// <summary> LocationDisambiguator implementation </summary>
public bool isSelectable(Location loc)
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -175,7 +175,7 @@
/// <summary>
///
/// </summary>
- public override LocationDisambiguator disambiguator { get { return this; } }
+ public override LocationDisambiguator Disambiguator { get { return this; } }
/// <summary> LocationDisambiguator implementation </summary>
public bool isSelectable(Location loc)
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -232,7 +232,7 @@
/// <summary>
///
/// </summary>
- public override LocationDisambiguator disambiguator
+ public override LocationDisambiguator Disambiguator
{
get
{
Modified: branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -362,7 +362,7 @@
/// <summary>
///
/// </summary>
- public override LocationDisambiguator disambiguator { get { return this; } }
+ public override LocationDisambiguator Disambiguator { get { return this; } }
/// <summary>
Modified: branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -217,7 +217,7 @@
/// <summary>
///
/// </summary>
- public override LocationDisambiguator disambiguator { get { return this; } }
+ public override LocationDisambiguator Disambiguator { get { return this; } }
/// <summary> LocationDisambiguator implementation </summary>
public bool isSelectable(Location loc)
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -541,14 +541,16 @@
// when a selected train is changed
private void onTrainChange(object sender, TreeViewEventArgs e)
{
-
// update controls
if (selectedItem != null)
{
nameBox.Enabled = true;
nameBox.Text = selectedItem.name;
controllerCombo.Enabled = true;
- controllerCombo.SelectedItem = selectedItem.controller;
+ if (selectedItem.controller != null)
+ {
+ controllerCombo.SelectedItem = selectedItem.controller;
+ }
}
else
{
@@ -573,7 +575,7 @@
/// <summary>
///
/// </summary>
- public override LocationDisambiguator disambiguator { get { return this; } }
+ public override LocationDisambiguator Disambiguator { get { return this; } }
/// <summary>
///
/// </summary>
Modified: branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -92,7 +92,7 @@
/// <summary>
///
/// </summary>
- public override LocationDisambiguator disambiguator { get { return this; } }
+ public override LocationDisambiguator Disambiguator { get { return this; } }
/// <summary>
///
/// </summary>
Modified: branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -86,7 +86,7 @@
/// <summary>
///
/// </summary>
- public override LocationDisambiguator disambiguator { get { return GroundDisambiguator.theInstance; } }
+ public override LocationDisambiguator Disambiguator { get { return GroundDisambiguator.theInstance; } }
private bool isRaising
{
Modified: branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
===================================================================
--- branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -686,7 +686,7 @@
// TODO: use height-cut here to force the specified z-level
if (controller != null)
{
- LocationDisambiguator disambiguator = controller.disambiguator;
+ LocationDisambiguator disambiguator = controller.Disambiguator;
for (int z = heightCutHeight; z >= 0; z--)
{
Location loc = new Location(x - z, y + z, z);
Modified: branches/FreeTrainSDL/core/world/development/LandValueInspector.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/LandValueInspector.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/core/world/development/LandValueInspector.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -56,7 +56,7 @@
//
// Disambiguator implementation
//
- public override LocationDisambiguator disambiguator { get { return GroundDisambiguator.theInstance; } }
+ public override LocationDisambiguator Disambiguator { get { return GroundDisambiguator.theInstance; } }
Modified: branches/FreeTrainSDL/plugins/Chiname.DummyCars/ControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.DummyCars/ControllerImpl.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/plugins/Chiname.DummyCars/ControllerImpl.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -109,7 +109,7 @@
/// <summary>
///
/// </summary>
- public override LocationDisambiguator disambiguator
+ public override LocationDisambiguator Disambiguator
{
get
{
Modified: branches/FreeTrainSDL/plugins/Chiname.Generic/MultiSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.Generic/MultiSelectorController.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/plugins/Chiname.Generic/MultiSelectorController.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -160,7 +160,7 @@
///
/// </summary>
[CLSCompliant(false)]
- public override LocationDisambiguator disambiguator { get { return this; } }
+ public override LocationDisambiguator Disambiguator { get { return this; } }
/// <summary>
///
Modified: branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/ControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/ControllerImpl.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/ControllerImpl.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -93,7 +93,7 @@
///
/// </summary>
[CLSCompliant(false)]
- public override LocationDisambiguator disambiguator
+ public override LocationDisambiguator Disambiguator
{
get {
return RoadDisambiguator.theInstance;
Modified: branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HVControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HVControllerImpl.cs 2008-03-23 08:59:39 UTC (rev 271)
+++ branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HVControllerImpl.cs 2008-03-23 09:16:42 UTC (rev 272)
@@ -350,7 +350,7 @@
///
/// </summary>
[CLSCompliant(false)]
- public LocationDisambiguator disambiguator
+ public LocationDisambiguator Disambiguator
{
get
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-24 17:03:23
|
Revision: 276
http://freetrain.svn.sourceforge.net/freetrain/?rev=276&view=rev
Author: jendave
Date: 2008-03-24 10:03:30 -0700 (Mon, 24 Mar 2008)
Log Message:
-----------
moved the Surface class from its own assembly into the core.framework.graphics.
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/FreeTrainSDL.sln
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/SDLGUI.cs
branches/FreeTrainSDL/SDLGUIButton.cs
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs
branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
branches/FreeTrainSDL/core/controllers/land/LandController.cs
branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs
branches/FreeTrainSDL/core/framework/AboutDialog.cs
branches/FreeTrainSDL/core/framework/BGMManager.cs
branches/FreeTrainSDL/core/framework/ConfigDialog.cs
branches/FreeTrainSDL/core/framework/GlobalOptions.cs
branches/FreeTrainSDL/core/framework/ResourceUtil.cs
branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs
branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs
branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs
branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Picture.cs
branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs
branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Sprite.cs
branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs
branches/FreeTrainSDL/core/framework/plugin/Contribution.cs
branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
branches/FreeTrainSDL/core/views/MapOverlay.cs
branches/FreeTrainSDL/core/views/NullWeatherOverlay.cs
branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
branches/FreeTrainSDL/core/views/WeatherOverlay.cs
branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs
branches/FreeTrainSDL/core/views/map/MapView.cs
branches/FreeTrainSDL/core/world/Direction.cs
branches/FreeTrainSDL/core/world/DrawContext.cs
branches/FreeTrainSDL/core/world/EmptyVoxel.cs
branches/FreeTrainSDL/core/world/Location.cs
branches/FreeTrainSDL/core/world/Traffic.cs
branches/FreeTrainSDL/core/world/Voxel.cs
branches/FreeTrainSDL/core/world/WorldDefinition.cs
branches/FreeTrainSDL/core/world/development/LandValueInspector.cs
branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
branches/FreeTrainSDL/core/world/rail/FatPlatform.cs
branches/FreeTrainSDL/core/world/rail/Platform.cs
branches/FreeTrainSDL/core/world/rail/RailPattern.cs
branches/FreeTrainSDL/core/world/rail/RailRoad.cs
branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
branches/FreeTrainSDL/core/world/rail/YardRailRoad.cs
branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs
branches/FreeTrainSDL/core/world/structs/PThreeDimStructure.cs
branches/FreeTrainSDL/core/world/structs/Structure.cs
branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
branches/FreeTrainSDL/plugins/Chiname.DummyCars/ControllerForm.cs
branches/FreeTrainSDL/plugins/Chiname.DummyCars/FreeTrain.DummyCars.csproj
branches/FreeTrainSDL/plugins/Chiname.Generic/FreeTrain.Generic.csproj
branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/ControllerForm.cs
branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/FreeTrain.RoadAccessory.csproj
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/ControllerForm.cs
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/FreeTrain.HalfVoxelStructure.csproj
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HueShiftSprite.cs
branches/FreeTrainSDL/plugins/Kohsuke.VinylHouse/FreeTrain.VinylHouse.csproj
branches/FreeTrainSDL/plugins/Kohsuke.VinylHouse/VinylHouseBuilder.cs
Added Paths:
-----------
branches/FreeTrainSDL/core/framework/graphics/Surface.cs
Removed Paths:
-------------
branches/FreeTrainSDL/lib/SDLGFX.net/
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-24 17:03:30 UTC (rev 276)
@@ -73,10 +73,6 @@
<Project>{7746CF50-D84E-4E7B-83FB-AB43DB854DA8}</Project>
<Name>FreeTrain.Core</Name>
</ProjectReference>
- <ProjectReference Include="lib\SDLGFX.net\SDL.net.csproj">
- <Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
- <Name>SDL.net</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
Modified: branches/FreeTrainSDL/FreeTrainSDL.sln
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.sln 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/FreeTrainSDL.sln 2008-03-24 17:03:30 UTC (rev 276)
@@ -7,8 +7,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.Controls", "lib\Controls\FreeTrain.Controls.csproj", "{D3B86CCE-530E-4472-AE8E-3FA5F903C206}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL.net", "lib\SDLGFX.net\SDL.net.csproj", "{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.ColorTestTrain", "plugins\Kohsuke.ColorTestTrain\FreeTrain.ColorTestTrain.csproj", "{4380999E-CA4C-4AA2-8848-12FFABF72535}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.VinylHouse", "plugins\Kohsuke.VinylHouse\FreeTrain.VinylHouse.csproj", "{D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}"
@@ -39,10 +37,6 @@
{D3B86CCE-530E-4472-AE8E-3FA5F903C206}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3B86CCE-530E-4472-AE8E-3FA5F903C206}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3B86CCE-530E-4472-AE8E-3FA5F903C206}.Release|Any CPU.Build.0 = Release|Any CPU
- {778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Release|Any CPU.Build.0 = Release|Any CPU
{4380999E-CA4C-4AA2-8848-12FFABF72535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4380999E-CA4C-4AA2-8848-12FFABF72535}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4380999E-CA4C-4AA2-8848-12FFABF72535}.Release|Any CPU.ActiveCfg = Release|Any CPU
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/Program.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -30,7 +30,7 @@
//using SdlDotNet.Graphics;
using SdlDotNet.Core;
using SdlDotNet.Input;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
using FreeTrain.World;
using FreeTrain.Controllers;
Modified: branches/FreeTrainSDL/SDLGUI.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUI.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/SDLGUI.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -26,7 +26,7 @@
using System.Drawing;
using System.IO;
using Tao.Sdl;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain
{
Modified: branches/FreeTrainSDL/SDLGUIButton.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUIButton.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/SDLGUIButton.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -26,7 +26,7 @@
using System.Windows.Forms;
using System.IO;
using Tao.Sdl;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain
{
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-24 17:03:30 UTC (rev 276)
@@ -553,6 +553,7 @@
<Compile Include="util\Set.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="framework\graphics\Surface.cs" />
<Compile Include="util\Translation.cs" />
<Compile Include="util\UrlInvoker.cs">
<SubType>Code</SubType>
@@ -1014,10 +1015,6 @@
<Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
<Name>FreeTrain.Controls</Name>
</ProjectReference>
- <ProjectReference Include="..\lib\SDLGFX.net\SDL.net.csproj">
- <Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
- <Name>SDL.net</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="FreeTrainSdl.snk" />
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -29,7 +29,6 @@
using FreeTrain.World;
using FreeTrain.World.Structs;
using FreeTrain.Contributions.Common;
-using SDL.net;
namespace FreeTrain.Contributions.Common
{
Modified: branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -29,7 +29,6 @@
using FreeTrain.Framework.Graphics;
using FreeTrain.World;
using FreeTrain.World.Structs;
-using SDL.net;
namespace FreeTrain.Contributions.Common
{
Modified: branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -22,9 +22,8 @@
using System.Drawing;
using System.Runtime.Serialization;
using System.Xml;
-using SDL.net;
-using FreeTrain.Controllers;
using FreeTrain.Framework.Graphics;
+using FreeTrain.Controllers;
using FreeTrain.Framework.Plugin;
using FreeTrain.Framework;
using FreeTrain.Views;
Modified: branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -22,13 +22,12 @@
using System.Diagnostics;
using System.Drawing;
using System.Xml;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
using FreeTrain.World;
using FreeTrain.World.Terrain;
using FreeTrain.Contributions.Common;
using FreeTrain.Controllers;
using FreeTrain.Framework;
-using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
namespace FreeTrain.Contributions.Land
Modified: branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -22,10 +22,9 @@
using System.Collections;
using System.Drawing;
using System.Xml;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Controllers;
using FreeTrain.Framework.Plugin;
-using FreeTrain.Framework.Graphics;
using FreeTrain.Views;
using FreeTrain.World;
using FreeTrain.World.Land;
Modified: branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -22,10 +22,9 @@
using System.Drawing;
using System.Runtime.Serialization;
using System.Xml;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Controllers;
using FreeTrain.Contributions.Population;
-using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
using FreeTrain.Views;
using FreeTrain.World;
Modified: branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -30,7 +30,6 @@
using FreeTrain.Framework.Plugin;
using FreeTrain.World;
using FreeTrain.World.Structs;
-using SDL.net;
namespace FreeTrain.Contributions.Structs
{
Modified: branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -25,7 +25,6 @@
using FreeTrain.Framework.Plugin;
using FreeTrain.Framework.Graphics;
using FreeTrain.World;
-using SDL.net;
namespace FreeTrain.Contributions.Train
{
Modified: branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -26,7 +26,6 @@
using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
using FreeTrain.World;
-using SDL.net;
namespace FreeTrain.Contributions.Train
{
Modified: branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using System.Xml;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
using FreeTrain.World;
using FreeTrain.Framework;
using FreeTrain.Framework.Plugin;
Modified: branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -25,7 +25,6 @@
using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
using FreeTrain.World;
-using SDL.net;
namespace FreeTrain.Contributions.Train
{
Modified: branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using System.Xml;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
using FreeTrain.World;
Modified: branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -35,7 +35,6 @@
using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
using FreeTrain.Util;
-using SDL.net;
namespace FreeTrain.Controllers.Land
{
Modified: branches/FreeTrainSDL/core/controllers/land/LandController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandController.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/controllers/land/LandController.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -35,7 +35,6 @@
using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
using FreeTrain.Util;
-using SDL.net;
namespace FreeTrain.Controllers.Land
{
Modified: branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -32,7 +32,6 @@
using FreeTrain.Framework;
using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
-using SDL.net;
namespace FreeTrain.Controllers.Land
{
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -33,7 +33,6 @@
using FreeTrain.World.Rail;
using FreeTrain.Views;
using FreeTrain.Views.Map;
-using SDL.net;
using FreeTrain.Controls;
Modified: branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -30,7 +30,6 @@
using FreeTrain.World.Rail;
using FreeTrain.Views;
using FreeTrain.Views.Map;
-using SDL.net;
namespace FreeTrain.Controllers.Rail
{
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -33,7 +33,7 @@
using FreeTrain.Util;
using FreeTrain.Util.Controls;
using FreeTrain.Util.Command;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Controllers.Rail
{
Modified: branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -34,7 +34,6 @@
using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
using FreeTrain.Util;
-using SDL.net;
namespace FreeTrain.Controllers.Structs
{
Modified: branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -32,7 +32,6 @@
using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
using FreeTrain.Util;
-using SDL.net;
namespace FreeTrain.Controllers.Structs
{
Modified: branches/FreeTrainSDL/core/framework/AboutDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/AboutDialog.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/AboutDialog.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -25,7 +25,7 @@
using System.ComponentModel;
using System.Windows.Forms;
using FreeTrain.Controls;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Util;
namespace FreeTrain.Framework
Modified: branches/FreeTrainSDL/core/framework/BGMManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/BGMManager.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/BGMManager.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -24,7 +24,7 @@
using System.Windows.Forms;
using FreeTrain.Contributions.Sound;
using FreeTrain.Framework.Plugin;
-//using SDL.net;
+//using FreeTrain.Framework.Graphics;
using SdlDotNet.Audio;
namespace FreeTrain.Framework
Modified: branches/FreeTrainSDL/core/framework/ConfigDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/ConfigDialog.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/ConfigDialog.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -24,7 +24,7 @@
using System.ComponentModel;
using System.Windows.Forms;
using FreeTrain.World;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework
{
Modified: branches/FreeTrainSDL/core/framework/GlobalOptions.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/GlobalOptions.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/GlobalOptions.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -27,7 +27,7 @@
using System.Xml;
using System.Xml.Serialization;
using FreeTrain.Util;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework
{
Modified: branches/FreeTrainSDL/core/framework/ResourceUtil.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -24,7 +24,6 @@
using System.IO;
using System.Net;
//using org.kohsuke.directaudio;
-using SDL.net;
using SdlDotNet.Audio;
using FreeTrain.Util;
using FreeTrain.Framework.Graphics;
Modified: branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -22,7 +22,7 @@
using System.Drawing;
using FreeTrain.Framework;
using FreeTrain.World;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework.Graphics
{
Modified: branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using System.Xml;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
using FreeTrain.World;
using FreeTrain.Framework.Plugin;
Modified: branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -20,7 +20,7 @@
using System;
using System.Drawing;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework.Graphics
{
Modified: branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using System.Xml;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
using FreeTrain.Framework.Plugin;
using FreeTrain.World;
Modified: branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -21,7 +21,7 @@
using System;
using System.Drawing;
using System.Runtime.Serialization;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework.Graphics
{
Modified: branches/FreeTrainSDL/core/framework/graphics/Picture.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/Picture.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/graphics/Picture.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Runtime.Serialization;
using System.Xml;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
using FreeTrain.World;
using FreeTrain.Framework.Plugin;
Modified: branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -22,7 +22,7 @@
using System.Drawing;
using FreeTrain.Framework;
using FreeTrain.World;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework.Graphics
{
Modified: branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -23,7 +23,7 @@
using System.Drawing;
using System.Xml;
using FreeTrain.World;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework.Graphics
{
Modified: branches/FreeTrainSDL/core/framework/graphics/Sprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/Sprite.cs 2008-03-24 16:21:02 UTC (rev 275)
+++ branches/FreeTrainSDL/core/framework/graphics/Sprite.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -20,7 +20,7 @@
using System;
using System.Drawing;
-using SDL.net;
+using FreeTrain.Framework.Graphics;
namespace FreeTrain.Framework.Graphics
{
Added: branches/FreeTrainSDL/core/framework/graphics/Surface.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/Surface.cs (rev 0)
+++ branches/FreeTrainSDL/core/framework/graphics/Surface.cs 2008-03-24 17:03:30 UTC (rev 276)
@@ -0,0 +1,1329 @@
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.Runtime.InteropServices;
+using System.Drawing;
+using System.Diagnostics;
+using System.Collections;
+using Tao.Sdl;
+using System.IO;
+
+namespace FreeTrain.Framework.Graphics
+{
+ /// <summary>
+ /// Color mask.
+ /// </summary>
+ public enum ColorMask {
+ /// <summary>
+ ///
+ /// </summary>
+ R,
+ /// <summary>
+ ///
+ /// </summary>
+ G,
+ /// <summary>
+ ///
+ /// </summary>
+ B
+ };
+
+ /// <summary>
+ /// Wraps DirectDraw surface object.
+ ///
+ /// This is the core object of DirectDraw.
+ /// The code is a wrapper around Visual BASIC binding of DirectDraw.
+ ///
+ /// Since I couldn't figure out how to create a CLR binding for
+ /// clipper, this class implements a clipping support by itself.
+ /// </summary>
+ public class Surface
+ {
+ //private DirectDrawSurface7 surface;
+ //public Tao.Sdl.Sdl.SDL_Surface surface;
+ //Surface mask;
+ //private static AlphaBlender alpha = new AlphaBlenderClass();
+
+
+ //private readonly byte widthR,widthB,widthG;
+
+ /// <summary>
+ /// Clipping rect. Even if the client doesn't set any clipping,
+ /// this is initialized to (0,0)-(size)
+ /// </summary>
+ //private Rectangle clip;
+
+ private string _filename;
+
+ const int TOTAL_SURFACES = 10;
+
+ private readonly int BmpHeader = 54;
+
+ /// <summary>
+ ///
+ /// </summary>
+ public IntPtr[] surfacePtrs = new IntPtr[TOTAL_SURFACES];
+ private String[] surfaceSignatures = new String[TOTAL_SURFACES];
+
+ /// <summary>
+ ///
+ /// </summary>
+ public IntPtr mask;//, dupSurface;
+ /// <summary>
+ ///
+ /// </summary>
+ public Sdl.SDL_Surface surface; //, dupSurface, mask;
+ private Sdl.SDL_PixelFormat pixelFormat;
+
+ int flags = (Sdl.SDL_SWSURFACE | Sdl.SDL_HWACCEL | Sdl.SDL_ANYFORMAT | Sdl.SDL_SRCCOLORKEY);
+ int bpp = 32;
+
+ private int currentSurfaceCount = 0;
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ public Size Size
+ {
+ get { return new Size(this.surface.w, this.surface.h); }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="w"></param>
+ /// <param name="h"></param>
+ /// <param name="newbpp"></param>
+ public Surface(int w, int h, int newbpp)
+ {
+ bpp = newbpp;
+ this.surfacePtrs[0] = Sdl.SDL_CreateRGBSurface(flags, w, h, bpp, 0, 0, 0, 0);
+ this.surface = (Sdl.SDL_Surface)Marshal.PtrToStructure(this.surfacePtr(), typeof(Sdl.SDL_Surface));
+ pixelFormat = (Sdl.SDL_PixelFormat)Marshal.PtrToStructure(this.surface.format, typeof(Sdl.SDL_PixelFormat));
+ this.resetClipRect();
+ this.currentSurfaceCount++;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="w"></param>
+ /// <param name="h"></param>
+ public Surface(int w, int h) : this(w, h, IntPtr.Zero) { }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="w"></param>
+ /// <param name="h"></param>
+ /// <param name="pf"></param>
+ public Surface(int w, int h, IntPtr pf)
+ {
+ if (pf == IntPtr.Zero)
+ {
+ this.surfacePtrs[0] = Sdl.SDL_CreateRGBSurface(flags, w, h, bpp, 0, 0, 0, 0);
+ this.surface = (Sdl.SDL_Surface)Marshal.PtrToStructure(this.surfacePtr(), typeof(Sdl.SDL_Surface));
+ pixelFormat = (Sdl.SDL_PixelFormat)Marshal.PtrToStructure(this.surface.format, typeof(Sdl.SDL_PixelFormat));
+ }
+ else
+ {
+ pixelFormat = (Sdl.SDL_PixelFormat)Marshal.PtrToStructure(pf, typeof(Sdl.SDL_PixelFormat));
+ this.surfacePtrs[0] = Sdl.SDL_CreateRGBSurface(flags, w, h, bpp, pixelFormat.Rmask, pixelFormat.Gmask, pixelFormat.Bmask, pixelFormat.Amask);
+ this.surface = (Sdl.SDL_Surface)Marshal.PtrToStructure(this.surfacePtr(), typeof(Sdl.SDL_Surface));
+ }
+
+ this.sourceColorKey = Color.Magenta;
+ this.resetClipRect();
+ this.currentSurfaceCount++;
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="filename"></param>
+ public Surface(string filename)
+ {
+ this.surfacePtrs[0] = Tao.Sdl.SdlImage.IMG_Load(filename);
+ this.surface = (Sdl.SDL_Surface)Marshal.PtrToStructure(this.surfacePtr(), typeof(Sdl.SDL_Surface));
+ this.pixelFormat = (Sdl.SDL_PixelFormat)Marshal.PtrToStructure(this.surface.format, typeof(Sdl.SDL_PixelFormat));
+ this.sourceColorKey = Color.Magenta;
+ this.resetClipRect();
+ this.currentSurfaceCount++;
+ this._filename = filename;
+ }
+ internal Surface(IntPtr surface)
+ {
+ this.surfacePtrs[0] = surface;
+ this.surface = (Sdl.SDL_Surface)Marshal.PtrToStructure(this.surfacePtr(), typeof(Sdl.SDL_Surface));
+ this.pixelFormat = (Sdl.SDL_PixelFormat)Marshal.PtrToStructure(this.surface.format, typeof(Sdl.SDL_PixelFormat));
+ this.sourceColorKey = Color.Magenta;
+ this.resetClipRect();
+ this.currentSurfaceCount++;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <returns></returns>
+ public IntPtr surfacePtr() { return this.surfacePtrs[0]; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public void resetClipRect()
+ {
+ Sdl.SDL_Rect r = new Sdl.SDL_Rect(0, 0, (short)Size.Width, (short)Size.Height);
+ Sdl.SDL_SetClipRect(this.surfacePtr(), ref r);
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ public Sdl.SDL_Rect clipSDLRect
+ {
+ get
+ {
+ Sdl.SDL_Rect r = new Sdl.SDL_Rect();
+ Sdl.SDL_GetClipRect(this.surfacePtr(), ref r);
+ return r;
+ }
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ public Rectangle clipRect
+ {
+ get
+ {
+ Sdl.SDL_Rect r = new Sdl.SDL_Rect();
+ Sdl.SDL_GetClipRect(this.surfacePtr(), ref r);
+ return new Rectangle(r.x, r.y, r.w, r.h);
+ }
+ set
+ {
+ value.Intersect(new Rectangle(0, 0, Size.Width, Size.Height));
+ srect.x = (short)value.X;
+ srect.y = (short)value.Y;
+ srect.w = (short)value.Width;
+ srect.h = (short)value.Height;
+ Sdl.SDL_SetClipRect(this.surfacePtr(), ref srect);
+ }
+ }
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ public void Dispose()
+ {
+ //i'm sure something needs to be cleared here
+ }
+
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="c"></param>
+ ///// <returns></returns>
+ //public int getSDLColor(Color c) { return Sdl.SDL_MapRGB(this.surfacePtrs[0], c.R, c.G, c.B); }
+
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="destX"></param>
+ ///// <param name="destY"></param>
+ ///// <param name="source"></param>
+ ///// <param name="srcRect"></param>
+ //public void bltFast(int destX, int destY, Surface source, Rectangle srcRect)
+ //{
+ // //RECT srect = Util.toRECT(srcRect);
+
+ // //Sdl.SDL_Rect src = toRect(srcRect), dst = toRect(destX, destY, srcRect.Width, srcRect.Height);
+ // //Tao.Sdl.Sdl.SDL_BlitSurface(source.surface, ref src, this.surface, ref dst);
+
+ // drect.x = (short)destX;
+ // drect.y = (short)destY;
+ // drect.w = (short)srcRect.Width;
+ // drect.h = (short)srcRect.Height;
+ // srect.x = (short)srcRect.X;
+ // srect.y = (short)srcRect.Y;
+ // srect.w = (short)srcRect.Width;
+ // srect.h = (short)srcRect.Height;
+
+ // blt(drect, source, srect);
+ //}
+
+ private Sdl.SDL_Rect drect, srect;
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="dstPos"></param>
+ /// <param name="source"></param>
+ /// <param name="srcPos"></param>
+ /// <param name="sz"></param>
+ public void blt(Point dstPos, Surface source, Point srcPos, Size sz)
+ {
+ drect.x = (short)dstPos.X;
+ drect.y = (short)dstPos.Y;
+ drect.w = (short)sz.Width;
+ drect.h = (short)sz.Height;
+ srect.x = (short)srcPos.X;
+ srect.y = (short)srcPos.Y;
+ srect.w = (short)sz.Width;
+ srect.h = (short)sz.Height;
+ blt(drect, source, srect);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="dstPos"></param>
+ /// <param name="source"></param>
+ public void blt(Point dstPos, Surface source)
+ {
+ drect.x = (short)dstPos.X;
+ drect.y = (short)dstPos.Y;
+ drect.w = (short)source.Size.Width;
+ drect.h = (short)source.Size.Height;
+ srect.x = 0;
+ srect.y = 0;
+ srect.w = (short)source.Size.Width;
+ srect.h = (short)source.Size.Height;
+ blt(drect, source, srect);
+ }
+
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="dstX1"></param>
+ ///// <param name="dstY1"></param>
+ ///// <param name="dstX2"></param>
+ ///// <param name="dstY2"></param>
+ ///// <param name="source"></param>
+ ///// <param name="srcX1"></param>
+ ///// <param name="srcY1"></param>
+ ///// <param name="srcX2"></param>
+ ///// <param name="srcY2"></param>
+ //public void blt(int dstX1, int dstY1, int dstX2, int dstY2, Surface source,
+ // int srcX1, int srcY1, int srcX2, int srcY2)
+ //{
+ // drect.x = (short)dstX1;
+ // drect.y = (short)dstY1;
+ // drect.w = (short)(dstX2 - dstX1);
+ // drect.h = (short)(dstY2 - dstY1);
+ // srect.x = (short)srcX1;
+ // srect.y = (short)srcY1;
+ // srect.w = (short)(srcX2 - srcX1);
+ // srect.h = (short)(srcY2 - srcY1);
+ // blt(drect, source, srect);
+ //}
+
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="dst"></param>
+ ///// <param name="source"></param>
+ ///// <param name="src"></param>
+ //public void blt(Point dst, Surface source, Rectangle src) { blt(new Rectangle(dst.X, dst.Y, src.Width, src.Height), source, src); }
+ private void blt(Rectangle dst, Surface source, Rectangle src)
+ {
+ drect.x = (short)dst.X;
+ drect.y = (short)dst.Y;
+ drect.w = (short)dst.Width;
+ drect.h = (short)dst.Height;
+ srect.x = (short)src.X;
+ srect.y = (short)src.Y;
+ srect.w = (short)src.Width;
+ srect.h = (short)src.Height;
+ Tao.Sdl.Sdl.SDL_BlitSurface(source.surfacePtr(), ref srect, this.surfacePtr(), ref drect);
+ }
+
+ private void blt(Sdl.SDL_Rect dst, Surface source, Sdl.SDL_Rect src)
+ {
+ Tao.Sdl.Sdl.SDL_BlitSurface(source.surfacePtr(), ref src, this.surfacePtr(), ref dst);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="val"></param>
+ public void setAlpha(byte val)
+ {
+ //surface.AlphaBlending = true;
+ //surface.Alpha = 128;
+ Sdl.SDL_SetAlpha(this.surfacePtrs[0], Sdl.SDL_SRCALPHA | Sdl.SDL_SRCCOLORKEY, val);
+ }
+ /*
+ public void clipRectangle(ref Rectangle dst, ref Rectangle src)
+ {
+ int t;
+
+ // compute new dst.Left
+ t = Math.Max(dst.Left, clip.Left);
+ src.X += (t - dst.Left);
+ dst.X = t;
+
+ t = Math.Max(dst.Top, clip.Top);
+ src.Y += (t - dst.Top);
+ dst.Y = t;
+
+ t = Math.Min(dst.Right, clip.Right);
+ //src.Width += (t - dst.Right);
+ //dst.Width = t - dst.Left;
+
+ t = Math.Min(dst.Bottom, clip.Bottom);
+ //src.Height += (t - dst.Bottom);
+ //dst.Height = t - dst.Top;
+ }
+
+ public void clipVflip(ref Rectangle dst, ref Rectangle src)
+ {
+ //this.resetClipRect();
+ int t;
+
+ // compute new dst.Left
+ t = Math.Max(dst.Left, clip.Left);
+ //src.X += (t - dst.Left);
+ dst.X = t; // dst.Left += (t-dst.Left)
+
+ t = Math.Max(dst.Top, clip.Top);
+ //src.Height -= (t - dst.Top); // different than the clip method
+ dst.Y = t;
+
+ t = Math.Min(dst.Right, clip.Right);
+ //src.Width += (t - dst.Right);
+ dst.Width = t - dst.Left;
+
+ t = Math.Min(dst.Bottom, clip.Bottom);
+ //src.Y -= (t - dst.Bottom); // different than the clip method
+ dst.Height = t - dst.Top;
+ }
+ */
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="dstPos"></param>
+ /// <param name="source"></param>
+ public void bltAlpha(Point dstPos, Surface source) { bltAlpha(dstPos, source, new Point(0, 0), source.Size); }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="dstPos"></param>
+ /// <param name="source"></param>
+ /// <param name="srcPos"></param>
+ /// <param name="sz"></param>
+ public void bltAlpha(Point dstPos, Surface source, Point srcPos, Size sz)
+ {
+ //Rectangle dst = new Rectangle( dstPos.X,dstPos.Y,sz.Width,sz.Height );
+ //Rectangle src = new Rectangle( srcPos.X,srcPos.Y,sz.Width,sz.Height );
+ //Util.clip( ref dst, ref src, clip );
+ /*alpha.bltAlphaFast( surface, source.surface,
+ dst.Left, dst.Top,
+ src.Left, src.Top, src.Right, src.Bottom,
+ source.colorKey );*/
+ //source.handle.Transparent = false;
+ source.setAlpha(128);
+
+ //this.sourceColorKey = Color.Magenta;
+
+ drect.x = (short)dstPos.X;
+ drect.y = (short)dstPos.Y;
+ drect.w = (short)sz.Width;
+ drect.h = (short)sz.Height;
+ srect.x = (short)srcPos.X;
+ srect.y = (short)srcPos.Y;
+ srect.w = (short)sz.Width;
+ srect.h = (short)sz.Height;
+ //Tao.Sdl.Sdl.SDL_BlitSurface(source.surfacePtr, ref nsrc, this.surfacePtr, ref ndst);
+ blt(drect, source, srect);
+ source.setAlpha(255);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="dstPos"></param>
+ /// <param name="source"></param>
+ /// <param name="srcPos"></param>
+ /// <param name="sz"></param>
+ /// <param name="fill"></param>
+ public void bltShape(Point dstPos, Surface source, Point srcPos, Size sz, Color fill)
+ {
+ drect.x = (short)dstPos.X;
+ drect.y = (short)dstPos.Y;
+ drect.w = (short)sz.Width;
+ drect.h = (short)sz.Height;
+ srect.x = (short)srcPos.X;
+ srect.y = (short)srcPos.Y;
+ srect.w = (short)sz.Width;
+ srect.h = (short)sz.Height;
+ //this.clipRectangle( ref dst, ref src );
+
+ /*alpha.bltShape( surface, source.surface,
+ dst.Left, dst.Top,
+ src.Left, src.Top, src.Right, src.Bottom,
+ (int)colorToFill(fill),
+ source.colorKey );*/
+ //source.setAlpha(128);
+ //source.fill(src,fill);
+
+ //surface.Blit(source.fillMask(src,fill), dst,src);
+ //Tao.Sdl.Sdl.SDL_BlitSurface(source.surfacePtr(), ref src, this.surfacePtr, ref dst);
+ //lastMaskColor = fill;
+ int index = checkMask(source, srect, fill);
+
+ //srect.x = 0;
+ //srect.y = 0;
+ Tao.Sdl.Sdl.SDL_BlitSurface(this.surfacePtrs[index], ref srect, this.surfacePtr(), ref drect);
+ }
+
+ private int checkMask(Surface source, Sdl.SDL_Rect r, Color fill)
+ {
+ int col, pink1, pink2;
+
+ String curSig = "mask" + fill.ToArgb();
+ int curIndex = -1;
+
+ for (int i = 1; i <= currentSurfaceCount; i++) if (surfaceSignatures[i] == curSig) curIndex = i;
+
+ if (curIndex == -1)
+ {
+
+ curIndex = currentSurfaceCount;
+ surfacePtrs[curIndex] = Sdl.SDL_CreateRGBSurface(flags, r.w, r.h, bpp, 0, 0, 0, 0);
+
+ Sdl.SDL_Surface maskSurf = (Sdl.SDL_Surface)Marshal.PtrToStructure(surfacePtrs[curIndex], typeof(Sdl.SDL_Surface));
+ col = Sdl.SDL_MapRGB(maskSurf.format, fill.R, fill.G, fill.B);
+
+ pink1 = Sdl.SDL_MapRGB(source.surface.format, 255, 0, 255);
+ pink2 = Sdl.SDL_MapRGB(maskSurf.format, 255, 0, 255);
+
+ drect = new Sdl.SDL_Rect(0, 0, 1, 1);
+ for (int xx = 0; xx < maskSurf.w; xx++)
+ {
+ for (int yy = 0; yy < maskSurf.h; yy++)
+ {
+ drect.x = (short)xx;
+ drect.y = (short)yy;
+ if (this.GetIntPixel(source.surfacePtr(), xx, yy) != pink1) Sdl.SDL_FillRect(surfacePtrs[curIndex], ref drect, col);
+ else Sdl.SDL_FillRect(surfacePtrs[curIndex], ref drect, pink2);
+ }
+ }
+ Tao.Sdl.Sdl.SDL_SetColorKey(surfacePtrs[curIndex], Sdl.SDL_SRCCOLORKEY | Sdl.SDL_RLEACCEL, pink1);
+ surfaceSignatures[curIndex] = curSig;
+ currentSurfaceCount++;
+ Console.WriteLine("Created a new one at: " + curIndex + ", sig: " + curSig);
+ }
+ return curIndex;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="x"></param>
+ /// <param name="y"></param>
+ /// <returns></returns>
+ public Color GetPixel(int x, int y) { return GetPixel(this.surfacePtr(), x, y); }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="surf"></param>
+ /// <param name="x"></param>
+ /// <param name="y"></param>
+ /// <returns></returns>
+ public Color GetPixel(IntPtr surf, int x, int y) { return this.GetColor(surf, this.GetIntPixel(surf, x, y)); }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="surf"></param>
+ /// <param name="x"></param>
+ /// <param name="y"></param>
+ /// <returns></returns>
+ public int GetIntPixel(IntPtr surf, int x, int y)
+ {
+ Sdl.SDL_Surface s;
+ Sdl.SDL_PixelFormat pf;
+ if (surf != this.surfacePtr())
+ {
+ s = (Sdl.SDL_Surface)Marshal.PtrToStructure(surf, typeof(Sdl.SDL_Surface));
+ pf = (Sdl.SDL_PixelFormat)Marshal.PtrToStructure(s.format, typeof(Sdl.SDL_PixelFormat));
+ }
+ else
+ {
+ s = this.surface;
+ pf = this.pixelFormat;
+ }
+
+ return GetIntPixel(s, pf, surf, x, y);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="s"></param>
+ /// <param name="pf"></param>
+ /// <param name="surf"></param>
+ /// <param name="x"></param>
+ /// <param name="y"></param>
+ /// <returns></returns>
+ public int GetIntPixel(Sdl.SDL_Surface s, Sdl.SDL_PixelFormat pf, IntPtr surf, int x, int y)
+ {
+ IntPtr ptr = new IntPtr(s.pixels.ToInt32() + (y * s.pitch) + (x * pf.BytesPerPixel)); //* bytesPerPixel);
+ int value = 0;
+ switch (pf.BytesPerPixel)
+ {
+ case 1:
+ value = Marshal.ReadByte(ptr);
+ break;
+ case 2:
+ value = Marshal.ReadInt16(ptr);
+ break;
+ case 3:
+ value = MarshalHelper.ReadInt24(ptr);
+ break;
+ case 4:
+ //value = Marshal.ReadInt32(ptr);
+ break;
+ //default:
+ //throw new SdlException(Events.StringManager.GetString("UnknownBytesPerPixel", CultureInfo.CurrentUICulture));
+ }
+ return value;
+ }
+
+
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="dstPos"></param>
+ ///// <param name="source"></param>
+ ///// <param name="fill"></param>
+ //public void bltShape(Point dstPos, Surface source, Color fill)
+ //{
+ // bltShape(dstPos, source, new Point(0, 0), source.Size, fill);
+ //}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <returns></returns>
+ public Surface createFlippedVerticalSurface()
+ {
+ return new Surface(SdlGfx.rotozoomSurfaceXY(this.surfacePtr(), 0, 1, -1, SdlGfx.SMOOTHING_OFF));
+ }
+
+ //public Tao.Sdl.Sdl.SDL_Surface createFlippedHorizontalSurface() { return null; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="dstPos"></param>
+ /// <param name="source"></param>
+ /// <param name="srcPos"></param>
+ /// <param name="sz"></param>
+ /// <param name="_srcColors"></param>
+ /// <param name="_dstColors"></param>
+ /// <param name="vflip"></param>
+ public void bltColorTransform(Point dstPos, Surface source, Point srcPos, Size sz, Color[] _srcColors, Color[] _dstColors, bool vflip)
+ {
+ if (vflip) Console.WriteLine("VFLIP ! VFLIP ! VFLIP ! VFLIP ! VFLIP ! VFLIP ! VFLIP ! ");
+ int index = source.reColor(_srcColors, _dstColors);
+ //blt(dstPos, source, srcPos,sz);
+ drect.x = (short)dstPos.X;
+ drect.y = (short)dstPos.Y;
+ drect.w = (short)sz.Width;
+ drect.h = (short)sz.Height;
+ srect.x = (short)srcPos.X;
+ srect.y = (short)srcPos.Y;
+ srect.w = (short)sz.Width;
+ srect.h = (short)sz.Height;
+ Tao.Sdl.Sdl.SDL_BlitSurface(source.surfacePtrs[index], ref srect, this.surfacePtr(), ref drect);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_srcColors"></param>
+ /// <param name="_dstColors"></param>
+ /// <returns></returns>
+ public int reColor(Color[] _srcColors, Color[] _dstColors)
+ {
+ String curSig = "recolor";
+ for (int curCol = 0; curCol < 4; curCol++)
+ if (_dstColors.GetLength(0) > curCol) curSig += _dstColors[0].ToArgb();
+
+ int curIndex = -1;
+
+ for (int i = 1; i <= currentSurfaceCount; i++) if (surfaceSignatures[i] == curSig) curIndex = i;
+
+ int colTo, colFrom;
+ drect = new Sdl.SDL_Rect(0, 0, (short)this.surface.w, (short)this.surface.h);
+
+ if (curIndex == -1)
+ {
+ curIndex = currentSurfaceCount;
+ this.surfacePtrs[curIndex] = Sdl.SDL_CreateRGBSurface(flags, drect.w, drect.h, bpp, 0, 0, 0, 0);
+ Tao.Sdl.Sdl.SDL_FillRect(this.surfacePtrs[curIndex], ref drect, Sdl.SDL_MapRGB(this.surface.format, 255, 0, 255));
+ Tao.Sdl.Sdl.SDL_BlitSurface(this.surfacePtrs[0], ref drect, this.surfacePtrs[curIndex], ref drect);
+ IntPtr mask = Sdl.SDL_CreateRGBSurface(flags, drect.w, drect.h, bpp, 0, 0, 0, 0);
+ int i;
+ for (i = 0; i < _dstColors.GetLength(0); i++)
+ {
+ colTo = Sdl.SDL_MapRGB(this.surface.format, _dstColors[i].R, _dstColors[i].G, _dstColors[i].B);
+ colFrom = Sdl.SDL_MapRGB(this.surface.format, _srcColors[i].R, _srcColors[i].G, _srcColors[i].B);
+
+ if (i % 2 == 0)
+ {
+ Tao.Sdl.Sdl.SDL_FillRect(mask, ref drect, colTo);
+ Tao.Sdl.Sdl.SDL_SetColorKey(this.surfacePtrs[curIndex], Sdl.SDL_SRCCOLORKEY, colFrom);
+ Tao.Sdl.Sdl.SDL_BlitSurface(this.surfacePtrs[curIndex], ref drect, mask, ref drect);
+ }
+ else
+ {
+ Tao.Sdl.Sdl.SDL_FillRect(this.surfacePtrs[curIndex], ref drect, colTo);
+ Tao.Sdl.Sdl.SDL_SetColorKey(mask, Sdl.SDL_SRCCOLORKEY, colFrom);
+ Tao.Sdl.Sdl.SDL_BlitSurface(mask, ref drect, this.surfacePtrs[curIndex], ref drect);
+ }
+ }
+
+ if (i % 2 == 0)
+ {
+ Tao.Sdl.Sdl.SDL_FillRect(this.surfacePtrs[curIndex], ref drect, Sdl.SDL_MapRGB(this.surface.format, 255, 0, 255));
+ Tao.Sdl.Sdl.SDL_BlitSurface(mask, ref drect, this.surfacePtrs[curIndex], ref drect);
+ Sdl.SDL_FreeSurface(mask);
+ }
+
+ this.sourceColorKey = Color.Magenta;
+
+ surfaceSignatures[curIndex] = curSig;
+ currentSurfaceCount++;
+ Console.WriteLine("Created a new one at: " + curIndex + ", sig: " + curSig);
+ }
+ return curIndex;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="dstPos"></param>
+ /// <param name="source"></param>
+ /// <param name="srcPos"></param>
+ /// <param name="sz"></param>
+ /// <param name="R_dest"></param>
+ /// <param name="G_dest"></param>
+ /// <param name="B_dest"></param>
+ public void bltHueTransform(Point dstPos, Surface source, Point srcPos, Size sz, Color R_dest, Color G_dest, Color B_dest)
+ {
+ /*RECT dst = Util.toRECT( dstPos, sz );
+ RECT src = Util.toRECT( srcPos, sz );
+ Util.clip( ref dst, ref src, clip );
+
+ //Debug.WriteLine(""+R_dest.ToArgb()+","+G_dest.ToArgb()+","+B_dest.ToArgb());
+ bltHueTransform( surface, source.surface,
+ dst.Left, dst.Top,
+ src.Left, src.Top, src.Right, src.Bottom,
+ R_dest.ToArgb(), G_dest.ToArgb(), B_dest.ToArgb(),
+ source.colorKey );*/
+ //surface.RedMask = R_dest.ToArgb();
+ //surface.BlueMask = B_dest.ToArgb();
+ //surface.Green = G_dest.ToArgb();
+ //surface.Blit(source.handle, new Rectangle(dstPos.X, dstPos.Y, sz.Width, sz.Height), new Rectangle(srcPos.X, srcPos.Y, sz.Width, sz.Height));
+ //throw new Exception("NOT IMPLEMENTED YET!");
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="p"></param>
+ /// <param name="col"></param>
+ public void SetPixel(Point p, Color col) { SetPixel(p.X, p.Y, col); }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="x"></param>
+ /// <param name="y"></param>
+ /// <param name="col"></param>
+ public void SetPixel(int x, int y, Color col)
+ {
+ SdlGfx.pixelRGBA(this.surfacePtrs[0], (short)x, (short)y, col.R, col.G, col.B, 255);
+ }
+
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="buf"></param>
+ //public void SetPixels(Int32[] buf)
+ //{
+ // Sdl.SDL_LockSurface(this.surfacePtrs[0]);
+ // Marshal.Copy(buf, 0, new IntPtr(this.surface.pixels.ToInt32()), buf.Length);
+ // Sdl.SDL_UnlockSurface(this.surfacePtrs[0]);
+ // /*
+ // try
+ // {
+ // int bytesPerPixel = this.pixelFormat.BytesPerPixel;
+ // //int pixels = this.surface.pixels.ToInt32() + point.X * bytesPerPixel;
+ // int pitch = this.surface.pitch;
+ // if (bytesPerPixel == 4)
+ // {
+ // //the buffer for a row of pixels.
+ // //Int32[] buffer = new Int32[colors.GetLength(0)];
+ // DateTime d = DateTime.Now;
+ // /*for (short x = 0; x < colors.GetLength(0); x++)
+ // {
+ // //gets only the pixels in the row that are required.
+ // for (short y = 0; y < colors.GetLength(1); y++)
+ // {
+ // //converts the pixel to a color value.
+ // //buffer[x] = Sdl.SDL_MapRGB(this.surface.form...
[truncated message content] |
|
From: <je...@us...> - 2008-03-24 18:31:18
|
Revision: 279
http://freetrain.svn.sourceforge.net/freetrain/?rev=279&view=rev
Author: jendave
Date: 2008-03-24 11:31:25 -0700 (Mon, 24 Mar 2008)
Log Message:
-----------
fix case
Modified Paths:
--------------
branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
branches/FreeTrainSDL/plugins/Kohsuke.Trains/plugin.xml
Modified: branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs 2008-03-24 17:53:17 UTC (rev 278)
+++ branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs 2008-03-24 18:31:25 UTC (rev 279)
@@ -64,6 +64,7 @@
///
/// </summary>
public abstract int maxLength { get; }
+
/// <summary>
///
///
@@ -106,6 +107,7 @@
}
}
}
+
/// <summary>
///
/// </summary>
@@ -124,10 +126,14 @@
// /~~~~~
// /
for (int x = -10; x < 0; x++)
+ {
pd.draw(RailPattern.get(Direction.WEST, Direction.EAST), x, 0);
+ }
pd.draw(RailPattern.get(Direction.WEST, Direction.SOUTHEAST), 0, 0);
for (int x = 1; x <= 10; x++)
+ {
pd.draw(RailPattern.get(Direction.NORTHWEST, Direction.SOUTHEAST), x, x);
+ }
TrainCarContribution[] cars = create(trainlength);
/*if( cars==null ) {
@@ -150,7 +156,9 @@
for (int i = 7; i >= 0; i--)
{
if (cars.Length <= i)
+ {
continue; // no car
+ }
Point pt = pd.getPoint(pos[i * 2], pos[i * 2 + 1]);
cars[i].draw(pd.surface,
Modified: branches/FreeTrainSDL/plugins/Kohsuke.Trains/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/Kohsuke.Trains/plugin.xml 2008-03-24 17:53:17 UTC (rev 278)
+++ branches/FreeTrainSDL/plugins/Kohsuke.Trains/plugin.xml 2008-03-24 18:31:25 UTC (rev 279)
@@ -66,7 +66,7 @@
<contribution type="trainCar" id="{3983B298-ADB1-4905-94E5-03B7AAE5A221}-h">
<class name="FreeTrain.Contributions.Train.AsymTrainCarImpl" />
<sprite origin="0,0">
- <picture src="train485a.bmp" />
+ <picture src="Train485a.bmp" />
</sprite>
<capacity>65</capacity>
</contribution>
@@ -75,7 +75,7 @@
<contribution type="trainCar" id="{3983B298-ADB1-4905-94E5-03B7AAE5A221}-m">
<class name="FreeTrain.Contributions.Train.SymTrainCarImpl" />
<sprite origin="0,0">
- <picture src="train485b.bmp" />
+ <picture src="Train485b.bmp" />
</sprite>
<capacity>70</capacity>
</contribution>
@@ -117,7 +117,7 @@
<contribution type="trainCar" id="{F4D54B1E-534E-47b0-9EA7-76CE075423E4}-h">
<class name="FreeTrain.Contributions.Train.AsymTrainCarImpl" />
<sprite origin="0,0">
- <picture src="trainE3a.bmp" />
+ <picture src="TrainE3a.bmp" />
</sprite>
<capacity>56</capacity>
</contribution>
@@ -126,7 +126,7 @@
<contribution type="trainCar" id="{F4D54B1E-534E-47b0-9EA7-76CE075423E4}-m">
<class name="FreeTrain.Contributions.Train.SymTrainCarImpl" />
<sprite origin="0,0">
- <picture src="trainE3b.bmp" />
+ <picture src="TrainE3b.bmp" />
</sprite>
<capacity>64</capacity>
</contribution>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-25 20:30:46
|
Revision: 288
http://freetrain.svn.sourceforge.net/freetrain/?rev=288&view=rev
Author: jendave
Date: 2008-03-25 13:30:47 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
Make MapOverlay interface more compliant
Modified Paths:
--------------
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
branches/FreeTrainSDL/core/controllers/PointSelectorController.cs
branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/views/MapOverlay.cs
branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
branches/FreeTrainSDL/plugins/Chiname.DummyCars/ControllerImpl.cs
branches/FreeTrainSDL/plugins/Chiname.Generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/ControllerImpl.cs
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HVControllerImpl.cs
branches/FreeTrainSDL/plugins/Kohsuke.VinylHouse/VinylHouseBuilder.cs
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -84,7 +84,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
/// <summary>
///
/// </summary>
@@ -92,7 +92,7 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
if (currentCube.contains(loc))
alphaSprites.getSprite(loc - this.location).drawAlpha(canvas.surface, pt);
@@ -102,7 +102,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
[Serializable]
Modified: branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -70,7 +70,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
/// <summary>
///
/// </summary>
@@ -78,7 +78,7 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
if (loc.z != currentLoc.z) return;
@@ -90,6 +90,6 @@
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
}
}
Modified: branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -330,10 +330,10 @@
/// </summary>
/// <param name="view"></param>
/// <param name="canvas"></param>
- public void drawBefore(QuarterViewDrawer view, DrawContextEx canvas)
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx canvas)
{
if (anchor != UNPLACED && isPlacing)
- canvas.tag = type.canBeBuilt(anchor, currentPos);
+ canvas.Tag = type.canBeBuilt(anchor, currentPos);
}
/// <summary>
///
@@ -342,9 +342,9 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
- object tag = canvas.tag;
+ object tag = canvas.Tag;
if (tag != null && (bool)tag && inBetween(loc, anchor, currentPos))
{
@@ -357,7 +357,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="canvas"></param>
- public void drawAfter(QuarterViewDrawer view, DrawContextEx canvas)
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx canvas)
{
}
Modified: branches/FreeTrainSDL/core/controllers/PointSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/PointSelectorController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/controllers/PointSelectorController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -72,7 +72,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="canvas"></param>
- public virtual void drawAfter(QuarterViewDrawer view, DrawContextEx canvas)
+ public virtual void DrawAfter(QuarterViewDrawer view, DrawContextEx canvas)
{
}
/// <summary>
@@ -80,7 +80,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="canvas"></param>
- public virtual void drawBefore(QuarterViewDrawer view, DrawContextEx canvas)
+ public virtual void DrawBefore(QuarterViewDrawer view, DrawContextEx canvas)
{
}
/// <summary>
@@ -90,7 +90,7 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public virtual void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public virtual void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
}
/// <summary>
Modified: branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -217,7 +217,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
/// <summary>
///
/// </summary>
@@ -225,7 +225,7 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
if (loc.z != anchor.z) return;
@@ -238,7 +238,7 @@
}
}
- public void drawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
}
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -422,7 +422,7 @@
/// <param name="dc"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx dc, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx dc, Location loc, Point pt)
{
if (loc.z != baseLoc.z || !isPlacing) return;
@@ -487,14 +487,14 @@
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
/// <summary>
///
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
private void onGroupChanged(object sender, System.EventArgs e)
{
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -265,14 +265,14 @@
/// </summary>
/// <param name="view"></param>
/// <param name="canvas"></param>
- public void drawBefore(QuarterViewDrawer view, DrawContextEx canvas)
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx canvas)
{
if (anchor != UNPLACED && isPlacing)
{
int cost;
- canvas.tag = SingleRailRoad.comupteRoute(anchor, currentPos, out cost);
- if (canvas.tag != null)
- Debug.WriteLine(((IDictionary)canvas.tag).Count);
+ canvas.Tag = SingleRailRoad.comupteRoute(anchor, currentPos, out cost);
+ if (canvas.Tag != null)
+ Debug.WriteLine(((IDictionary)canvas.Tag).Count);
}
}
@@ -283,9 +283,9 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
- IDictionary dic = (IDictionary)canvas.tag;
+ IDictionary dic = (IDictionary)canvas.Tag;
if (dic != null)
{
RailPattern rp = (RailPattern)dic[loc];
@@ -307,7 +307,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="canvas"></param>
- public void drawAfter(QuarterViewDrawer view, DrawContextEx canvas)
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx canvas)
{
}
Modified: branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -449,7 +449,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
/// <summary>
///
/// </summary>
@@ -457,7 +457,7 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
// TODO: draw using this method.
@@ -467,7 +467,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="dc"></param>
- public void drawAfter(QuarterViewDrawer view, DrawContextEx dc)
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx dc)
{
if (!isPlacing) return;
Location loc = lastMouse;
Modified: branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -332,10 +332,10 @@
/// </summary>
/// <param name="view"></param>
/// <param name="canvas"></param>
- public void drawBefore(QuarterViewDrawer view, DrawContextEx canvas)
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx canvas)
{
if (anchor != UNPLACED && isPlacing && isPassage)
- canvas.tag = canBuildPassageway(anchor, location);
+ canvas.Tag = canBuildPassageway(anchor, location);
}
/// <summary>
///
@@ -344,9 +344,9 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
- object tag = canvas.tag;
+ object tag = canvas.Tag;
if (tag != null && (bool)tag && loc.inBetween(anchor, location))
{
@@ -359,7 +359,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="canvas"></param>
- public void drawAfter(QuarterViewDrawer view, DrawContextEx canvas)
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx canvas)
{
}
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -375,7 +375,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
/// <summary>
///
@@ -384,14 +384,14 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt) { }
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt) { }
/// <summary>
///
/// </summary>
/// <param name="view"></param>
/// <param name="dc"></param>
- public void drawAfter(QuarterViewDrawer view, DrawContextEx dc)
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx dc)
{
Train tr = this.selectedTrain;
if (tr == null || !tr.head.state.isInside) return;
Modified: branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -241,7 +241,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
/// <summary>
///
/// </summary>
@@ -249,7 +249,7 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
if (!isPlacing) return;
if (alphaSprites != null)
@@ -263,7 +263,7 @@
/// </summary>
/// <param name="view"></param>
/// <param name="surface"></param>
- public void drawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
/// <summary>
Modified: branches/FreeTrainSDL/core/views/MapOverlay.cs
===================================================================
--- branches/FreeTrainSDL/core/views/MapOverlay.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/views/MapOverlay.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -35,19 +35,19 @@
/// <summary>
/// Called before any voxel is drawn.
/// </summary>
- void drawBefore(QuarterViewDrawer view, DrawContextEx canvas);
+ void DrawBefore(QuarterViewDrawer view, DrawContextEx canvas);
/// <summary>
/// Called for each voxel that the view is trying to draw.
/// </summary>
- void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt);
+ void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt);
/// <summary>
/// Called after all the images are drawn by MapView.
/// This can be used to draw things that will never be
/// hidden by any objects in the World.
/// </summary>
- void drawAfter(QuarterViewDrawer view, DrawContextEx canvas);
+ void DrawAfter(QuarterViewDrawer view, DrawContextEx canvas);
}
/// <summary>
///
@@ -64,6 +64,6 @@
/// MapOverlay can use this property to pass parameters among
/// various callbacks.
/// </summary>
- public object tag;
+ public object Tag;
}
}
Modified: branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
===================================================================
--- branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -486,7 +486,7 @@
//Debug.WriteLine("voxel took: " + (DateTime.Now - start).TotalMilliseconds + "ms");
}
if (overlay != null)
- overlay.drawVoxel(this, drawContext, world.toXYZ(h, v, z), pt);
+ overlay.DrawVoxel(this, drawContext, world.toXYZ(h, v, z), pt);
}
// Debug.WriteLine("outer loop took: " + (DateTime.Now - start).TotalMilliseconds + "ms");
}
@@ -513,7 +513,7 @@
if (controller != null) overlay = controller.overlay;
if (overlay != null)
- overlay.drawBefore(this, drawContext);
+ overlay.DrawBefore(this, drawContext);
// draw the rect
Rectangle dr = dirtyRect.rect;
@@ -522,7 +522,7 @@
dirtyRect.clear();
// allow MapOverlay to do the wrap-up
- if (overlay != null) overlay.drawAfter(this, drawContext);
+ if (overlay != null) overlay.DrawAfter(this, drawContext);
if (Core.options.drawStationNames)
{
@@ -543,7 +543,7 @@
}*/
}
- drawContext.tag = null; // reset the attached tag
+ drawContext.Tag = null; // reset the attached tag
Debug.WriteLine("update took " + (DateTime.Now - start).TotalMilliseconds + "ms");
}
Modified: branches/FreeTrainSDL/plugins/Chiname.DummyCars/ControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.DummyCars/ControllerImpl.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/plugins/Chiname.DummyCars/ControllerImpl.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -94,7 +94,7 @@
/// <param name="canvas"></param>
/// <param name="loc"></param>
/// <param name="pt"></param>
- public override void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public override void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
if (base.currentPos != loc) return;
if (!contribution.canBeBuilt(loc)) return;
Modified: branches/FreeTrainSDL/plugins/Chiname.Generic/MultiSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.Generic/MultiSelectorController.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/plugins/Chiname.Generic/MultiSelectorController.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -318,7 +318,7 @@
/// <param name="view"></param>
/// <param name="surface"></param>
[CLSCompliant(false)]
- public void drawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
/// <summary>
///
/// </summary>
@@ -327,7 +327,7 @@
/// <param name="loc"></param>
/// <param name="pt"></param>
[CLSCompliant(false)]
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
if (Cube.createExclusive(baseLoc, alphaSprites.size).contains(loc))
alphaSprites.getSprite(loc - baseLoc).drawAlpha(canvas.surface, pt);
@@ -338,7 +338,7 @@
/// <param name="view"></param>
/// <param name="surface"></param>
[CLSCompliant(false)]
- public void drawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
#endregion
/// <summary>
///
Modified: branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/ControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/ControllerImpl.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/ControllerImpl.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -75,7 +75,7 @@
/// <param name="loc"></param>
/// <param name="pt"></param>
[CLSCompliant(false)]
- public override void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public override void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
if( base.currentPos!=loc ) return;
if( !contribution.canBeBuilt(loc) ) return;
Modified: branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HVControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HVControllerImpl.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HVControllerImpl.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -464,7 +464,7 @@
/// <param name="view"></param>
/// <param name="surface"></param>
[CLSCompliant(false)]
- public void drawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
/// <summary>
///
/// </summary>
@@ -473,7 +473,7 @@
/// <param name="loc"></param>
/// <param name="pt"></param>
[CLSCompliant(false)]
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
if (loc != anchor) return;
if (anchor.Equals(currentPos))
@@ -501,7 +501,7 @@
/// <param name="view"></param>
/// <param name="surface"></param>
[CLSCompliant(false)]
- public void drawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
#endregion
}
Modified: branches/FreeTrainSDL/plugins/Kohsuke.VinylHouse/VinylHouseBuilder.cs
===================================================================
--- branches/FreeTrainSDL/plugins/Kohsuke.VinylHouse/VinylHouseBuilder.cs 2008-03-25 16:00:22 UTC (rev 287)
+++ branches/FreeTrainSDL/plugins/Kohsuke.VinylHouse/VinylHouseBuilder.cs 2008-03-25 20:30:47 UTC (rev 288)
@@ -142,9 +142,9 @@
contrib.create(loc1, loc2, true);
}
- public void drawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawBefore(QuarterViewDrawer view, DrawContextEx surface) { }
- public void drawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
+ public void DrawVoxel(QuarterViewDrawer view, DrawContextEx canvas, Location loc, Point pt)
{
if (loc.z != currentLoc.z) return;
@@ -157,7 +157,7 @@
}
}
- public void drawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
+ public void DrawAfter(QuarterViewDrawer view, DrawContextEx surface) { }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-25 22:19:28
|
Revision: 289
http://freetrain.svn.sourceforge.net/freetrain/?rev=289&view=rev
Author: jendave
Date: 2008-03-25 15:19:30 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
lots of re-casing methods
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs
branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs
branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs
branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
branches/FreeTrainSDL/core/controllers/ControllerHostForm.cs
branches/FreeTrainSDL/core/controllers/CubeSelectorController.cs
branches/FreeTrainSDL/core/controllers/Disambiguators.cs
branches/FreeTrainSDL/core/controllers/LocationStore.cs
branches/FreeTrainSDL/core/controllers/ModalController.cs
branches/FreeTrainSDL/core/controllers/PointSelectorController.cs
branches/FreeTrainSDL/core/controllers/RectSelectorController.cs
branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainControllerDialog.cs
branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTrackingWindow.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
branches/FreeTrainSDL/core/controllers/road/RoadController.cs
branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs
branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs
branches/FreeTrainSDL/core/framework/ExternToolsHelper.cs
branches/FreeTrainSDL/core/framework/GlobalOptions.cs
branches/FreeTrainSDL/core/framework/MainWindow.cs
branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs
branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Picture.cs
branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs
branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs
branches/FreeTrainSDL/core/views/GlobalViewOptions.cs
branches/FreeTrainSDL/core/views/MapOverlay.cs
branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
branches/FreeTrainSDL/core/views/map/HeightCutWindow.cs
branches/FreeTrainSDL/core/views/map/MapView.cs
branches/FreeTrainSDL/core/world/Car.cs
branches/FreeTrainSDL/core/world/CarState.cs
branches/FreeTrainSDL/core/world/Clock.cs
branches/FreeTrainSDL/core/world/Cube.cs
branches/FreeTrainSDL/core/world/Location.cs
branches/FreeTrainSDL/core/world/RRCrossing.cs
branches/FreeTrainSDL/core/world/TimeLength.cs
branches/FreeTrainSDL/core/world/Traffic.cs
branches/FreeTrainSDL/core/world/Voxel.cs
branches/FreeTrainSDL/core/world/WorldDefinition.cs
branches/FreeTrainSDL/core/world/accounting/AccountGenre.cs
branches/FreeTrainSDL/core/world/accounting/AccountManager.cs
branches/FreeTrainSDL/core/world/accounting/Debt.cs
branches/FreeTrainSDL/core/world/accounting/TransactionHistory.cs
branches/FreeTrainSDL/core/world/development/DevelopmentAlgorithm.cs
branches/FreeTrainSDL/core/world/development/LandValue.cs
branches/FreeTrainSDL/core/world/development/LandValueInspector.cs
branches/FreeTrainSDL/core/world/development/ULV.cs
branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs
branches/FreeTrainSDL/core/world/land/LandVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
branches/FreeTrainSDL/core/world/rail/FatPlatform.cs
branches/FreeTrainSDL/core/world/rail/JunctionRailRoad.cs
branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs
branches/FreeTrainSDL/core/world/rail/Platform.cs
branches/FreeTrainSDL/core/world/rail/RailRoad.cs
branches/FreeTrainSDL/core/world/rail/RailStationaryStructure.cs
branches/FreeTrainSDL/core/world/rail/SingleRailRoad.cs
branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs
branches/FreeTrainSDL/core/world/rail/SpecialPurposeRailRoad.cs
branches/FreeTrainSDL/core/world/rail/Station.cs
branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
branches/FreeTrainSDL/core/world/rail/YardRailRoad.cs
branches/FreeTrainSDL/core/world/road/Road.cs
branches/FreeTrainSDL/core/world/structs/Commercial.cs
branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs
branches/FreeTrainSDL/core/world/structs/PThreeDimStructure.cs
branches/FreeTrainSDL/core/world/structs/PopulatedStructure.cs
branches/FreeTrainSDL/core/world/structs/StationListenerImpl.cs
branches/FreeTrainSDL/core/world/structs/Structure.cs
branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryMarket.cs
branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
branches/FreeTrainSDL/plugins/Chiname.DummyCars/ControllerImpl.cs
branches/FreeTrainSDL/plugins/Chiname.Generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/Chiname.RoadAccessory/ControllerImpl.cs
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/ControllerForm.cs
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HVControllerImpl.cs
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HVStructure.cs
branches/FreeTrainSDL/plugins/Chiname.Structure.HalfVoxel/HalfVoxelContribution.cs
branches/FreeTrainSDL/plugins/Kohsuke.ColorTestTrain/ColorConfigDialog.cs
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/Program.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -116,13 +116,13 @@
controller = MainWindow.mainWindow.currentController;
qView.updateScreen();
- if (WorldDefinition.world.satellite == null ||
- WorldDefinition.world.satellite.surface.w != 150 ||
- WorldDefinition.world.satellite.surface.h != 150)
+ if (WorldDefinition.World.Satellite == null ||
+ WorldDefinition.World.Satellite.surface.w != 150 ||
+ WorldDefinition.World.Satellite.surface.h != 150)
{
- WorldDefinition.world.satellite = new Surface(150, 150, 32);
- WorldDefinition.world.satellite.sourceColorKey = Color.Magenta;
- WorldDefinition.world.satellite.Fill(Color.FromArgb(222, 195, 132));
+ WorldDefinition.World.Satellite = new Surface(150, 150, 32);
+ WorldDefinition.World.Satellite.sourceColorKey = Color.Magenta;
+ WorldDefinition.World.Satellite.Fill(Color.FromArgb(222, 195, 132));
}
}
Application.DoEvents();
@@ -186,7 +186,7 @@
Point ab = qView.fromClientToAB(e.X + ScrollPosition.X, e.Y + ScrollPosition.Y);
Location xyz = qView.fromABToXYZ(ab, controller);
- if (e.Button == MouseButton.PrimaryButton) controller.onClick(null, xyz, ab);
+ if (e.Button == MouseButton.PrimaryButton) controller.OnClick(null, xyz, ab);
}
}
}
@@ -205,7 +205,7 @@
if (controller != null)
{
Point ab = qView.fromClientToAB(e.X + ScrollPosition.X, e.Y + ScrollPosition.Y);
- controller.onMouseMove(null, qView.fromABToXYZ(ab, controller), ab);
+ controller.OnMouseMove(null, qView.fromABToXYZ(ab, controller), ab);
}
oldX = e.X;
oldY = e.Y;
@@ -216,8 +216,8 @@
{
if (qView != null)
{
- WorldDefinition.world.clock.tick();
- WorldDefinition.world.clock.tick();
+ WorldDefinition.World.clock.tick();
+ WorldDefinition.World.clock.tick();
sourceRect = new Sdl.SDL_Rect((short)ScrollPosition.X, (short)ScrollPosition.Y, (short)width, (short)height);
dst = new Sdl.SDL_Rect(0, 0, (short)width, (short)height);
@@ -232,7 +232,7 @@
if (gui != null)
{
gui.updateGUIElements(width, height);
- if (WorldDefinition.world != null) gui.clock_text = WorldDefinition.world.clock.displayString;
+ if (WorldDefinition.World != null) gui.clock_text = WorldDefinition.World.clock.displayString;
gui.drawGUI(width, height, screen.Handle);
}
screen.Update();
@@ -361,20 +361,20 @@
finalDraw();
Core.init(null, null, null, new ProgressHandler(UpdateMessage), true);
world = new WorldDefinition(new Distance(150, 150, 7), 3);
- WorldDefinition.world = world;
+ WorldDefinition.World = world;
weatherOverlay = NullWeatherOverlay.theInstance;
UpdateMessage("Creating Map...", 0);
finalDraw();
- qView = new QuarterViewDrawer(world, new Rectangle(0, 0, world.size.x * 32 - 16, (world.size.y - 2 * world.size.z - 1) * 8));
- qView.offscreenBuffer = new Surface(world.size.x * 32 - 16, (world.size.y - 2 * world.size.z - 1) * 8, screen.CreateCompatibleSurface().Pixels);
+ qView = new QuarterViewDrawer(world, new Rectangle(0, 0, world.Size.x * 32 - 16, (world.Size.y - 2 * world.Size.z - 1) * 8));
+ qView.offscreenBuffer = new Surface(world.Size.x * 32 - 16, (world.Size.y - 2 * world.Size.z - 1) * 8, screen.CreateCompatibleSurface().Pixels);
qView.offscreenBuffer.sourceColorKey = Color.Magenta;
qView.recreateDrawBuffer(new Size(width, height), true);
UpdateMessage("Creating Map...", 100);
finalDraw();
- qView.draw(new Rectangle(0, 0, world.size.x * 32 - 16, (world.size.y - 2 * world.size.z - 1) * 8), null);
+ qView.draw(new Rectangle(0, 0, world.Size.x * 32 - 16, (world.Size.y - 2 * world.Size.z - 1) * 8), null);
gui.SHOW_SPLASH = false;
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-25 22:19:30 UTC (rev 289)
@@ -262,7 +262,7 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="controllers\AbstractControllerImpl.cs">
- <SubType>Form</SubType>
+ <SubType>UserControl</SubType>
</Compile>
<Compile Include="controllers\AbstractLineController.cs">
<SubType>Form</SubType>
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -112,7 +112,7 @@
/// <param name="baseLoc"></param>
public Structure create(Location baseLoc, bool initiallyOwned)
{
- return create(new WorldLocator(WorldDefinition.world, baseLoc), initiallyOwned);
+ return create(new WorldLocator(WorldDefinition.World, baseLoc), initiallyOwned);
}
/// <summary>
///
@@ -130,7 +130,7 @@
/// <param name="baseLoc"></param>
public void create2(Location baseLoc)
{
- create(new WorldLocator(WorldDefinition.world, baseLoc), false);
+ create(new WorldLocator(WorldDefinition.World, baseLoc), false);
}
/// <summary>
@@ -186,7 +186,7 @@
public WorldDefinition CreatePreviewWorld(Size minsizePixel, IDictionary options)
{
WorldDefinition w = WorldDefinition.CreatePreviewWorld(minsizePixel, size);
- Location l = w.toXYZ((w.size.x - size.x + size.y) / 2, w.size.y - size.y - 2, 0);
+ Location l = w.toXYZ((w.Size.x - size.x + size.y) / 2, w.Size.y - size.y - 2, 0);
create(new WorldLocator(w, l), false);
return w;
}
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -60,7 +60,7 @@
/// <param name="cube"></param>
protected override void onSelected(Cube cube)
{
- if (contrib.canBeBuilt(cube.corner, ControlMode.player))
+ if (contrib.canBeBuilt(cube.corner, ControlMode.Player))
{
MainWindow.showError("Can not build");
//! MainWindow.showError("設置できません");
@@ -74,7 +74,7 @@
/// <summary>
///
/// </summary>
- public override void onDetached()
+ public override void OnDetached()
{
alphaSprites.Dispose();
}
@@ -153,7 +153,7 @@
/// <param name="cube"></param>
protected override void onSelected(Cube cube)
{
- PThreeDimStructure s = WorldDefinition.world.getEntityAt(cube.corner) as PThreeDimStructure;
+ PThreeDimStructure s = WorldDefinition.World.getEntityAt(cube.corner) as PThreeDimStructure;
if (s == null || s.type != contrib)
{
MainWindow.showError("Wrong type");
Modified: branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -54,7 +54,7 @@
public override void create(int x1, int y1, int x2, int y2, int z, bool owned)
{
bulldoze(new Location(x1, y1, z), new Location(x2, y2, z));
- WorldDefinition.world.onVoxelUpdated(new Cube(x1, y1, z, x2 - x1 + 1, y2 - y1 + 1, 1));
+ WorldDefinition.World.onVoxelUpdated(new Cube(x1, y1, z, x2 - x1 + 1, y2 - y1 + 1, 1));
}
/// <summary>
///
@@ -70,14 +70,14 @@
{
// edited by 477 (04/02/14)
//if( World.world.isReusable(x,y,z) && World.world[x,y,z]!=null )
- Voxel v = WorldDefinition.world[x, y, z];
+ Voxel v = WorldDefinition.World[x, y, z];
if (v != null)
{
if (v is MountainVoxel)
{
MountainVoxel mv = v as MountainVoxel;
if (mv.isFlattened)
- WorldDefinition.world.remove(x, y, z);
+ WorldDefinition.World.remove(x, y, z);
else
mv.removeTrees();
}
@@ -87,7 +87,7 @@
}
else
{
- WorldDefinition.world.remove(x, y, z);
+ WorldDefinition.World.remove(x, y, z);
}
}
}
Modified: branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -228,9 +228,9 @@
int y = int.Parse(sizeY.Text);
int z = int.Parse(sizeZ.Text);
WorldDefinition w = new WorldDefinition( new Distance(x,y+z*2,z), z/4 );
- w.name = this.name.Text;
- if(w.name==null || w.name.Length==0)
- w.name = "Terra Incognita";
+ w.Name = this.name.Text;
+ if(w.Name==null || w.Name.Length==0)
+ w.Name = "Terra Incognita";
//! w.name = "ななしさん";
return w;
// TODO: Z dimension
Modified: branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -72,7 +72,7 @@
while (true)
{
- if (WorldDefinition.world[here] != null)
+ if (WorldDefinition.World[here] != null)
{
TrafficVoxel v = TrafficVoxel.get(here);
if (v == null) return false; // occupied
@@ -269,7 +269,7 @@
voxel.road = new RoadImpl(contribution, voxel, RoadPattern.get(dirs));
}
- WorldDefinition.world.onVoxelUpdated(location);
+ WorldDefinition.World.onVoxelUpdated(location);
}
/// <summary>
///
Modified: branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -179,7 +179,7 @@
public Structure create(Location baseLoc, int height, bool initiallyOwned)
{
Debug.Assert(canBeBuilt(baseLoc, height));
- return create(new WorldLocator(WorldDefinition.world, baseLoc), height, initiallyOwned);
+ return create(new WorldLocator(WorldDefinition.World, baseLoc), height, initiallyOwned);
}
/// <summary>
@@ -190,7 +190,7 @@
for (int z = 0; z < height; z++)
for (int y = 0; y < size.y; y++)
for (int x = 0; x < size.x; x++)
- if (WorldDefinition.world[baseLoc.x + x, baseLoc.y + y, baseLoc.z + z] != null)
+ if (WorldDefinition.World[baseLoc.x + x, baseLoc.y + y, baseLoc.z + z] != null)
return false;
return true;
@@ -271,10 +271,10 @@
{
Distance d = new Distance(size.x * 2 + 1, size.y * 2 + 1, maxHeight);
WorldDefinition w = WorldDefinition.CreatePreviewWorld(minsizePixel, d);
- int v = w.size.y - size.y - 2;
- Location l = w.toXYZ((w.size.x - size.x - size.y - 1) / 2, v, 0);
+ int v = w.Size.y - size.y - 2;
+ Location l = w.toXYZ((w.Size.x - size.x - size.y - 1) / 2, v, 0);
create(new WorldLocator(w, l), maxHeight, false);
- l = w.toXYZ((w.size.x) / 2, v, 0);
+ l = w.toXYZ((w.Size.x) / 2, v, 0);
create(new WorldLocator(w, l), minHeight, false);
return w;
}
Modified: branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -36,7 +36,7 @@
/// </summary>
public class AbstractControllerForm : Form
{
- private Point mouse_offset;
+ private Point mouseOffset;
/// <summary>
///
/// </summary>
@@ -45,7 +45,7 @@
InitializeComponent();
try
{
- WorldDefinition.world.viewOptions.OnViewOptionChanged += new OptionChangedHandler(updatePreview);
+ WorldDefinition.World.viewOptions.OnViewOptionChanged += new OptionChangedHandler(UpdatePreview);
}
catch (NullReferenceException nre)
{
@@ -58,7 +58,7 @@
/// <param name="disposing"></param>
protected override void Dispose(bool disposing)
{
- WorldDefinition.world.viewOptions.OnViewOptionChanged -= new OptionChangedHandler(updatePreview);
+ WorldDefinition.World.viewOptions.OnViewOptionChanged -= new OptionChangedHandler(UpdatePreview);
if (disposing && components != null)
components.Dispose();
base.Dispose(disposing);
@@ -87,7 +87,7 @@
/// <summary>
///
/// </summary>
- public virtual void updatePreview() { }
+ public virtual void UpdatePreview() { }
/// <summary>
///
/// </summary>
@@ -192,7 +192,7 @@
/// <param name="e"></param>
protected void AbstractControllerForm_MouseDown(object sender, MouseEventArgs e)
{
- mouse_offset = new Point(-e.X, -e.Y);
+ mouseOffset = new Point(-e.X, -e.Y);
}
/// <summary>
///
@@ -204,7 +204,7 @@
if (e.Button == MouseButtons.Left)
{
Point mousePos = Control.MousePosition;
- mousePos.Offset(mouse_offset.X, mouse_offset.Y);
+ mousePos.Offset(mouseOffset.X, mouseOffset.Y);
this.Location = mousePos;
}
}
Modified: branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -42,6 +42,7 @@
public AbstractControllerImpl()
{
}
+
/// <summary>
///
/// </summary>
@@ -96,19 +97,19 @@
/// <summary>
///
/// </summary>
- public virtual MapOverlay overlay { get { return this as MapOverlay; } }
+ public virtual MapOverlay Overlay { get { return this as MapOverlay; } }
/// <summary>
///
/// </summary>
- public virtual void onAttached() { }
+ public virtual void OnAttached() { }
/// <summary>
///
/// </summary>
- public virtual void onDetached()
+ public virtual void OnDetached()
{
// redraw the entire surface to erase any left-over from this controller
- WorldDefinition.world.onAllVoxelUpdated();
+ WorldDefinition.World.onAllVoxelUpdated();
}
/// <summary>
@@ -117,7 +118,7 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public virtual void onClick(MapViewWindow source, Location loc, Point ab) { }
+ public virtual void OnClick(MapViewWindow source, Location loc, Point ab) { }
/// <summary>
///
///
@@ -125,14 +126,14 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public virtual void onMouseMove(MapViewWindow view, Location loc, Point ab) { }
+ public virtual void OnMouseMove(MapViewWindow view, Location loc, Point ab) { }
/// <summary>
///
/// </summary>
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public virtual void onRightClick(MapViewWindow source, Location loc, Point ab)
+ public virtual void OnRightClick(MapViewWindow source, Location loc, Point ab)
{
Close(); // cancel
}
Modified: branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -53,7 +53,7 @@
/// <summary>
///
/// </summary>
- public override void updatePreview()
+ public override void UpdatePreview()
{
if (this.picture.Image != null)
this.picture.Image.Dispose();
@@ -217,14 +217,14 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onMouseMove(MapViewWindow view, Location loc, Point ab)
+ public override void OnMouseMove(MapViewWindow view, Location loc, Point ab)
{
if (anchor != UNPLACED && isPlacing && currentPos != loc)
{
if (currentPos != UNPLACED)
- WorldDefinition.world.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
+ WorldDefinition.World.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
currentPos = align(loc);
- WorldDefinition.world.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
+ WorldDefinition.World.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
}
}
/// <summary>
@@ -233,7 +233,7 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onClick(MapViewWindow source, Location loc, Point ab)
+ public override void OnClick(MapViewWindow source, Location loc, Point ab)
{
if (anchor == UNPLACED)
{
@@ -254,7 +254,7 @@
else
// remove existing ones
type.remove(anchor, loc);
- WorldDefinition.world.onVoxelUpdated(Cube.createInclusive(anchor, loc));
+ WorldDefinition.World.onVoxelUpdated(Cube.createInclusive(anchor, loc));
}
anchor = UNPLACED;
}
@@ -265,7 +265,7 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onRightClick(MapViewWindow source, Location loc, Point ab)
+ public override void OnRightClick(MapViewWindow source, Location loc, Point ab)
{
if (anchor == UNPLACED)
Close(); // cancel
@@ -273,7 +273,7 @@
{
// cancel the anchor
if (currentPos != UNPLACED)
- WorldDefinition.world.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
+ WorldDefinition.World.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
anchor = UNPLACED;
}
}
@@ -307,7 +307,7 @@
this.buttonPlace.Width = ((this.picture.Left + this.picture.Width)) / 2;
this.buttonRemove.Left = (this.buttonPlace.Left + this.buttonPlace.Width);
this.buttonRemove.Width = this.buttonPlace.Width;
- updatePreview();
+ UpdatePreview();
}
Modified: branches/FreeTrainSDL/core/controllers/ControllerHostForm.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/ControllerHostForm.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/ControllerHostForm.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -53,7 +53,7 @@
public ControllerHostForm()
{
InitializeComponent();
- WorldDefinition.world.viewOptions.OnViewOptionChanged += new OptionChangedHandler(updatePreview);
+ WorldDefinition.World.viewOptions.OnViewOptionChanged += new OptionChangedHandler(updatePreview);
siteImpl = new ControllerSiteImpl(this);
}
/// <summary>
@@ -84,7 +84,7 @@
/// <param name="disposing"></param>
protected override void Dispose(bool disposing)
{
- WorldDefinition.world.viewOptions.OnViewOptionChanged -= new OptionChangedHandler(updatePreview);
+ WorldDefinition.World.viewOptions.OnViewOptionChanged -= new OptionChangedHandler(updatePreview);
if (disposing && components != null)
components.Dispose();
base.Dispose(disposing);
Modified: branches/FreeTrainSDL/core/controllers/CubeSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/CubeSelectorController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/CubeSelectorController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -83,7 +83,7 @@
/// <summary>
///
/// </summary>
- public virtual MapOverlay overlay
+ public virtual MapOverlay Overlay
{
get
{
@@ -123,7 +123,7 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public virtual void onClick(MapViewWindow view, Location loc, Point ab)
+ public virtual void OnClick(MapViewWindow view, Location loc, Point ab)
{
onSelected(Cube.createExclusive(loc, size));
}
@@ -133,7 +133,7 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public virtual void onRightClick(MapViewWindow source, Location loc, Point ab)
+ public virtual void OnRightClick(MapViewWindow source, Location loc, Point ab)
{
onCanceled();
}
@@ -143,9 +143,9 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public virtual void onMouseMove(MapViewWindow view, Location loc, Point ab)
+ public virtual void OnMouseMove(MapViewWindow view, Location loc, Point ab)
{
- WorldDefinition w = WorldDefinition.world;
+ WorldDefinition w = WorldDefinition.World;
if (location != loc)
{
@@ -159,14 +159,14 @@
/// <summary>
///
/// </summary>
- public virtual void onAttached() { }
+ public virtual void OnAttached() { }
/// <summary>
///
/// </summary>
- public virtual void onDetached()
+ public virtual void OnDetached()
{
// redraw the entire surface to erase any left-over from this controller
- WorldDefinition.world.onAllVoxelUpdated();
+ WorldDefinition.World.onAllVoxelUpdated();
}
/// <summary>
///
Modified: branches/FreeTrainSDL/core/controllers/Disambiguators.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/Disambiguators.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/Disambiguators.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -47,7 +47,7 @@
if (RailRoad.get(loc) != null) return true;
// or if we hit the ground
- if (WorldDefinition.world.getGroundLevel(loc) >= loc.z) return true;
+ if (WorldDefinition.World.getGroundLevel(loc) >= loc.z) return true;
return false;
}
@@ -71,7 +71,7 @@
/// <returns></returns>
public bool isSelectable(Location loc)
{
- return loc.z == WorldDefinition.world.getGroundLevel(loc);
+ return loc.z == WorldDefinition.World.getGroundLevel(loc);
}
}
Modified: branches/FreeTrainSDL/core/controllers/LocationStore.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/LocationStore.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/LocationStore.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -48,10 +48,10 @@
set
{
if (loc != Location.UNPLACED)
- WorldDefinition.world.onVoxelUpdated(loc);
+ WorldDefinition.World.onVoxelUpdated(loc);
loc = value;
if (loc != Location.UNPLACED)
- WorldDefinition.world.onVoxelUpdated(loc);
+ WorldDefinition.World.onVoxelUpdated(loc);
}
}
}
Modified: branches/FreeTrainSDL/core/controllers/ModalController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/ModalController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/ModalController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -42,31 +42,31 @@
/// <param name="source">sender of the event.</param>
/// <param name="loc">(X,Y,Z) location that was clicked</param>
/// <param name="ab">(A,B) location that was clicked.</param>
- void onClick(MapViewWindow source, Location loc, Point ab);
+ void OnClick(MapViewWindow source, Location loc, Point ab);
/// <summary>
///
/// </summary>
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- void onRightClick(MapViewWindow source, Location loc, Point ab);
+ void OnRightClick(MapViewWindow source, Location loc, Point ab);
/// <summary>
///
/// </summary>
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- void onMouseMove(MapViewWindow source, Location loc, Point ab);
+ void OnMouseMove(MapViewWindow source, Location loc, Point ab);
/// <summary>
/// Called when the controller gets activated.
/// </summary>
- void onAttached();
+ void OnAttached();
/// <summary>
/// Called when the controller gets deactivated.
/// </summary>
- void onDetached();
+ void OnDetached();
// /// <summary>
// /// Closes the controller. A host uses this method to close
@@ -87,6 +87,6 @@
/// <summary>
/// If this controller needs to modify the map view, return non-null value.
/// </summary>
- MapOverlay overlay { get; }
+ MapOverlay Overlay { get; }
}
}
Modified: branches/FreeTrainSDL/core/controllers/PointSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/PointSelectorController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/PointSelectorController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -96,17 +96,17 @@
/// <summary>
///
/// </summary>
- public virtual void onAttached()
+ public virtual void OnAttached()
{
}
/// <summary>
///
/// </summary>
- public virtual void onDetached()
+ public virtual void OnDetached()
{
// clear the remaining image
if (currentPos != Location.UNPLACED)
- WorldDefinition.world.onVoxelUpdated(currentPos);
+ WorldDefinition.World.onVoxelUpdated(currentPos);
}
/// <summary>
///
@@ -114,12 +114,12 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public virtual void onMouseMove(MapViewWindow source, Location loc, Point ab)
+ public virtual void OnMouseMove(MapViewWindow source, Location loc, Point ab)
{
if (currentPos != Location.UNPLACED)
- WorldDefinition.world.onVoxelUpdated(currentPos);
+ WorldDefinition.World.onVoxelUpdated(currentPos);
currentPos = loc;
- WorldDefinition.world.onVoxelUpdated(currentPos);
+ WorldDefinition.World.onVoxelUpdated(currentPos);
onSelectionChanged(currentPos);
}
@@ -129,7 +129,7 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public void onRightClick(MapViewWindow source, Location loc, Point ab)
+ public void OnRightClick(MapViewWindow source, Location loc, Point ab)
{
close();
}
@@ -139,7 +139,7 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public void onClick(MapViewWindow source, Location loc, Point ab)
+ public void OnClick(MapViewWindow source, Location loc, Point ab)
{
onLocationSelected(loc);
}
@@ -164,7 +164,7 @@
/// <summary>
///
/// </summary>
- public virtual MapOverlay overlay
+ public virtual MapOverlay Overlay
{
get
{
Modified: branches/FreeTrainSDL/core/controllers/RectSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/RectSelectorController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/RectSelectorController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -87,7 +87,7 @@
/// <summary>
///
/// </summary>
- public virtual MapOverlay overlay
+ public virtual MapOverlay Overlay
{
get
{
@@ -154,7 +154,7 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public virtual void onClick(MapViewWindow view, Location loc, Point ab)
+ public virtual void OnClick(MapViewWindow view, Location loc, Point ab)
{
if (anchor == UNPLACED)
{
@@ -172,14 +172,14 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public virtual void onRightClick(MapViewWindow source, Location loc, Point ab)
+ public virtual void OnRightClick(MapViewWindow source, Location loc, Point ab)
{
if (anchor == UNPLACED)
onCanceled();
else
{
// cancel the anchor
- WorldDefinition.world.onAllVoxelUpdated();
+ WorldDefinition.World.onAllVoxelUpdated();
anchor = UNPLACED;
}
}
@@ -189,9 +189,9 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public virtual void onMouseMove(MapViewWindow view, Location loc, Point ab)
+ public virtual void OnMouseMove(MapViewWindow view, Location loc, Point ab)
{
- WorldDefinition w = WorldDefinition.world;
+ WorldDefinition w = WorldDefinition.World;
if (anchor != UNPLACED && currentLoc != loc)
{
@@ -205,14 +205,14 @@
/// <summary>
///
/// </summary>
- public virtual void onAttached() { }
+ public virtual void OnAttached() { }
/// <summary>
///
/// </summary>
- public virtual void onDetached()
+ public virtual void OnDetached()
{
// redraw the entire surface to erase any left-over from this controller
- WorldDefinition.world.onAllVoxelUpdated();
+ WorldDefinition.World.onAllVoxelUpdated();
}
/// <summary>
///
Modified: branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -254,19 +254,19 @@
{
for (int y = loc1.y; y <= loc2.y; y++)
{
- Voxel v = WorldDefinition.world[x, y, z];
+ Voxel v = WorldDefinition.World[x, y, z];
if (v != null && !v.entity.isOwned && v.entity.isSilentlyReclaimable)
{
// remove the old structure if possible
AccountGenre.Subsidiaries.Spend(v.entity.entityValue);
v.entity.remove();
}
- v = WorldDefinition.world[x, y, z];
+ v = WorldDefinition.World[x, y, z];
if (v == null)
{
// buy it
- AccountGenre.Subsidiaries.Spend(WorldDefinition.world.landValue[new Location(x, y, z)]);
+ AccountGenre.Subsidiaries.Spend(WorldDefinition.World.landValue[new Location(x, y, z)]);
new LandPropertyVoxel(new Location(x, y, z));
}
}
@@ -288,18 +288,18 @@
{
for (int y = loc1.y; y <= loc2.y; y++)
{
- Voxel v = WorldDefinition.world[x, y, z];
+ Voxel v = WorldDefinition.World[x, y, z];
if (v != null && !v.entity.isOwned && v.entity.isSilentlyReclaimable)
{
// cost for removing this structure
if (s.add(v.entity))
r += v.entity.entityValue;
}
- v = WorldDefinition.world[x, y, z];
+ v = WorldDefinition.World[x, y, z];
if (v == null)
// cost for the land
- r += WorldDefinition.world.landValue[new Location(x, y, z)];
+ r += WorldDefinition.World.landValue[new Location(x, y, z)];
}
}
return r;
@@ -317,7 +317,7 @@
{
for (int y = loc1.y; y <= loc2.y; y++)
{
- LandPropertyVoxel v = WorldDefinition.world[x, y, z] as LandPropertyVoxel;
+ LandPropertyVoxel v = WorldDefinition.World[x, y, z] as LandPropertyVoxel;
if (v != null)
{
AccountGenre.Subsidiaries.Earn(v.landPrice);
@@ -341,7 +341,7 @@
{
for (int y = loc1.y; y <= loc2.y; y++)
{
- LandPropertyVoxel v = WorldDefinition.world[x, y, z] as LandPropertyVoxel;
+ LandPropertyVoxel v = WorldDefinition.World[x, y, z] as LandPropertyVoxel;
if (v != null)
r += v.landPrice;
}
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -241,7 +241,7 @@
this.dirS.Left = this.dirE.Left;
this.dirS.Top = this.dirN.Top + this.dirN.Height + 5;
this.dirW.Top = this.dirS.Top;
- updatePreview();
+ UpdatePreview();
}
private void updatePlatformBox(object sender, PictureBox pic)
@@ -287,9 +287,9 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onMouseMove(MapViewWindow view, Location loc, Point ab)
+ public override void OnMouseMove(MapViewWindow view, Location loc, Point ab)
{
- WorldDefinition w = WorldDefinition.world;
+ WorldDefinition w = WorldDefinition.World;
if (baseLoc != loc)
{
@@ -319,7 +319,7 @@
loc2 += direction.right90; // for the attached rail road, width is two
}
}
- WorldDefinition.world.onVoxelUpdated(Cube.createExclusive(baseLoc, loc2));
+ WorldDefinition.World.onVoxelUpdated(Cube.createExclusive(baseLoc, loc2));
}
/// <summary>
@@ -328,14 +328,14 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onClick(MapViewWindow view, Location loc, Point ab)
+ public override void OnClick(MapViewWindow view, Location loc, Point ab)
{
switch (currentMode)
{
case Mode.Station:
if (isPlacing)
{
- if (!selectedStation.canBeBuilt(loc, ControlMode.player))
+ if (!selectedStation.canBeBuilt(loc, ControlMode.Player))
{
MainWindow.showError(Translation.GetString("CONSTRUCTION_CANNOT_BUILD"));
}
@@ -524,7 +524,7 @@
/// <summary>
///
/// </summary>
- public override void updatePreview()
+ public override void UpdatePreview()
{
if (this.currentMode == Mode.Station)
onStationChanged(null, null);
@@ -546,10 +546,10 @@
/// <summary>
///
/// </summary>
- public override void onDetached()
+ public override void OnDetached()
{
// TODO: update voxels correctly
- WorldDefinition.world.onAllVoxelUpdated();
+ WorldDefinition.World.onAllVoxelUpdated();
}
private void onLengthChanged(object sender, EventArgs e)
@@ -629,7 +629,7 @@
}
alphaSprites = new AlphaBlendSpriteSet(alphas);
- WorldDefinition.world.onAllVoxelUpdated(); // completely redraw the window
+ WorldDefinition.World.onAllVoxelUpdated(); // completely redraw the window
}
private void onModeChanged(object sender, System.EventArgs e)
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -78,13 +78,13 @@
this.Text = Translation.GetString("CONTROLLER_RAIL_TOOLTIP");
this.lblTitle.Text = Translation.GetString("CONTROLLER_RAIL_TITLE");
- updatePreview();
+ UpdatePreview();
}
/// <summary>
///
/// </summary>
- public override void updatePreview()
+ public override void UpdatePreview()
{
/*using( PreviewDrawer drawer = new PreviewDrawer( picture.Size, new Size(1,10), 0 ) )
{
@@ -136,7 +136,7 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onClick(MapViewWindow source, Location loc, Point ab)
+ public override void OnClick(MapViewWindow source, Location loc, Point ab)
{
if (anchor == UNPLACED)
{
@@ -150,12 +150,12 @@
if (isPlacing)
{
// build new railroads.
- if (!SingleRailRoad.build(anchor, loc))
+ if (!SingleRailRoad.Build(anchor, loc))
MainWindow.showError(Translation.GetString("CONTROLLER_RAIL_OBSTACLES"));
}
else
// remove existing ones
- SingleRailRoad.remove(anchor, loc);
+ SingleRailRoad.Remove(anchor, loc);
}
anchor = UNPLACED;
}
@@ -169,7 +169,7 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onRightClick(MapViewWindow source, Location loc, Point ab)
+ public override void OnRightClick(MapViewWindow source, Location loc, Point ab)
{
if (anchor == UNPLACED)
Close(); // cancel
@@ -177,7 +177,7 @@
{
// cancel the anchor
if (currentPos != UNPLACED)
- WorldDefinition.world.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
+ WorldDefinition.World.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
anchor = UNPLACED;
updateDialog();
}
@@ -201,30 +201,30 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onMouseMove(MapViewWindow view, Location loc, Point ab)
+ public override void OnMouseMove(MapViewWindow view, Location loc, Point ab)
{
if (anchor != UNPLACED && isPlacing && currentPos != loc)
{
// update the screen
if (currentPos != UNPLACED)
- WorldDefinition.world.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
+ WorldDefinition.World.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
currentPos = loc;
- WorldDefinition.world.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
+ WorldDefinition.World.onVoxelUpdated(Cube.createInclusive(anchor, currentPos));
int cost;
- SingleRailRoad.comupteRoute(anchor, currentPos, out cost);
+ SingleRailRoad.ComputeRoute(anchor, currentPos, out cost);
costBox.cost = cost;
}
if (anchor != UNPLACED && !isPlacing)
{
- costBox.cost = SingleRailRoad.calcCostOfRemoving(anchor, loc);
+ costBox.cost = SingleRailRoad.CalcCostOfRemoving(anchor, loc);
}
}
/// <summary>
///
/// </summary>
- public override void onDetached()
+ public override void OnDetached()
{
anchor = UNPLACED;
}
@@ -270,7 +270,7 @@
if (anchor != UNPLACED && isPlacing)
{
int cost;
- canvas.Tag = SingleRailRoad.comupteRoute(anchor, currentPos, out cost);
+ canvas.Tag = SingleRailRoad.ComputeRoute(anchor, currentPos, out cost);
if (canvas.Tag != null)
Debug.WriteLine(((IDictionary)canvas.Tag).Count);
}
@@ -291,7 +291,7 @@
RailPattern rp = (RailPattern)dic[loc];
if (rp != null)
{
- for (int j = WorldDefinition.world.getGroundLevel(loc); j < loc.z; j++)
+ for (int j = WorldDefinition.World.getGroundLevel(loc); j < loc.z; j++)
// TODO: ground level handling
BridgePierVoxel.defaultSprite.drawAlpha(
canvas.surface,
Modified: branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -78,12 +78,12 @@
pictureW.Tag = Direction.get(6);
update(pictureN, pictureN); // select N first
- updatePreview();
+ UpdatePreview();
}
/// <summary>
///
/// </summary>
- public override void updatePreview()
+ public override void UpdatePreview()
{
PreviewDrawer drawer;
@@ -322,7 +322,7 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onClick(MapViewWindow source, Location loc, Point ab)
+ public override void OnClick(MapViewWindow source, Location loc, Point ab)
{
if (isPlacing)
{
@@ -388,7 +388,7 @@
else
{
// it is always allowed to place it on or under ground
- if (WorldDefinition.world.getGroundLevel(loc) >= loc.z)
+ if (WorldDefinition.World.getGroundLevel(loc) >= loc.z)
return true;
// if the new rail road is at the edge of existing rail,
@@ -418,7 +418,7 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onMouseMove(MapViewWindow source, Location loc, Point ab)
+ public override void OnMouseMove(MapViewWindow source, Location loc, Point ab)
{
if (lastMouse != loc)
{
@@ -441,7 +441,7 @@
loc2.y += direction.offsetY * 3;
loc2.z++;
- WorldDefinition.world.onVoxelUpdated(Cube.createInclusive(lastMouse, loc2));
+ WorldDefinition.World.onVoxelUpdated(Cube.createInclusive(lastMouse, loc2));
}
/// <summary>
@@ -481,7 +481,7 @@
{
if (i == 2) loc.z++;
- for (int j = WorldDefinition.world.getGroundLevel(loc); j < Z; j++)
+ for (int j = WorldDefinition.World.getGroundLevel(loc); j < Z; j++)
// TODO: ground level handling
BridgePierVoxel.defaultSprite.drawAlpha(
canvas, view.fromXYZToClient(loc.x, loc.y, j));
Modified: branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -241,9 +241,9 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onMouseMove(MapViewWindow view, Location loc, Point ab)
+ public override void OnMouseMove(MapViewWindow view, Location loc, Point ab)
{
- WorldDefinition w = WorldDefinition.world;
+ WorldDefinition w = WorldDefinition.World;
if (isStair)
{
@@ -267,7 +267,7 @@
/// <param name="view"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onClick(MapViewWindow view, Location loc, Point ab)
+ public override void OnClick(MapViewWindow view, Location loc, Point ab)
{
if (isStair)
{
@@ -313,14 +313,14 @@
/// <param name="source"></param>
/// <param name="loc"></param>
/// <param name="ab"></param>
- public override void onRightClick(MapViewWindow source, Location loc, Point ab)
+ public override void OnRightClick(MapViewWindow source, Location loc, Point ab)
{
if (anchor == UNPLACED || isStair)
Close(); // cancel
else
{
// cancel the anchor
- WorldDefinition.world.onAllVoxelUpdated();
+ WorldDefinition.World.onAllVoxelUpdated();
anchor = UNPLACED;
}
}
@@ -393,7 +393,7 @@
if (loc == loc2)
{
// TODO: correctly updated voxels
- WorldDefinition.world.onAllVoxelUpdated();
+ WorldDefinition.World.onAllVoxelUpdated();
return;
}
}
@@ -412,7 +412,7 @@
ThinPlatform.RailRoadImpl rr = ThinPlatform.RailRoadImpl.get(loc1);
- if (WorldDefinition.world[loc1] == null // unused voxel == can be used in any way
+ if (WorldDefinition.World[loc1] == null // unused voxel == can be used in any way
|| (rr != null && Direction.angle(rr.direction, dd) == 2))
{ // orthogonal platform.
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainControllerDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainControllerDialog.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainControllerDialog.cs 2008-03-25 22:19:30 UTC (rev 289)
@@ -69,7 +69,7 @@
// refresh the list
list.BeginUpdate();
list.Items.Clear();
- foreach (TrainController tc in WorldDefinition.world.trainControllers)
+ foreach (TrainController tc in WorldDefinition.World.trainControllers)
{
if (tc.contribution == null) continue; // those are system controllers
list.Items.Add(createListViewItem(tc));
@@ -276,7 +276,7 @@
TrainController tc = contrib.newController(
string.Format("New diagram{0}", iota++));
//! string.Format("新しいダイヤグラム{0}",iota++));
- WorldDefinition.world.trainControllers.add(tc);
+ WorldDefinition.World.trainControllers.add(tc);
// update GUI
list.Items.Add(createListViewItem(tc));
@@ -302,7 +302,7 @@
{
// update data structure
// TODO: what will happen to trains that are controlled by this train controller?
- WorldDefinition.world.trainControllers.remove(selectedItem);
+ WorldDefinition.World.trainControllers.remove(selectedItem);
// update GUI
list.Items.Remove(list.SelectedItems[0]);
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-25 20:30:47 UTC (rev 288)
+++ branches/FreeTrainSDL/core/controllers/r...
[truncated message content] |
|
From: <je...@us...> - 2008-03-26 08:10:43
|
Revision: 290
http://freetrain.svn.sourceforge.net/freetrain/?rev=290&view=rev
Author: jendave
Date: 2008-03-26 01:10:49 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
fix config file. Add settings
Added Paths:
-----------
branches/FreeTrainSDL/Properties/Settings.Designer.cs
branches/FreeTrainSDL/Properties/Settings.settings
branches/FreeTrainSDL/lib/SdlDotNet.dll.config
Property Changed:
----------------
branches/FreeTrainSDL/lib/
Added: branches/FreeTrainSDL/Properties/Settings.Designer.cs
===================================================================
--- branches/FreeTrainSDL/Properties/Settings.Designer.cs (rev 0)
+++ branches/FreeTrainSDL/Properties/Settings.Designer.cs 2008-03-26 08:10:49 UTC (rev 290)
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.832
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FreeTrain.Properties {
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default {
+ get {
+ return defaultInstance;
+ }
+ }
+ }
+}
Property changes on: branches/FreeTrainSDL/Properties/Settings.Designer.cs
___________________________________________________________________
Name: svn:mime-type
+ text/x-csharp
Name: svn:eol-style
+ native
Added: branches/FreeTrainSDL/Properties/Settings.settings
===================================================================
--- branches/FreeTrainSDL/Properties/Settings.settings (rev 0)
+++ branches/FreeTrainSDL/Properties/Settings.settings 2008-03-26 08:10:49 UTC (rev 290)
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+ <Profiles>
+ <Profile Name="(Default)" />
+ </Profiles>
+</SettingsFile>
Property changes on: branches/FreeTrainSDL/lib
___________________________________________________________________
Name: svn:ignore
+ *.swp
Added: branches/FreeTrainSDL/lib/SdlDotNet.dll.config
===================================================================
--- branches/FreeTrainSDL/lib/SdlDotNet.dll.config (rev 0)
+++ branches/FreeTrainSDL/lib/SdlDotNet.dll.config 2008-03-26 08:10:49 UTC (rev 290)
@@ -0,0 +1,12 @@
+<configuration>
+ <dllmap dll="opengl32.dll">
+ <dllentry os="linux" dll="libGL.so.1" />
+ <dllentry os="windows" dll="opengl32.dll"/>
+ <dllentry os="osx" dll="/System/Library/Frameworks/OpenGL.framework/OpenGL" />
+ </dllmap>
+ <dllmap dll="glu32.dll">
+ <dllentry os="linux" dll="libGLU.so.1" />
+ <dllentry os="windows" dll="glu32.dll"/>
+ <dllentry os="osx" dll="/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib" />
+ </dllmap>
+</configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X