Add crossover rendering #1739
Add crossover rendering #1739
Conversation
| @@ -256,6 +260,13 @@ def load_from_tile | |||
| @end_x = edge_x_pos(@end_edge, 87) | |||
| @end_y = edge_y_pos(@end_edge, 87) | |||
| lanes = @path.lanes | |||
|
|
|||
| if @tile.crossover? && @path.straight? | |||
| @crossover_dash = '1 55 63 56' | |||
There was a problem hiding this comment.
these strings should be constants
| @@ -411,7 +428,19 @@ def render_part | |||
| 'stroke-dasharray': @dash, | |||
| ) if @terminal | |||
|
|
|||
| h(:path, props) | |||
| children = [] | |||
| children = [] | ||
| children.append(h(:path, props)) | ||
| if @crossover_dash | ||
| intersect_props = props.dup |
There was a problem hiding this comment.
does this dup actually do what you want? dup is usually just a shallow copy, so nested dictionaries would still be mutated?
There was a problem hiding this comment.
It seems to work, but I can change to a a deep copy.
There was a problem hiding this comment.
Actually I don't need to do either. It seems each call of h(:path, props) is essentially a call by value of the properties, so I'm free to change props between calls.
lib/engine/part/path.rb
Outdated
| end | ||
|
|
||
| def terminal? | ||
| @_terminal ||= !!@terminal | ||
| return @_terminal if defined?(@_terminal) |
There was a problem hiding this comment.
there's no reason to cache this, it's not expensive at all just do
def terminal?
!!@Terminal
lib/engine/tile.rb
Outdated
| def compute_crossover | ||
| edge_paths = Hash.new { |h, k| h[k] = [] } | ||
| @paths.each do |p| | ||
| edge_paths[p.a.num].append(p) if p.a.edge? |
lib/engine/tile.rb
Outdated
| @paths.each do |p| | ||
| edge_paths[p.a.num].append(p) if p.a.edge? | ||
| edge_paths[p.b.num].append(p) if p.b.edge? | ||
| next unless p.nodes.size == 1 |
lib/engine/tile.rb
Outdated
| edge_paths[p.b.num].append(p) if p.b.edge? | ||
| next unless p.nodes.size == 1 | ||
|
|
||
| ct_edge = preferred_city_town_edges[p.nodes.first] |
There was a problem hiding this comment.
what's the point of these 3 lines? they don't do anything
There was a problem hiding this comment.
It calls those methods in path with the proper city/town thus causing them to cache. I don't want to call preferred_city_town_edges in Path.
There was a problem hiding this comment.
what's the point of caching them here? why don't you just do it lazily?
There was a problem hiding this comment.
ohhhhh, wait what, you rely on the order for caching? that's a really dangerous pattern. the cache should take into consideration arguments
There was a problem hiding this comment.
Revamped this to not use arguments at all and to avoid this entire problem.
lib/engine/tile.rb
Outdated
| end | ||
|
|
||
| @paths.each do |p| | ||
| next if p.nodes.size > 2 |
There was a problem hiding this comment.
how can a path have more than two nodes?
There was a problem hiding this comment.
Damn. Should be 1.
Fixes #513
Also fixed boolean calls in path.rb and one random tile.
New rendering:
