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

Space-time shapes #819

Merged
merged 119 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
57d5123
v1
valentinMachado Sep 5, 2023
73c870e
found bb bug
valentinMachado Sep 5, 2023
ef3fffe
TODO
valentinMachado Sep 5, 2023
6a9e586
Setup Linked list
CorentinGaut Sep 6, 2023
1d984f6
Initilize linkedlist
CorentinGaut Sep 6, 2023
f27e32d
Update height with bb
CorentinGaut Sep 6, 2023
373311d
Bug, no demolition or creation transactions
CorentinGaut Sep 11, 2023
31f878b
Change opacity
CorentinGaut Sep 12, 2023
1d5a84d
LinkedList without class
CorentinGaut Sep 13, 2023
74f4605
Good result
CorentinGaut Sep 13, 2023
bf85529
First result of duplication geometry
CorentinGaut Sep 14, 2023
54aeac8
Better duplication but wrong elevation
CorentinGaut Sep 15, 2023
02f2632
Good result but some bugs with creation
CorentinGaut Sep 26, 2023
2c885f7
Add plane + Offet Y
CorentinGaut Sep 26, 2023
a6632b8
Rebase 4.0.0
CorentinGaut Sep 27, 2023
8121034
Change level position with transform matrix
CorentinGaut Oct 11, 2023
cb1168d
Circle representation
CorentinGaut Oct 17, 2023
f9f583b
BB + Plane
CorentinGaut Oct 18, 2023
f730d4d
Add animation frame
CorentinGaut Oct 23, 2023
1846990
Fix bug
CorentinGaut Oct 23, 2023
d356968
Add button to select view
CorentinGaut Oct 23, 2023
4066791
Button working
CorentinGaut Oct 24, 2023
14e5625
Fix wrong index
CorentinGaut Oct 24, 2023
982a2e8
Finaly good rotation
CorentinGaut Oct 26, 2023
2fa9686
Rotate tiles
CorentinGaut Nov 6, 2023
3d565b9
Better rotation and other data
CorentinGaut Nov 7, 2023
c072db7
Try to have a better rotation
CorentinGaut Nov 7, 2023
0cdf416
Not working very well
CorentinGaut Nov 8, 2023
0f2fed7
Create archi
CorentinGaut Nov 13, 2023
91e7286
Finally a good result
CorentinGaut Nov 14, 2023
b819c81
Refacto
CorentinGaut Nov 20, 2023
2f95b98
Fix rotation and change Rayon of circle
CorentinGaut Nov 21, 2023
ce3b802
Sprite creation
CorentinGaut Nov 21, 2023
cdb9537
Sprite follow rotation + offset on y
CorentinGaut Nov 21, 2023
9daa54a
Add label
CorentinGaut Nov 22, 2023
c21b326
Better label
CorentinGaut Nov 24, 2023
36ab51c
Setup with temporal layers
CorentinGaut Nov 28, 2023
e80479f
Update with temporal layers
CorentinGaut Nov 30, 2023
8a37cdf
Circle update with plan
CorentinGaut Dec 7, 2023
50e63d2
Fix bug
CorentinGaut Dec 12, 2023
a4e511f
Cleaner way to integrate 3DTiles temporal
CorentinGaut Dec 12, 2023
3b1427f
Clean code
CorentinGaut Dec 12, 2023
d652af5
First result of diff
CorentinGaut Dec 12, 2023
87cfd76
First curve initiation
CorentinGaut Dec 13, 2023
3fe9d0c
Testing linked transactions
CorentinGaut Dec 14, 2023
fa445f3
Circle better rotatation
CorentinGaut Dec 19, 2023
3e45326
Need some clean but better implementaion
CorentinGaut Dec 19, 2023
338350a
Good result, always bug with transparent 3dTiles
CorentinGaut Dec 20, 2023
0b228d0
Better UI + Height parameters but still the same bug
CorentinGaut Dec 20, 2023
d80e02a
rebase(ud-viz-4.1.0)
mathieuLivebardon Mar 20, 2024
a715734
feat(extensions_3d_tiles+temporal): Space Time Cube fix + refactov1
mathieuLivebardon Mar 26, 2024
ea267ce
update(extensions_3d_tiles_temporal):wip rotation
mathieuLivebardon Mar 26, 2024
6aeaf6d
update(extensions_3d_tiles_temporal):SpaceTimeCube fix rotation with …
mathieuLivebardon Mar 28, 2024
1940865
update(extensions_3d_tiles_temporal):SpaceTimeCube fix rotation with …
mathieuLivebardon Mar 28, 2024
7e11721
update(extensions_3d_tiles_temporal):fix position labels + fix update…
mathieuLivebardon Mar 29, 2024
764bfde
update(extensions_3d_tiles_temporal):examples can't change parameters…
mathieuLivebardon Mar 29, 2024
d7485f8
update(extensions_3d_tiles_temporal):STC displayVersionsCircle() avoi…
mathieuLivebardon Mar 29, 2024
dc5cbc9
update(extensions_3d_tiles_temporal):STC some comments WIP
mathieuLivebardon Mar 29, 2024
6842543
update(extensions_3d_tiles_temporal):STC some comments WIP
mathieuLivebardon Mar 29, 2024
0ce967f
feat(extensions_3d_tiles_temporal): StcShape
mathieuLivebardon Apr 3, 2024
b25c545
feat(extensions_3d_tiles_temporal): display versions
LorenzoMarnat Apr 3, 2024
764aa03
feat(utils_browser): THREE util method to create sprites from string
LorenzoMarnat Apr 3, 2024
fdc62cc
feat(extensions_3d_tiles_temporal): rotate STSCircle versions on update
LorenzoMarnat Apr 3, 2024
44f90b3
doc(util_browser): jsdoc function createSpriteFromString
mathieuLivebardon Apr 3, 2024
4ff66ea
update(extensions_3d_tiles_temporal): dispose function in ST Shape
mathieuLivebardon Apr 8, 2024
36eaac1
update(extensions_3d_tiles_temporal): select options
mathieuLivebardon Apr 8, 2024
8c0bc21
update(extensions_3d_tiles_temporal): fix dispose display process ; f…
mathieuLivebardon Apr 9, 2024
0cb3331
update(extensions_3d_tiles_temporal):new class STLayer
mathieuLivebardon Apr 9, 2024
ac47c9a
update(extensions_3d_tiles_temporal): hello promises ON_TILE_CONTENT_…
mathieuLivebardon Apr 9, 2024
db583c4
update(extensions_3d_tiles_temporal): STSVector wip
mathieuLivebardon Apr 10, 2024
52d1e03
feat(e3dtl): vector shape & fix createSprite import
LorenzoMarnat Apr 10, 2024
fd6c89b
feat(e3dtl): delta input in example
LorenzoMarnat Apr 10, 2024
16869eb
fix(e3dtl): hide original temporal 3dtiles
LorenzoMarnat Apr 10, 2024
05a6787
fix(e3dtl): display all versions in circle
LorenzoMarnat Apr 10, 2024
a5eb013
update(e3dtt):fix position in circle
mathieuLivebardon Apr 10, 2024
4a05926
feat(e3dtl): helix shape
LorenzoMarnat Apr 11, 2024
278952a
fix(e3dtl): delete unused helix's height
LorenzoMarnat Apr 11, 2024
3383ca1
feat(e3dtl): add line in vector
LorenzoMarnat Apr 11, 2024
1eda357
update(e3dtl): no helix rotation & fix its position
LorenzoMarnat Apr 12, 2024
187733e
fix(e3dtl): correct name field in ColorLayer
LorenzoMarnat Apr 12, 2024
50db021
fix(e3dtl): accurate root position
LorenzoMarnat Apr 12, 2024
4161acc
update(e3dtl): no additional rotation in helix
LorenzoMarnat Apr 15, 2024
bdaab70
fix(E3dtt): fix remove framequester
mathieuLivebardon Apr 15, 2024
71fa08e
fix(E3dtt): fix rotation of objectCopies
mathieuLivebardon Apr 15, 2024
f3b24d9
feat(E3dtt): parabola 1st draft
mathieuLivebardon Apr 15, 2024
f8ca29b
fix(e3dtt): correct centroid with >1 tiles
LorenzoMarnat Apr 16, 2024
4a03c8d
refactor(E3dtt): works with both temporal layers & list of layers
LorenzoMarnat May 6, 2024
bee0904
fix(E3dtt): missing iteration in helix
LorenzoMarnat May 6, 2024
de0346f
fix(E3dtt): missing iteration in circle
LorenzoMarnat May 6, 2024
6c69cfb
feat(extension_3DTLT):select versions from circle
mathieuLivebardon May 6, 2024
b0026b5
fix(e3dtlt):space_time_shape.html --> reselect version when display
mathieuLivebardon May 6, 2024
6363f5f
fix(E3dtt): replace hardcoded 2009 by min
LorenzoMarnat May 13, 2024
cf6a78a
feat(E3dtt): alpha param for vector
LorenzoMarnat May 13, 2024
a5c879a
feat(e3dtt):parabola STS getspacedpoints
mathieuLivebardon May 13, 2024
95f7f0c
feat(e3dtt):parabola STS getspacedpoints
mathieuLivebardon May 13, 2024
de58ec0
feat(E3dtt): versions displayed on parabola
LorenzoMarnat May 13, 2024
ce68971
feat(e3dtt):sequential display mode on sts vector
mathieuLivebardon May 14, 2024
d50d73b
feat(e3dtt):sequential and chronological helix + circle
mathieuLivebardon May 14, 2024
6244996
feat(e3dtt): chronological parabola
LorenzoMarnat May 14, 2024
024efdd
refactor(e3dtt): rework display_mode enum
LorenzoMarnat May 14, 2024
c039d7c
fix(e3dtt): store selected date in circle
LorenzoMarnat May 14, 2024
983512a
feat(e3dtt): UI to select display mode in example
LorenzoMarnat May 14, 2024
edb18a5
feat(e3dtt):add new fake data in 3DTiles_STS_data.json
mathieuLivebardon May 14, 2024
00ce937
fix(e3dtt): correct circle rotation
LorenzoMarnat May 14, 2024
1aeb65f
feat(e3dtt): checkbox to disable circle rotation
LorenzoMarnat May 14, 2024
72eb6b2
feat(e3dtt): add labels in UI
LorenzoMarnat May 14, 2024
32e8348
fix(e3dtt) stsCircle fix selectversion, the position on z wasn't good
mathieuLivebardon May 15, 2024
b608b98
refactor(e3dtt): clean variables and jsdoc
LorenzoMarnat May 21, 2024
41cda16
fix(e3dtt): delete frameRequester from helix
LorenzoMarnat May 21, 2024
148f98b
refactor(e3dtt): choose dataset in example
LorenzoMarnat May 21, 2024
c934ac0
fix(e3dtt): reset selected shape on dataset change
LorenzoMarnat May 21, 2024
99ffc0e
refactor(e3dtt): events outside dataset onchange
LorenzoMarnat May 22, 2024
0b5aa12
feat(e3dtt): dashed lines for circle and parabola
LorenzoMarnat May 22, 2024
6fd4d17
fix(e3dtt): method to get shapes to avoid null
LorenzoMarnat May 22, 2024
ffa993d
clean(e3dtt): delete old files
LorenzoMarnat May 22, 2024
d6b59d2
Delete export of a deleted file
CorentinGaut May 30, 2024
ae6d443
feat(e3dtt): add sts example in mosaic
LorenzoMarnat Jun 3, 2024
7c79f93
fix(e3dtt): change parabola's middle date when setting stlayer
LorenzoMarnat Jun 5, 2024
9a70ce5
feat(space_time_shape): color for deciders
mathieuLivebardon Jun 6, 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
56 changes: 56 additions & 0 deletions examples/assets/config/layer/3DTiles_STS_data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
[
[
{
"id": "Lyon-v1",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/FakeData/Lyon-version-1/tileset.json",
"date": 1998
},
{
"id": "Lyon-v2",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/FakeData/Lyon-version-2/tileset.json",
"date": 2004
},
{
"id": "Lyon-v3",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/FakeData/Lyon-version-3/tileset.json",
"date": 2006
},
{
"id": "Lyon-v4",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/FakeData/Lyon-version-4/tileset.json",
"date": 2012
},
{
"id": "Lyon-v5",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/FakeData/Lyon-version-5/tileset.json",
"date": 2015
},
{
"id": "Lyon-v6",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/FakeData/Lyon-version-6/tileset.json",
"date": 2024
}
],
[
{
"id": "Gratte-Ciel-v1",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/Fake_Gratte-Ciel/version-1/tileset.json",
"date": 300
},
{
"id": "Gratte-Ciel-v2",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/Fake_Gratte-Ciel/version-2/tileset.json",
"date": 1588
},
{
"id": "Gratte-Ciel-v3",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/Fake_Gratte-Ciel/version-3/tileset.json",
"date": 2050
},
{
"id": "Gratte-Ciel-v14",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/Fake_Gratte-Ciel/version-4/tileset.json",
"date": 2077
}
]
]
25 changes: 22 additions & 3 deletions examples/assets/config/layer/3DTiles_temporal.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
[
{
"id": "Lyon-1-temporal",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/Lyon1er_Temporal-2009-2012-2015_TileSet/tileset.json"
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/Lyon1er_Temporal-2009-2012-2015_TileSet/tileset.json",
"dates": [
2009,
2012,
2015
]
},
{
"id": "La Doua temporel",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/la-doua_2009-2018-temporal_tileset/tileset.json"
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/la-doua_2009-2018-temporal_tileset/tileset.json",
"dates": [
2009,
2018
]
},
{
"id": "Gratte-Ciel temporel",
"url": "https://dataset-dl.liris.cnrs.fr/three-d-tiles-lyon-metropolis/Temporal/Villeurbanne_GratteCiel_Temporal_2009-2012-2015-2018_TileSet/tileset.json",
"dates": [
2009,
2012,
2015,
2018
]
}
]
]
42 changes: 42 additions & 0 deletions examples/assets/css/space_time_shape.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#stp_ui {
position: absolute;
display: grid;
left: 0%;
top: 0%;
z-index: 10;
background-color: #f5f5f5c2;
}

#stp_ui > div label {
display: block;
font-weight: bold;
margin-bottom: 0.5rem;
}

#stp_ui > div input[type='text'],
#stp_ui > div select {
padding: 0.5rem;
border: 1px solid #ccc;
border-radius: 0.25rem;
font-size: 1rem;
text-transform: capitalize;
}

#stp_ui > div select {
appearance: none;
background-repeat: no-repeat;
background-position: right 0.5rem center;
background-size: 1rem;
padding-right: 2rem;
}

#stp_ui > div input[type='checkbox'] {
margin-right: 0.5rem;
}

#stp_ui > div input[type='text']:focus,
#stp_ui > div select:focus {
outline: none;
border-color: #666;
box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
}
Binary file added examples/assets/img/mosaic/SpaceTimeShape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading