separete lane connections for track/road vehicles. #1550

kianzarrin · 2022-04-26T23:51:14Z

fixes #354

hotkeys and icons from [EPIC] UI design of Lane connector tool for new features. #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 set dead ends for lanes using lane connector #1213.

Bonus:

fixes TMPE connections is not restablished after removing lane connection #1198 : update connections when new connection is made.
update direction arrow texture (less aliasing).

TMPE.zip

pictures are in the comments.

Tests:

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

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

backward compatibility test:

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.
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:

on mixed lanes do not allow trams to make acute lane connections.
hints

don't show track node marker when acute

fixed mixed acute only.

polished overlay code: use `DrawShape` to draw everything.

kianzarrin · 2022-05-08T12:21:44Z

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 · 2022-05-08T15:52:07Z

Looks good!

kianzarrin · 2022-05-11T23:54:17Z

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:

… into 354-phase3

- [Meta] This release adds a new language, updates translations, and improves lane routing - [New] Veitnamese translation #1551 (DucAnhLam) - [Updated] Separate road and track lane routing #1550 #1546 #1545 #354 (kianzarrin) - [Updated] Translations for multiple languages #1551 #1344 (Nguyễn Tài Đức, OldEj, AduitSSH, Chamëleon, 문주원, krzychu124, shg166, John Lok Ho, Márcio Saeger, DucAnhLam, DNSE, Arne Peirs, Neoone, Fatih YILDIRIM, Zeldslayer, GiorgioHerbie, krzychu124)

krzychu124 · 2022-06-06T21:02:41Z

Sync with master :)

Elesbaan70 · 2022-06-09T01:36:24Z

TLM/TLM/State/Configuration.cs

@@ -186,12 +187,15 @@ public class LaneConnection : ISerializable {

            public bool sourceStartNode;

-            public bool Legacy => SerializableDataExtension.Version < 2;
+            public LaneEndTransitionGroup group = LaneEndTransitionGroup.Vehicle;


I am concerned about continuing to introduce breaking file format changes. Can this all wait until the new persistence code is merged?

This PR has waited for a month already. I don't think we need to wait more. conflicts will accumulate over time.
Is it breaking anything?

it does not break anything for me. I made the connections bellow with TMPE from this PR then saved and loaded the game using stable TMPE:

If we don't want to merge it with master, we should consider merging a feature branch instead of stopping this PR. but it is forward/backward compatible so I don't think this is good to go to master.

~~It's exactly the same situation as last time. If you save game with this build you won't be able to load it using current master or WS stable~~

I think it doesn't matter because the change in any of serializable configuration classes will make the savegame incompatible with previous version of deserializer (current master or any workshop version)

You sure about that? I encountered the problem specifically in relation to adding a new type, which is still a pretty drastic limitation when doing work of any significance, since the whole system is type-based. #1559 explains it as an issue with strongly typed serialization.

ok, did not throw exception or anything, loaded something, looks good. Ignore previous comment

loaded something

it is both forward/backward compatible.
if you make different lane connections on mixed/car track lanes -> save -> load with earlier version of TMPE, then car/track lane connections will merge.

yeah, noticed that, looks ok.

chameleon-tbn

lgtm

kianzarrin added 14 commits April 24, 2022 23:31

move lane connection manager to sub folder.

7fb2784

introduce sub manager.

0967228

fix API typo

9df2ccf

fixed GetImplementation

fe5e3c1

polish

fd6799d

create Road/Track sub managers

c6a0ec1

save game data

b87b3da

lane connection record

eb87b6d

misc: use Road or Track sub manager

1f49fe7

improve transition group support for lane connection sub managers.

0cb9fa7

bugfix + arrow node markers

a97dfa9

bugfix: bidirectional lane curve.

65cbcca

bugfix: draw all lane connections on other nodes.

68654b1

eef830e

kianzarrin added UI User interface updates DO NOT MERGE YET Don't merge this PR, even if approved, until further notice LANE ROUTING Feature: Lane arrows / connectors labels Apr 26, 2022

kianzarrin added this to the 11.6.5.3 milestone Apr 26, 2022

kianzarrin requested review from kvakvs, DaEgi01, krzychu124 and chameleon-tbn April 26, 2022 23:51

kianzarrin self-assigned this Apr 26, 2022

b11a7bd

kianzarrin marked this pull request as ready for review April 27, 2022 00:02

kianzarrin added 3 commits April 27, 2022 05:17

don't connect track when acute

3489341

don't show track node marker when acute

added hint/

a15dfe2

fixed mixed acute only.

update lane arrows only on car lanes.

b99bdd7

kianzarrin marked this pull request as draft April 27, 2022 08:33

kianzarrin linked an issue Apr 27, 2022 that may be closed by this pull request

Lane connector: Separate road vs. tracked connections #354

Closed

4 tasks

kianzarrin added 2 commits May 8, 2022 15:19

use square shape without texture.

552cbc4

polished overlay code: use `DrawShape` to draw everything.

Merge branch 'master' into 354-phase3

ae20d51

kianzarrin added 3 commits May 12, 2022 02:56

do not allow connections in wrong direction.

1367037

Merge branch '354-phase3' of https://github.com/CitiesSkylinesMods/TMPE…

5d08065

… into 354-phase3

Merge branch 'master' into 354-phase3

1600a63

kianzarrin requested a review from Elesbaan70 May 11, 2022 23:58

kianzarrin added 5 commits May 12, 2022 02:59

cb66250

regression fix: connect to avoid forward station track.

fb13a0f

fix regression: connect car lanes to bus lanes.

1c4b972

fixes 1198: update all routings when creating new connection.

966fa9b

direction arrow texture does not have aliasing.

cc2e53b

This was referenced May 22, 2022

What's New - TM:PE 11.6.6.0 #1575

Merged

TMPE connections is not restablished after removing lane connection #1198

Closed

kianzarrin added 4 commits May 29, 2022 14:49

Merge branch 'a' into 354-phase3

1c9a4ee

merge ext lane manager

966a718

merge API update

819a08f

ed19467

kianzarrin added 2 commits June 7, 2022 00:21

Merge branch 'master' into 354-phase3

cdf17d2

Merge branch 'master' into 354-phase3

e70117f

Elesbaan70 reviewed Jun 9, 2022

View reviewed changes

Merge branch 'master' into 354-phase3

bdb3299

krzychu124 approved these changes Jun 11, 2022

View reviewed changes

chameleon-tbn approved these changes Jun 11, 2022

View reviewed changes

kianzarrin merged commit f709191 into master Jun 12, 2022

kianzarrin deleted the 354-phase3 branch June 12, 2022 23:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

separete lane connections for track/road vehicles. #1550

separete lane connections for track/road vehicles. #1550

kianzarrin commented Apr 26, 2022 •

edited

Loading

kianzarrin commented May 8, 2022 •

edited

Loading

originalfoo commented May 8, 2022

kianzarrin commented May 11, 2022

krzychu124 commented Jun 6, 2022

Elesbaan70 Jun 9, 2022

kianzarrin Jun 9, 2022

kianzarrin Jun 9, 2022

kianzarrin Jun 9, 2022 •

edited

Loading

krzychu124 Jun 9, 2022 •

edited

Loading

krzychu124 Jun 9, 2022 •

edited

Loading

Elesbaan70 Jun 9, 2022

krzychu124 Jun 9, 2022

kianzarrin Jun 11, 2022

krzychu124 Jun 11, 2022

chameleon-tbn left a comment

separete lane connections for track/road vehicles. #1550

separete lane connections for track/road vehicles. #1550

Conversation

kianzarrin commented Apr 26, 2022 • edited Loading

kianzarrin commented May 8, 2022 • edited Loading

originalfoo commented May 8, 2022

kianzarrin commented May 11, 2022

krzychu124 commented Jun 6, 2022

Elesbaan70 Jun 9, 2022

Choose a reason for hiding this comment

kianzarrin Jun 9, 2022

Choose a reason for hiding this comment

kianzarrin Jun 9, 2022

Choose a reason for hiding this comment

kianzarrin Jun 9, 2022 • edited Loading

Choose a reason for hiding this comment

krzychu124 Jun 9, 2022 • edited Loading

Choose a reason for hiding this comment

krzychu124 Jun 9, 2022 • edited Loading

Choose a reason for hiding this comment

Elesbaan70 Jun 9, 2022

Choose a reason for hiding this comment

krzychu124 Jun 9, 2022

Choose a reason for hiding this comment

kianzarrin Jun 11, 2022

Choose a reason for hiding this comment

krzychu124 Jun 11, 2022

Choose a reason for hiding this comment

chameleon-tbn left a comment

Choose a reason for hiding this comment

kianzarrin commented Apr 26, 2022 •

edited

Loading

kianzarrin commented May 8, 2022 •

edited

Loading

kianzarrin Jun 9, 2022 •

edited

Loading

krzychu124 Jun 9, 2022 •

edited

Loading

krzychu124 Jun 9, 2022 •

edited

Loading