separete lane connections for track/road vehicles.

[kianzarrin]

fixes #354

• hotkeys and icons from #1479
• trolleybuses use same connections as cars.
• used Road/Track sub managers to store lane connections.
• all other data structures need to use separate arrays to store road/track connections.
• lane connection manager does not allow making unsupported lane connection of the wrong lane/vehicle type. this helps with backward compatibility too. but it does allow making backward connections when not allowed for the sake of backward compatibility on train stations. this should change in #1213.

Bonus:

• fixes #1198 : update connections when new connection is made.
• update direction arrow texture (less aliasing).

TMPE.zip

pictures are in the comments.

Tests:

• [x] car only test: always in car mode. holding alt/shift does not change mode
• [x] track only test: always in track mode. holding alt.shift does not change mode
• [x] other node test: regardless of whether or not current node is car-only or track-only none-selected nodes show all car+track connections. if alt is held then they only show track connections.
• [x] tram road test: holding alt make tram roads select-able. otherwise only car lanes are select-able.
• [x] mixed lane mode: normally you see circle and can make car connection. holding alt shows triangle and can make track connection. holding shift can make both connections.
• [x] bidirectional lane: node marker is diamond and you can make forward/backward connection. lane curves have arrows on them indicating their direction.
• [x] acute+mixed test: hold shift to select mixed lanes. acute targets should show circle, and clicking them should only make car lane connection
• [x] acute only mixed lane test: connect a road with mixed tram lane to an intersection with no other tram rods. expected: no target lane connection is highlighted. shift clicking will put in car mode.
• [x] source to target test: make sure you can only make lane connection in the right direction.
• [x] hintbox text: go through different state and check if hintbox is OK. make sure ALT/SHIFT modifiers are only there when selecting car+tram node.
• [x] big roundabout test: make sure roundabout connector makes stay in lane is applied on entry and inside of the roundabout when there is a node too close to the roundabout and when there are nodes inside roundabout. related #705
• [x] mixed lane arrow test: connect trams only on a mixed lane and make sure you can still modify lane arrows. make sure that you can't modify lane arrows if you connect cars only.
• [x] separate turning lane: in above scenario make sure separate turning lanes is blocked iff there is a car connection.

mixed connections tests: connect car and track differently on a mixed car+tram lane and:

• [x] mixed lane routing test: verify the are routed differently.
• [x] refresh test: exit and reenter tool, select the node and make sure you can see all connections.
• [x] lane arrow test: lane arrows are influenced only by car connection.
• [x] mixed lane persistency test: make sure they connections persist when save/load game
• [x] mixed lane record test: make sure connections can be copied by move it.

backward compatibility test:

• [x] save game backward compatibility test: connect mixed lanes in old TMPE and saved it. make sure they get both car/track connection when loaded with this version.
• [x] lane record backward compatibility test: connect mixed lanes in old TMPE and export it. make sure they get both car/track connection when imported with this version.

TODO:

• [X] on mixed lanes do not allow trams to make acute lane connections.
• [x] hints

[kianzarrin]

[originalfoo]

Suggestion: Concise tooltips when mouse hovers over one of the shapes to help user understand what the shape represents.

[kvakvs]

Looks nice Make sure that the textures you draw have enough resolution to not be more blurry than the lane sausages and the small circles, so that it looks nice together. Currently on screenshots the triangles are more blurry and standing out.

[originalfoo]

Currently on screenshots the triangles are more blurry and standing out.

To me it looks like the triangles are fine, but the black border around them is thinner than the black border around the circles, so it's maybe just the black border that's looking blurry?

[kianzarrin]

Currently on screenshots the triangles are more blurry and standing out.

Both triangle and the diamond use the same texture: 256x256 white (the quad gives it shape). So I don't think its a resolution issue. I don't notice any blur. maybe that is just how the overlay shader works?

but the black border around them is thinner than the black border around the circles

You are right. I expand them.

Concise tooltips when mouse hovers over one of the shapes to help user understand what the shape represents.

I could put legend in the tooltips. but I think that is too much info. I think when user will figure out what the shapes mean when he uses them in double quick time

[kianzarrin]

@kvakvs @krzychu124 @aubergine10 I was wondering maybe I can draw squares for uni-directional tracks and diamonds for bi-directional tracks. triangles are not easy to work with:

• they are small (half the size of a square)
• they don't cover the lane end and lane curve very well (unless if I shift them but that make the code looks hackish.
• their shadow needs re-centering (triangles are asymmetrical.
• they look too much like the direction arrow of the lane curve:

What shape do I use for mixed lanes? Currently i just use the same shape as tracks.

[kianzarrin]

Enlarged triangle outline

EDIT: used texture-less triangle to draw the black outline:

• pro: it will not cover the lane curve (just like the outline of the circles)
• con: it has smooth edges.

[kvakvs]

I think you do not need special shape for single/bidirectional lane ends, one shape is fine. Hell even circle is fine. A shape shows the traffic source, so shape on both ends of a junction means traffic comes from both directions.

Since you're using a PNG file it should make no difference in your code, whatever shape you draw in photoshop, even a 🍆 will work just fine, so triangles will work too. But the black outline is still very blurry.

[kianzarrin]

@kvakvs Since you're using a PNG file it should make no difference in your code, whatever shape you draw in photoshop, even a 🍆 will work just fine, so triangles will work too. But the black outline is still very blurry.

1- Centering stuff does matter. 2- I am using square. because triangle will look ugly:

[kianzarrin]

I ditched triangle and am using square now. Triangle looks a bit ugly and is hard to write the code.

Also the diamond is no longer filled:

[originalfoo]

Looks good!

[kianzarrin]

about backward compatibility at train stations: In TMPE stable one lane connection like bellow is enough to make trains stay in lane. The same is true with TMPE in this PR:

This makes backward compatibility easy. There is no need to keep connections that from target to source when loading legacy game.

Removing connections in the wrong direction also solves this issue that happens when you remove lane connections that was made using legacy TMPE:

[krzychu124]

Sync with master :)