]> git.tdb.fi Git - r2c2.git/log
r2c2.git
14 years agoUse Msp::IO::print instead of std::cout
Mikko Rasa [Mon, 21 Dec 2009 07:17:19 +0000 (07:17 +0000)]
Use Msp::IO::print instead of std::cout
Use Msp::format instead of std::ostringstream

14 years agoChange a few functions in Train to take Block reference instead of pointer
Mikko Rasa [Sun, 20 Dec 2009 19:41:44 +0000 (19:41 +0000)]
Change a few functions in Train to take Block reference instead of pointer
Change Train::release_reserved_blocks into a more generic release_blocks

14 years agoImprove the block reservation algorithm
Mikko Rasa [Sun, 20 Dec 2009 19:34:12 +0000 (19:34 +0000)]
Improve the block reservation algorithm

14 years agoConsider failed track or block traversal a fatal error
Mikko Rasa [Sun, 20 Dec 2009 00:30:50 +0000 (00:30 +0000)]
Consider failed track or block traversal a fatal error

14 years agoSimulate commands if no serial device is set to make turnouts work
Mikko Rasa [Fri, 18 Dec 2009 23:07:25 +0000 (23:07 +0000)]
Simulate commands if no serial device is set to make turnouts work

14 years agoMake function toggles 1px wider to have 5 of them fill the space exactly
Mikko Rasa [Fri, 18 Dec 2009 21:10:02 +0000 (21:10 +0000)]
Make function toggles 1px wider to have 5 of them fill the space exactly
Write most function names fully
Add BR 194 loco

14 years agoTake z coordinate into account when computing points on tracks
Mikko Rasa [Fri, 18 Dec 2009 06:34:30 +0000 (06:34 +0000)]
Take z coordinate into account when computing points on tracks

14 years agoInitialize Train::route to 0
Mikko Rasa [Thu, 17 Dec 2009 21:04:35 +0000 (21:04 +0000)]
Initialize Train::route to 0

14 years agoOnly signal turnout path change when the command is successfully completed
Mikko Rasa [Wed, 16 Dec 2009 23:49:24 +0000 (23:49 +0000)]
Only signal turnout path change when the command is successfully completed
Call update_speed directly from reserve_more if blocks were reserved
Do not reserve turnouts with wrong path

14 years agoReformat the block reservation loop
Mikko Rasa [Wed, 16 Dec 2009 21:20:34 +0000 (21:20 +0000)]
Reformat the block reservation loop
Don't crash if rsv_blocks is empty at the end of reserve_more

14 years agoExport routes over network
Mikko Rasa [Sun, 13 Dec 2009 18:14:52 +0000 (18:14 +0000)]
Export routes over network
Implement the reverse field in TrainSpeedPacket
Derive the TrainPanel in remote from Expander for a more compact train list
Set default size for the remote controller window
Catch exceptions caused by packets sent by a client

14 years agoSupport dual-address locomotives with extra functions on the second address
Mikko Rasa [Sun, 13 Dec 2009 16:51:04 +0000 (16:51 +0000)]
Support dual-address locomotives with extra functions on the second address

14 years agoSupport setting routes for trains
Mikko Rasa [Sun, 13 Dec 2009 16:27:21 +0000 (16:27 +0000)]
Support setting routes for trains
Fix Train::find_speed

14 years agoPrevent a crash if a layout file contains empty routes
Mikko Rasa [Sun, 13 Dec 2009 15:05:35 +0000 (15:05 +0000)]
Prevent a crash if a layout file contains empty routes
Add missing forward declaration to train.h

14 years agoChange terminology to better distinguish routes on the layout from paths across track...
Mikko Rasa [Sun, 13 Dec 2009 15:04:44 +0000 (15:04 +0000)]
Change terminology to better distinguish routes on the layout from paths across tracks and blocks

14 years agoFix valgrind warnings
Mikko Rasa [Sun, 13 Dec 2009 14:04:42 +0000 (14:04 +0000)]
Fix valgrind warnings

14 years agoAdd Dialog class to handle common elements of dialogs
Mikko Rasa [Sun, 13 Dec 2009 13:55:03 +0000 (13:55 +0000)]
Add Dialog class to handle common elements of dialogs
Implement TrainProperties in terms of Dialog
Delete dialogs automatically
Implement the edit button in TrainPanel

14 years agoHandle position estimate when reversing the direction of a train
Mikko Rasa [Sun, 13 Dec 2009 11:35:20 +0000 (11:35 +0000)]
Handle position estimate when reversing the direction of a train

14 years agoKeep track of real speed separately for each speed step
Mikko Rasa [Sun, 13 Dec 2009 01:13:03 +0000 (01:13 +0000)]
Keep track of real speed separately for each speed step
Base the slow speed on real speed instead of a fixed speed step

14 years agoBlock reservation fixes
Mikko Rasa [Sat, 12 Dec 2009 13:09:18 +0000 (13:09 +0000)]
Block reservation fixes

14 years agoAdd networking library and a remote control program
Mikko Rasa [Thu, 10 Dec 2009 20:05:34 +0000 (20:05 +0000)]
Add networking library and a remote control program

14 years agoCorrectly handle slope when snapping tracks
Mikko Rasa [Thu, 10 Dec 2009 10:26:21 +0000 (10:26 +0000)]
Correctly handle slope when snapping tracks
Render sloped tracks with rotation, not by shearing the mesh
Render a pillar under the higher endpoint of a sloped track
Hide zero slope from tooltip

14 years agoDon't leave removed tracks in routes
Mikko Rasa [Thu, 10 Dec 2009 08:03:10 +0000 (08:03 +0000)]
Don't leave removed tracks in routes

14 years agoIgnore routes in shoppinglist
Mikko Rasa [Thu, 10 Dec 2009 08:00:25 +0000 (08:00 +0000)]
Ignore routes in shoppinglist

14 years agoAdapt to a change in gltk
Mikko Rasa [Wed, 9 Dec 2009 09:53:34 +0000 (09:53 +0000)]
Adapt to a change in gltk

14 years agoConvert designer to use mspgltk for UI
Mikko Rasa [Sat, 30 May 2009 19:14:17 +0000 (19:14 +0000)]
Convert designer to use mspgltk for UI
Add a toolbar to designer (not all buttons are functional yet)
Support for defining routes for a layout

15 years agoAdd graphics for toggle widget
Mikko Rasa [Sat, 23 May 2009 13:51:47 +0000 (13:51 +0000)]
Add graphics for toggle widget
Make train panels a bit more compact
Support reverse direction for trains

15 years agoCode reformatting: add spaces around assignment operators
Mikko Rasa [Sat, 23 May 2009 07:46:58 +0000 (07:46 +0000)]
Code reformatting: add spaces around assignment operators

15 years agoCode reformatting:
Mikko Rasa [Sat, 23 May 2009 07:11:51 +0000 (07:11 +0000)]
Code reformatting:
- Remove alignment from variable and function declarations
- Reorder and group class members

15 years agoReplace one more stray load function with DataFile::load
Mikko Rasa [Sat, 23 May 2009 06:20:33 +0000 (06:20 +0000)]
Replace one more stray load function with DataFile::load

15 years agoAllow intercepting and denying turnout route and locomotive speed changes
Mikko Rasa [Fri, 22 May 2009 21:49:41 +0000 (21:49 +0000)]
Allow intercepting and denying turnout route and locomotive speed changes
Reroute train when a reserved turnout changes its route
Various minor fixes

15 years agoAdd state loading and saving to engineer
Mikko Rasa [Thu, 21 May 2009 19:52:04 +0000 (19:52 +0000)]
Add state loading and saving to engineer
Modernize all load/save code

15 years agoAttempt to estimate the exact positions of trains from measured speed data
Mikko Rasa [Thu, 21 May 2009 16:57:02 +0000 (16:57 +0000)]
Attempt to estimate the exact positions of trains from measured speed data
Improve track vertex array creation
Use Point instead of separate coordinate members for Endpoint and TrackPart

15 years agoAllow setting sensor ID for multiple tracks at once
Mikko Rasa [Tue, 19 May 2009 18:46:03 +0000 (18:46 +0000)]
Allow setting sensor ID for multiple tracks at once
Support for controlling turnouts with more than 2 routes
Snap flex-tracks last when loading a layout to get them correctly snapped
Slow down trains when there's only one free sensor block ahead
Put each turnout into its own block to avoid blocking adjacent tracks

15 years agoSupport using a mesh as a background
Mikko Rasa [Sun, 17 May 2009 11:26:52 +0000 (11:26 +0000)]
Support using a mesh as a background
Fix various input problems

15 years agoConvert designer to use mspgbase instead of sdl
Mikko Rasa [Tue, 17 Mar 2009 05:03:36 +0000 (05:03 +0000)]
Convert designer to use mspgbase instead of sdl
Add a missing file in libmarklin
Compatibility with VertexArrayBuilder change
Rename engineer.res to marklin.res for future use in designer too

15 years agoRewrite command/reply system
Mikko Rasa [Mon, 9 Jun 2008 03:27:18 +0000 (03:27 +0000)]
Rewrite command/reply system
Read lok events (but don't do anything with them yet)
Add some missing includes

15 years agoAdd Id tags and copyright notices to files
Mikko Rasa [Fri, 6 Jun 2008 12:11:49 +0000 (12:11 +0000)]
Add Id tags and copyright notices to files

15 years agoAdd locos.dat
Mikko Rasa [Fri, 6 Jun 2008 12:10:20 +0000 (12:10 +0000)]
Add locos.dat

15 years agoTrack power status
Mikko Rasa [Thu, 5 Jun 2008 11:09:09 +0000 (11:09 +0000)]
Track power status

15 years agoAdd locomotive types
Mikko Rasa [Wed, 4 Jun 2008 23:51:10 +0000 (23:51 +0000)]
Add locomotive types
Buttons for locomotive functions
Various enhancements around the code
UI graphics for dropdown

15 years agoMeasure and display train speeds
Mikko Rasa [Mon, 2 Jun 2008 12:20:45 +0000 (12:20 +0000)]
Measure and display train speeds

15 years agoAdd train status display
Mikko Rasa [Sun, 1 Jun 2008 18:22:32 +0000 (18:22 +0000)]
Add train status display
Button for re-placing trains
Bugfixes for train tracking
Better handling of block coloring

15 years agoStyle fixes, including:
Mikko Rasa [Sun, 1 Jun 2008 08:49:18 +0000 (08:49 +0000)]
Style fixes, including:
- Reorder members in class declarations
- Get rid of rest of the container typedefs
- Convert typecasts to C++ style

15 years agoConvert engineer to use mspgbase instead of SDL
Mikko Rasa [Sat, 31 May 2008 10:59:14 +0000 (10:59 +0000)]
Convert engineer to use mspgbase instead of SDL
Trains periodically try to continue if blocked by another train
Improve engineer GUI layout
Some bugfixes and tweaks

15 years agoMajor code refactoring:
Mikko Rasa [Fri, 30 May 2008 09:54:26 +0000 (09:54 +0000)]
Major code refactoring:
- Remove container typedefs
- Separate TrackType from Track
- Use indices instead of pointers for endpoints
- Make certain functions return references and throw on error
Compatibility fixes with msp libraries

16 years agoMore code for TrainProperties
Mikko Rasa [Wed, 18 Jul 2007 09:28:11 +0000 (09:28 +0000)]
More code for TrainProperties

16 years agoAdd train properties dialog (unfinished)
Mikko Rasa [Tue, 17 Jul 2007 08:33:11 +0000 (08:33 +0000)]
Add train properties dialog (unfinished)
Remove some unnecessary files

16 years agoAdd Track::get_endpoint_position to avoid duplicating calculations
Mikko Rasa [Sun, 15 Jul 2007 10:59:20 +0000 (10:59 +0000)]
Add Track::get_endpoint_position to avoid duplicating calculations
Fix Block::traverse so it won't hang
Fix memory leaks reported by valgrind
Add signal_speed_changed for locomotive
Bugfixes for block reservation of trains
Color blocks that are occupied by a train
Remove some unnecessary stuff from Engineer
Add simulation mode for sensors
Finish train placing
Add speed display to TrainPanel

16 years agoRename Section to Block for a closer match with real railway terminology
Mikko Rasa [Sun, 15 Jul 2007 10:47:23 +0000 (10:47 +0000)]
Rename Section to Block for a closer match with real railway terminology

16 years agoInitial revision
Mikko Rasa [Tue, 10 Jul 2007 19:20:20 +0000 (19:20 +0000)]
Initial revision

16 years agoCreate standard directories
Mikko Rasa [Tue, 10 Jul 2007 18:45:57 +0000 (18:45 +0000)]
Create standard directories