Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

street-segment wip #912

Merged
merged 133 commits into from
Dec 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
5e433b0
normalize markings mixins
kfarr Jul 11, 2024
c7908db
typo
kfarr Jul 11, 2024
e999ccc
add striping to panel
kfarr Jul 11, 2024
025d95f
normalize stencils
kfarr Jul 12, 2024
6496583
add yellow versions
kfarr Jul 12, 2024
c158f7e
remove reference to markings mixin
kfarr Jul 12, 2024
3f4bc26
Merge branch 'main' into normalize-mixins
kfarr Sep 11, 2024
98e85a5
add skipcache: true
kfarr Sep 11, 2024
76c1df9
psuedo code street-segment
kfarr Nov 4, 2024
5b398c3
adding some more properties
kfarr Nov 4, 2024
550fc15
barely working wip
kfarr Nov 4, 2024
b5bd40a
mvp allow changing surface
kfarr Nov 5, 2024
415cdb9
next wip cut
kfarr Nov 5, 2024
00e12a8
next cut of working street-segment component
kfarr Nov 5, 2024
8349516
specify color from streetmix-parser
kfarr Nov 6, 2024
efe9ed1
sidewalks working as expected
kfarr Nov 6, 2024
e458ea8
Merge branch 'main' into street-sgement
kfarr Nov 6, 2024
221f283
add hatched base, remove color from presets
kfarr Nov 6, 2024
f9ac436
color sets correctly from parsers
kfarr Nov 6, 2024
0248c51
add street-segment component to segment parent, fix surface elevation
kfarr Nov 6, 2024
47c1ddb
kind of working colors
kfarr Nov 7, 2024
8e64775
remove preset logic from component
kfarr Nov 8, 2024
62b482b
segment box is below
kfarr Nov 9, 2024
f3d2209
remove unused function
kfarr Nov 9, 2024
54aad11
Merge branch 'main' into street-sgement
kfarr Nov 12, 2024
2079e28
fix elevation for separators and cloned objects
kfarr Nov 12, 2024
68db024
add solid and none support
kfarr Nov 17, 2024
0d34b74
Merge branch 'main' into street-sgement
kfarr Nov 18, 2024
f98e116
street-generated-fixed basic working
kfarr Nov 18, 2024
93de881
benches, bikeracks, barricades, and bollards
kfarr Nov 18, 2024
542cee0
minimum spacing, add clone label
kfarr Nov 18, 2024
8c2a4af
migrate lamps
kfarr Nov 18, 2024
8afd69c
seawall and fence clones
kfarr Nov 18, 2024
5dd1f50
bike share, bus stop
kfarr Nov 19, 2024
1baf6c9
Merge branch 'main' into street-sgement
kfarr Nov 19, 2024
b9697bc
Merge branch 'main' into street-sgement
kfarr Nov 20, 2024
9161c92
add street-generated-random
kfarr Nov 20, 2024
b3daae8
use generated-random for bus
kfarr Nov 20, 2024
4ae767a
move lrv and trolley
kfarr Nov 20, 2024
9f51879
support brt station
kfarr Nov 22, 2024
455ea8c
outdoor dining
kfarr Nov 22, 2024
a35a209
flex zone
kfarr Nov 22, 2024
8e98415
parklet
kfarr Nov 22, 2024
d0c09a1
food truck / trailer
kfarr Nov 22, 2024
550eb8f
randomly place an array of models
kfarr Nov 22, 2024
edda718
random vehicles in drive-lane and turn-lane
kfarr Nov 22, 2024
99e0b37
support showVehicles conditional
kfarr Nov 22, 2024
2f8879b
bike and scooter lane objects
kfarr Nov 22, 2024
e632f51
magic carpet
kfarr Nov 22, 2024
30b9b40
Merge branch 'street-sgement' into normalize-mixins
kfarr Nov 22, 2024
1817f03
support naive stencils
kfarr Nov 22, 2024
ebebd2a
Merge branch 'street-sgement' into normalize-mixins
kfarr Nov 22, 2024
fefd8aa
Merge pull request #699 from 3DStreet/normalize-mixins
kfarr Nov 22, 2024
d96a7d7
new stencil component
kfarr Nov 24, 2024
14ed052
committing wip street label to return to this soon
kfarr Nov 25, 2024
a9f5180
remove canvas-plane error
kfarr Nov 26, 2024
2270bf0
bike arrow stencil
kfarr Nov 26, 2024
b1681da
turn lanes including shared turn
kfarr Nov 26, 2024
579b750
barely working parking variants
kfarr Nov 26, 2024
6a6a580
no vehicles in shared center turn lane
kfarr Nov 26, 2024
d1a537d
lower stencil y
kfarr Nov 26, 2024
d2febe6
support multiple stencils
kfarr Nov 27, 2024
591e3d8
support sharrow rotation
kfarr Nov 27, 2024
47d4039
basic striping working
kfarr Nov 27, 2024
40e79f5
new striping logic
kfarr Nov 27, 2024
56a27b1
remove animation
kfarr Nov 28, 2024
5fd4f0d
color comment fix
kfarr Nov 28, 2024
8da1ccb
convert pedestrians
kfarr Nov 28, 2024
53bb7f3
fix brt-lane case
kfarr Dec 1, 2024
46b387c
create rails
kfarr Dec 2, 2024
f29ee5b
add wayfinding
kfarr Dec 2, 2024
2b2be80
fix right vehicle parking orientation
kfarr Dec 2, 2024
c60d62f
consolidate -fixed and -single into street-generated-clones
kfarr Dec 3, 2024
3426494
use street-generated-clones for -random
kfarr Dec 3, 2024
faa4d00
Merge branch 'main' into street-sgement
kfarr Dec 3, 2024
0cf4874
Merge branch 'main' into street-sgement
kfarr Dec 3, 2024
103a0b0
Merge branch 'main' into street-sgement
kfarr Dec 3, 2024
555b340
add `remove` lifecycle method
kfarr Dec 4, 2024
062bf48
move up defining STREET global
kfarr Dec 4, 2024
5582881
first cut of editable street segments
kfarr Dec 4, 2024
d707465
add direction
kfarr Dec 4, 2024
3dbae43
inbound / outbound v1
kfarr Dec 4, 2024
7134df4
revert inspector hack
kfarr Dec 4, 2024
92d1473
move type definitions to street-segment
kfarr Dec 4, 2024
b64141e
direction for clones and stencils
kfarr Dec 4, 2024
5941e1a
support directions for stencils and clones
kfarr Dec 4, 2024
3033504
add horizontal scrolling
kfarr Dec 4, 2024
eb21294
fix parking stripe orientation
kfarr Dec 4, 2024
a99f353
allow direction and facing together
kfarr Dec 4, 2024
24614c5
add more stencil types
kfarr Dec 5, 2024
a2213f7
improve street-segment side panel
kfarr Dec 5, 2024
327c101
fix collapsed sidepanel formatting
kfarr Dec 5, 2024
e4bce90
more segment sidebar options
kfarr Dec 5, 2024
2049ca3
restore old streetmix-parsers
kfarr Dec 6, 2024
4e5eb81
add managed street layer
kfarr Dec 6, 2024
1b427a0
Merge pull request #953 from 3DStreet/sidepanel-for-street-segment
kfarr Dec 6, 2024
82996b1
manage segment x positions with justification
kfarr Dec 8, 2024
ba36b77
fix justified saving behavior
kfarr Dec 8, 2024
eb35d06
update length of children from managed-street
kfarr Dec 8, 2024
22d7fc8
managed street custom sidebar
kfarr Dec 8, 2024
044fe06
trigger reflow when segment width changed
kfarr Dec 8, 2024
4c18390
self not needed
kfarr Dec 11, 2024
3378a6a
no log
kfarr Dec 11, 2024
6359eab
better array clearing
kfarr Dec 11, 2024
66b5ef4
update length when changed
kfarr Dec 11, 2024
ce004b0
use remove() instead of duplicate code
kfarr Dec 11, 2024
b615935
small fixes
kfarr Dec 11, 2024
0220b81
adding more array clearing
kfarr Dec 11, 2024
bdcc04f
simplify icon code
kfarr Dec 11, 2024
fcb5dcb
update z as well
kfarr Dec 11, 2024
b29389c
ensure autocreated rails aren't saved
kfarr Dec 11, 2024
ceff9f0
check node exists before remove
kfarr Dec 11, 2024
e4a0cc2
fix atlas-uv refresh hack
kfarr Dec 11, 2024
d2ac2b8
simplify managedEntities refresh
kfarr Dec 11, 2024
f815569
remove existing segments upon synchronize
kfarr Dec 11, 2024
1a60d87
update sidebar after managed street load
kfarr Dec 11, 2024
a5fa295
move managed street to addlayer street group
kfarr Dec 11, 2024
1b54b1c
Merge branch 'main' into street-sgement
kfarr Dec 11, 2024
f37c00b
use || operator, not |
vincentfretin Dec 12, 2024
bace2cb
update dirtBox width and depth when changing managed-street width and…
vincentfretin Dec 12, 2024
6e8f820
use const/let instead of var in new code
vincentfretin Dec 12, 2024
7ede26d
register loaded listener with once: true
vincentfretin Dec 12, 2024
a932813
emit entityselect even if entity is null so the React UI updates prop…
vincentfretin Dec 12, 2024
98eccf4
use fetch instead of xmlhttprequest
kfarr Dec 12, 2024
2ad8d87
Merge branch 'main' into street-sgement
kfarr Dec 15, 2024
4f166e3
merge managed street sidebar changes
kfarr Dec 15, 2024
c9b4908
updates to street segment logic
kfarr Dec 15, 2024
a7b34a6
do append child earlier
kfarr Dec 15, 2024
997ac23
strings to numbers
kfarr Dec 15, 2024
6ab9286
use dot syntax
kfarr Dec 15, 2024
ec06a42
revert using keys(TYPES) for oneOf type list
kfarr Dec 15, 2024
e0763fc
use object instead of template literal for components
kfarr Dec 15, 2024
4d64032
fix segment resize logic
kfarr Dec 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/aframe-streetmix-parsers.js
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ function getBikeLaneMixin(variant) {
}

function getBusLaneMixin(variant) {
if ((variant === 'colored') | (variant === 'red')) {
if (variant === 'colored' || variant === 'red') {
return 'surface-red bus-lane';
}
if (variant === 'blue') {
Expand Down
89 changes: 49 additions & 40 deletions src/assets.js

Large diffs are not rendered by default.

Loading
Loading