]> git.tdb.fi Git - r2c2.git/log
r2c2.git
11 years agoImprove train color selection to always choose saturated colors
Mikko Rasa [Tue, 12 Feb 2013 12:33:56 +0000 (14:33 +0200)]
Improve train color selection to always choose saturated colors

11 years agoDelay processing new trains until they are fully loaded
Mikko Rasa [Tue, 12 Feb 2013 12:32:13 +0000 (14:32 +0200)]
Delay processing new trains until they are fully loaded

11 years agoSimulate a delay for switching turnouts in the Dummy driver
Mikko Rasa [Sun, 10 Feb 2013 09:46:25 +0000 (11:46 +0200)]
Simulate a delay for switching turnouts in the Dummy driver

11 years agoImplement signals in Intellibox driver as well
Mikko Rasa [Fri, 1 Feb 2013 16:56:11 +0000 (18:56 +0200)]
Implement signals in Intellibox driver as well

11 years agoMark turnout blocks before the next sensor as current
Mikko Rasa [Sun, 27 Jan 2013 13:26:18 +0000 (15:26 +0200)]
Mark turnout blocks before the next sensor as current

This avoids a problem where a train leaving a station wouldn't get the
following turnouts as current if they needed switching, and consequently
could trigger an emergency for not reaching a sensor in time.

11 years agoAdd basic support for signals
Mikko Rasa [Sun, 27 Jan 2013 13:24:55 +0000 (15:24 +0200)]
Add basic support for signals

A lot of features are still missing or could use improvement, but whatever
is there works.

11 years agoGeneralize turnouts to magnet accessories in the central station driver
Mikko Rasa [Sun, 27 Jan 2013 13:21:13 +0000 (15:21 +0200)]
Generalize turnouts to magnet accessories in the central station driver

11 years agoAdd functions to resolve an arbitrary point to the nearest point on a track
Mikko Rasa [Sat, 26 Jan 2013 20:37:54 +0000 (22:37 +0200)]
Add functions to resolve an arbitrary point to the nearest point on a track

11 years agoAdd a function to get a BlockIter from a TrackIter
Mikko Rasa [Sat, 26 Jan 2013 20:35:15 +0000 (22:35 +0200)]
Add a function to get a BlockIter from a TrackIter

11 years agoSet vehicle position from reference if it has no track
Mikko Rasa [Sat, 26 Jan 2013 20:30:19 +0000 (22:30 +0200)]
Set vehicle position from reference if it has no track

This only became apparent when I happened to park a train near the origin
and the program went into an infinite loop while loading the layout.

11 years agoFix the arrow while picking a position for a train
Mikko Rasa [Sat, 26 Jan 2013 20:27:57 +0000 (22:27 +0200)]
Fix the arrow while picking a position for a train

11 years agoDetect curved turnouts and assign appropriate symbols to them
Mikko Rasa [Mon, 21 Jan 2013 19:16:00 +0000 (21:16 +0200)]
Detect curved turnouts and assign appropriate symbols to them

11 years agoUpdate deprecated keywords in gui resources
Mikko Rasa [Sun, 20 Jan 2013 17:58:10 +0000 (19:58 +0200)]
Update deprecated keywords in gui resources

11 years agoFix elevation mode in Manipulator
Mikko Rasa [Sun, 20 Jan 2013 11:58:28 +0000 (13:58 +0200)]
Fix elevation mode in Manipulator

I didn't get it quite right when converting the input event handling

11 years agoConvert Measure to a Renderable
Mikko Rasa [Sun, 20 Jan 2013 11:57:44 +0000 (13:57 +0200)]
Convert Measure to a Renderable

11 years agoAdjust datafiles to library changes
Mikko Rasa [Thu, 17 Jan 2013 14:28:08 +0000 (16:28 +0200)]
Adjust datafiles to library changes

11 years agoFix an off-by-one comparison error
Mikko Rasa [Thu, 17 Jan 2013 14:27:03 +0000 (16:27 +0200)]
Fix an off-by-one comparison error

11 years agoMiscellaneous compilation fixes
Mikko Rasa [Thu, 17 Jan 2013 14:26:47 +0000 (16:26 +0200)]
Miscellaneous compilation fixes

11 years agoGive filename to GLtk::Resources constructor
Mikko Rasa [Thu, 17 Jan 2013 14:25:20 +0000 (16:25 +0200)]
Give filename to GLtk::Resources constructor

This is required to load external files correctly.

11 years agoAdapt to mspnet API changes
Mikko Rasa [Thu, 17 Jan 2013 14:13:14 +0000 (16:13 +0200)]
Adapt to mspnet API changes

11 years agoRewrite input even handling
Mikko Rasa [Thu, 17 Jan 2013 14:12:06 +0000 (16:12 +0200)]
Rewrite input even handling

Some interactions with the GUI are a bit broken at the moment, and will be
fixed later.

11 years agoMscellaneous adaptations to mspgl API changes
Mikko Rasa [Thu, 17 Jan 2013 13:42:59 +0000 (15:42 +0200)]
Mscellaneous adaptations to mspgl API changes

11 years agoUse GL::Renderer in TrackWrap
Mikko Rasa [Thu, 17 Jan 2013 13:42:02 +0000 (15:42 +0200)]
Use GL::Renderer in TrackWrap

11 years agoThe Root widget can now set matrices itself
Mikko Rasa [Thu, 17 Jan 2013 12:45:52 +0000 (14:45 +0200)]
The Root widget can now set matrices itself

11 years agoMatch changes in GL::Pipeline API
Mikko Rasa [Thu, 17 Jan 2013 12:34:17 +0000 (14:34 +0200)]
Match changes in GL::Pipeline API

11 years agoCollection::get now returns a reference
Mikko Rasa [Thu, 17 Jan 2013 12:31:23 +0000 (14:31 +0200)]
Collection::get now returns a reference

11 years agoRename Track3D::get_matrix to create_matrix to avoid a conflict
Mikko Rasa [Thu, 17 Jan 2013 12:29:20 +0000 (14:29 +0200)]
Rename Track3D::get_matrix to create_matrix to avoid a conflict

11 years agoUse the new API for defining types in a collection
Mikko Rasa [Thu, 17 Jan 2013 12:28:30 +0000 (14:28 +0200)]
Use the new API for defining types in a collection

11 years agoBasicLoader is now called ObjectLoader
Mikko Rasa [Thu, 17 Jan 2013 12:25:27 +0000 (14:25 +0200)]
BasicLoader is now called ObjectLoader

11 years agoDerive application classes from RegisteredApplication
Mikko Rasa [Thu, 17 Jan 2013 12:21:27 +0000 (14:21 +0200)]
Derive application classes from RegisteredApplication

11 years agoAdd target type to all lexical_casts
Mikko Rasa [Thu, 17 Jan 2013 12:19:14 +0000 (14:19 +0200)]
Add target type to all lexical_casts

11 years agoFix remaining exception class names
Mikko Rasa [Thu, 17 Jan 2013 12:13:08 +0000 (14:13 +0200)]
Fix remaining exception class names

11 years agoCreate a dedicated exception class for vehicle attachment errors
Mikko Rasa [Thu, 17 Jan 2013 11:52:48 +0000 (13:52 +0200)]
Create a dedicated exception class for vehicle attachment errors

11 years agoUse IO::Serial in the Intellibox driver
Mikko Rasa [Thu, 17 Jan 2013 10:50:50 +0000 (12:50 +0200)]
Use IO::Serial in the Intellibox driver

This code is untested and may contain bugs.

11 years agoUse a dedicated exception class for route errors
Mikko Rasa [Thu, 17 Jan 2013 10:48:58 +0000 (12:48 +0200)]
Use a dedicated exception class for route errors

11 years agoReplace various map lookups with functions from maputils.h
Mikko Rasa [Thu, 17 Jan 2013 10:45:45 +0000 (12:45 +0200)]
Replace various map lookups with functions from maputils.h

11 years agoUpdate #includes that have been renamed, and remove stray ones
Mikko Rasa [Thu, 17 Jan 2013 10:38:09 +0000 (12:38 +0200)]
Update #includes that have been renamed, and remove stray ones

11 years agoUpdate Build file
Mikko Rasa [Tue, 8 Jan 2013 14:24:59 +0000 (16:24 +0200)]
Update Build file

11 years agoStrip Id tags and copyright notices from files
Mikko Rasa [Tue, 8 Jan 2013 12:56:06 +0000 (14:56 +0200)]
Strip Id tags and copyright notices from files

The license text is now stored in a separate file.

11 years agoConvert svn:ignore to .gitignore
Mikko Rasa [Tue, 8 Jan 2013 10:15:22 +0000 (12:15 +0200)]
Convert svn:ignore to .gitignore

13 years agoGet the initial state of s88 modules
Mikko Rasa [Sat, 21 May 2011 20:54:48 +0000 (20:54 +0000)]
Get the initial state of s88 modules
Get all functions of locomotives

13 years agoUse a typedef for the function map in VehicleType
Mikko Rasa [Sat, 21 May 2011 20:49:42 +0000 (20:49 +0000)]
Use a typedef for the function map in VehicleType

13 years agoAdd a vehicle property for swapping directions
Mikko Rasa [Sat, 21 May 2011 11:20:40 +0000 (11:20 +0000)]
Add a vehicle property for swapping directions
Add a BR E 03 loco from the package 37574
Add whistle function for BR E 41

13 years agoDon't use too short speed measurements for quantizer learning
Mikko Rasa [Sat, 21 May 2011 10:35:33 +0000 (10:35 +0000)]
Don't use too short speed measurements for quantizer learning
Wait for enough learning data before using it for quantization

13 years agoAvoid deactivating while the controller still has nonzero speed
Mikko Rasa [Sat, 21 May 2011 07:40:54 +0000 (07:40 +0000)]
Avoid deactivating while the controller still has nonzero speed

13 years agoSilence compiler warnings
Mikko Rasa [Fri, 20 May 2011 17:17:07 +0000 (17:17 +0000)]
Silence compiler warnings

13 years agoFix some stuff in Timetable
Mikko Rasa [Fri, 15 Apr 2011 20:14:31 +0000 (20:14 +0000)]
Fix some stuff in Timetable

13 years agoPass sensor events through blocks
Mikko Rasa [Mon, 11 Apr 2011 19:35:26 +0000 (19:35 +0000)]
Pass sensor events through blocks
Add a hysteresis to activation as well
Expose the transition states

13 years agoAdd the new 360mm C-track (24360)
Mikko Rasa [Thu, 7 Apr 2011 20:38:03 +0000 (20:38 +0000)]
Add the new 360mm C-track (24360)
Add four-axle open wagon Eaos 106 (4690)

13 years agoAdd View3D class to bundle Layout3D with a camera and a pipeline
Mikko Rasa [Thu, 7 Apr 2011 20:18:11 +0000 (20:18 +0000)]
Add View3D class to bundle Layout3D with a camera and a pipeline
Store lighting in Layout3D
Add get_bounds method to Layout3D
Use View3D in designer

13 years agoMake TrackWrap take a Layout3D since it doesn't really need Designer
Mikko Rasa [Thu, 7 Apr 2011 16:24:21 +0000 (16:24 +0000)]
Make TrackWrap take a Layout3D since it doesn't really need Designer

13 years agoOverlay should be rendered with blending enabled
Mikko Rasa [Wed, 6 Apr 2011 09:17:44 +0000 (09:17 +0000)]
Overlay should be rendered with blending enabled

13 years agoRemove status from Train and turn it into a TrainAI
Mikko Rasa [Wed, 6 Apr 2011 07:51:55 +0000 (07:51 +0000)]
Remove status from Train and turn it into a TrainAI

13 years agoPrevent certain network errors from crashing the program
Mikko Rasa [Wed, 6 Apr 2011 07:33:08 +0000 (07:33 +0000)]
Prevent certain network errors from crashing the program

13 years agoTrainAI framework
Mikko Rasa [Tue, 5 Apr 2011 15:49:19 +0000 (15:49 +0000)]
TrainAI framework
Make AIControl an AI instead of a Controller
Remote control is a bit broken right now

13 years agoDetermine the border of tracktypes with custom object
Mikko Rasa [Mon, 4 Apr 2011 16:46:40 +0000 (16:46 +0000)]
Determine the border of tracktypes with custom object

13 years agoMake use of GL::Renderer in Overlay3D
Mikko Rasa [Sun, 3 Apr 2011 14:08:47 +0000 (14:08 +0000)]
Make use of GL::Renderer in Overlay3D

13 years agoDisplay composition during extend
Mikko Rasa [Sat, 2 Apr 2011 19:48:37 +0000 (19:48 +0000)]
Display composition during extend

13 years agoMove speed quantization into a separate class
Mikko Rasa [Mon, 28 Mar 2011 13:18:24 +0000 (13:18 +0000)]
Move speed quantization into a separate class

13 years agoRename various get_axle functions to get_fixed_axle
Mikko Rasa [Wed, 16 Mar 2011 10:13:49 +0000 (10:13 +0000)]
Rename various get_axle functions to get_fixed_axle

13 years agoRemove stray includes
Mikko Rasa [Tue, 15 Mar 2011 07:55:06 +0000 (07:55 +0000)]
Remove stray includes

13 years agoUse raycasting instead of OpenGL selection mode to pick tracks
Mikko Rasa [Thu, 10 Mar 2011 10:20:57 +0000 (10:20 +0000)]
Use raycasting instead of OpenGL selection mode to pick tracks

13 years agoFix shadowed member variable warnings
Mikko Rasa [Thu, 10 Mar 2011 10:11:08 +0000 (10:11 +0000)]
Fix shadowed member variable warnings

13 years agoRename Point to Vector
Mikko Rasa [Tue, 8 Mar 2011 11:31:05 +0000 (11:31 +0000)]
Rename Point to Vector

13 years agoFix an error in s88w-t diagram
Mikko Rasa [Tue, 8 Mar 2011 10:37:32 +0000 (10:37 +0000)]
Fix an error in s88w-t diagram

13 years agoFix formatting of goto sensor row type
Mikko Rasa [Sun, 20 Feb 2011 19:47:57 +0000 (19:47 +0000)]
Fix formatting of goto sensor row type
Make sure not to dereference an invalid TrackIter

13 years agoFix some more copyright messages
Mikko Rasa [Sat, 19 Feb 2011 21:38:38 +0000 (21:38 +0000)]
Fix some more copyright messages

13 years agoAdd missing files
Mikko Rasa [Sat, 19 Feb 2011 21:28:38 +0000 (21:28 +0000)]
Add missing files
Fix copyright messages

13 years agoSend and receive power/halt states over network
Mikko Rasa [Sat, 19 Feb 2011 20:46:01 +0000 (20:46 +0000)]
Send and receive power/halt states over network
Send emergency messages over network
Only send non-temporary routes

13 years agoCopy speed only if the preceding train is active
Mikko Rasa [Sat, 19 Feb 2011 06:45:28 +0000 (06:45 +0000)]
Copy speed only if the preceding train is active

13 years agoAdd a timetable command to travel past a turnout
Mikko Rasa [Sat, 19 Feb 2011 06:44:49 +0000 (06:44 +0000)]
Add a timetable command to travel past a turnout

13 years agoUse different stopping margin depending on whether the next track is a turnout
Mikko Rasa [Fri, 18 Feb 2011 05:19:04 +0000 (05:19 +0000)]
Use different stopping margin depending on whether the next track is a turnout

13 years agoUse the rotate_object flag of Bogie when rendering
Mikko Rasa [Sun, 13 Feb 2011 20:51:28 +0000 (20:51 +0000)]
Use the rotate_object flag of Bogie when rendering

13 years agoIgnore dubious speed measurements when finding speed step
Mikko Rasa [Sun, 13 Feb 2011 20:50:46 +0000 (20:50 +0000)]
Ignore dubious speed measurements when finding speed step

13 years agoCheck track iterators for validity before using
Mikko Rasa [Sun, 13 Feb 2011 20:47:44 +0000 (20:47 +0000)]
Check track iterators for validity before using

13 years agoFix travel to sensor handling
Mikko Rasa [Thu, 10 Feb 2011 21:50:09 +0000 (21:50 +0000)]
Fix travel to sensor handling
Handle situations where the train is already at the target location

13 years agoSave state to tempfile an rename to avoid losing it in case saving fails
Mikko Rasa [Thu, 10 Feb 2011 21:46:34 +0000 (21:46 +0000)]
Save state to tempfile an rename to avoid losing it in case saving fails

13 years agoA couple of minor temporary fixes
Mikko Rasa [Sat, 15 Jan 2011 18:01:56 +0000 (18:01 +0000)]
A couple of minor temporary fixes

13 years agoAllow custom objects for tracks
Mikko Rasa [Sat, 15 Jan 2011 11:23:40 +0000 (11:23 +0000)]
Allow custom objects for tracks
Create model for bumper (24977)
Smoothing support for generated track meshes
Improved rail profile

13 years agoEnable Renderer for Endpoint3D and Path3D
Mikko Rasa [Fri, 14 Jan 2011 13:12:58 +0000 (13:12 +0000)]
Enable Renderer for Endpoint3D and Path3D
Add signal_link_changed to Track
Only create one Endpoint3D per connected endpoint pair
Remove the old rendering code from Vehicle3D
Use WindingTest to manage face culling

13 years agoUpdate Track3D to use GL::Renderer
Mikko Rasa [Tue, 11 Jan 2011 22:04:50 +0000 (22:04 +0000)]
Update Track3D to use GL::Renderer
Break Vehicle3D into multiple classes, derived from GL::ObjectInstance

13 years agoFix overlay text colors
Mikko Rasa [Sat, 8 Jan 2011 14:26:05 +0000 (14:26 +0000)]
Fix overlay text colors

13 years agoRender tracks through GL::Objects
Mikko Rasa [Sat, 8 Jan 2011 14:24:56 +0000 (14:24 +0000)]
Render tracks through GL::Objects
Change the main scene into an InstanceScene

13 years agoDerive Collection3D from Msp::DataFile and get GL::Objects through it
Mikko Rasa [Wed, 15 Dec 2010 06:14:55 +0000 (06:14 +0000)]
Derive Collection3D from Msp::DataFile and get GL::Objects through it

13 years agoAdd single get_stuff methods with index to VehicleType
Mikko Rasa [Tue, 14 Dec 2010 21:30:16 +0000 (21:30 +0000)]
Add single get_stuff methods with index to VehicleType
Change how stuff is stored in and given out of Vehicle

13 years agoMake shoppinglist ignore zones
Mikko Rasa [Tue, 14 Dec 2010 21:27:16 +0000 (21:27 +0000)]
Make shoppinglist ignore zones

13 years agoReverse pointer y coordinate in manipulator
Mikko Rasa [Tue, 14 Dec 2010 21:27:04 +0000 (21:27 +0000)]
Reverse pointer y coordinate in manipulator

13 years agoRefine the BR 50 model
Mikko Rasa [Sat, 11 Dec 2010 01:26:24 +0000 (01:26 +0000)]
Refine the BR 50 model
Add a simple model for BR 86
Add crane wagon with generated model

13 years agoMake the axles of vehicles rotate when moving
Mikko Rasa [Sat, 11 Dec 2010 01:25:03 +0000 (01:25 +0000)]
Make the axles of vehicles rotate when moving
Add a system to simulate steam locomotive running gear

13 years agoUse the new scene classes
Mikko Rasa [Sat, 11 Dec 2010 01:24:35 +0000 (01:24 +0000)]
Use the new scene classes

13 years agoTexture2D::storage no longer takes border parameter
Mikko Rasa [Mon, 6 Dec 2010 09:37:45 +0000 (09:37 +0000)]
Texture2D::storage no longer takes border parameter

13 years agoFix MFX speedsteps in Central Station driver
Mikko Rasa [Fri, 3 Dec 2010 19:05:50 +0000 (19:05 +0000)]
Fix MFX speedsteps in Central Station driver
Don't leave symbol uninitialized

13 years agoAdd driver for Märklin Central Station
Mikko Rasa [Mon, 29 Nov 2010 17:04:20 +0000 (17:04 +0000)]
Add driver for Märklin Central Station

14 years agoAdd an absolute wait command to Timetable
Mikko Rasa [Fri, 26 Nov 2010 14:09:55 +0000 (14:09 +0000)]
Add an absolute wait command to Timetable

14 years agoFix end-of-route handling at end of track
Mikko Rasa [Fri, 26 Nov 2010 13:44:12 +0000 (13:44 +0000)]
Fix end-of-route handling at end of track

14 years agoPut TrainPanels in a ScrolledWindow so the UI is usable on small screens
Mikko Rasa [Wed, 24 Nov 2010 18:28:33 +0000 (18:28 +0000)]
Put TrainPanels in a ScrolledWindow so the UI is usable on small screens
Make the speed slider take all the horizontal space it can get

14 years agoAdd control enumeration to Controller
Mikko Rasa [Wed, 24 Nov 2010 18:27:08 +0000 (18:27 +0000)]
Add control enumeration to Controller
Send control states when a new client connects

14 years agoEmit signals from loco status command only when all data has been gathered
Mikko Rasa [Wed, 24 Nov 2010 07:01:47 +0000 (07:01 +0000)]
Emit signals from loco status command only when all data has been gathered
Force Driver's reverse bit to sync with Train

14 years agoSave turnout states and restore them on startup
Mikko Rasa [Tue, 23 Nov 2010 21:54:33 +0000 (21:54 +0000)]
Save turnout states and restore them on startup
Don't send turnout commands before establishing sync with the device

14 years agoFix a stupid comparison mistake in Route
Mikko Rasa [Tue, 23 Nov 2010 21:29:34 +0000 (21:29 +0000)]
Fix a stupid comparison mistake in Route