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

Add spring objects #559

Merged
merged 7 commits into from
Jun 5, 2024
Merged

Add spring objects #559

merged 7 commits into from
Jun 5, 2024

Conversation

kfarr
Copy link
Collaborator

@kfarr kfarr commented Jun 4, 2024

waymo, uoregon objects, light rail vehicle size update, trash truck

to add: waymo, uoregon objects, light rail vehicle size update
Copy link

netlify bot commented Jun 4, 2024

Deploy Preview for 3dstreet-core-builds ready!

Name Link
🔨 Latest commit a52cc83
🔍 Latest deploy log https://app.netlify.com/sites/3dstreet-core-builds/deploys/665fa68418baea00084f1fa1
😎 Deploy Preview https://deploy-preview-559--3dstreet-core-builds.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@kfarr kfarr changed the base branch from main to street-geo-editor June 4, 2024 23:43
@kfarr kfarr changed the base branch from street-geo-editor to main June 5, 2024 03:48
@kfarr kfarr changed the base branch from main to street-geo-editor June 5, 2024 03:49
@kfarr kfarr merged commit a4afc3a into street-geo-editor Jun 5, 2024
@kfarr kfarr deleted the add-spring-objects branch June 5, 2024 03:49
kfarr added a commit that referenced this pull request Jun 5, 2024
commit 403f97e
Author: Kieran Farr <[email protected]>
Date:   Tue Jun 4 21:39:05 2024 -0700

    prevent scrolling in geomodal

commit d71a7b5
Author: Kieran Farr <[email protected]>
Date:   Tue Jun 4 21:14:07 2024 -0700

    move search input below map

commit f26ec38
Author: Kieran Farr <[email protected]>
Date:   Tue Jun 4 21:12:41 2024 -0700

    update geopanel coords from entity instead of metadata

commit a4afc3a
Author: Kieran Farr <[email protected]>
Date:   Tue Jun 4 20:49:48 2024 -0700

    Add spring objects (#559)

    * update submodule for dist latest

    to add: waymo, uoregon objects, light rail vehicle size update

    * add u of o objects

    3DStreet/3dstreet-assets-source#84

    * add waymo

    * fix tram path for updated size

    * update submodule for trash truck

    * trash truck

commit ff551ce
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 22:55:20 2024 -0400

    update three-loader-3dtiles lib version

commit d1cbe64
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 22:54:00 2024 -0400

    remove old line to work 3dtiles with editor

commit c7a79fe
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 22:52:33 2024 -0400

    dynamically load aframe-loader-3dtiles-component, update code for it

commit c9a1a03
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 20:37:50 2024 -0400

    new aframe-loader-3dtiles dist
    set Editor camera if its active on init
    update lat,long and/or height in runtime

commit 2a04971
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 20:15:38 2024 -0400

    don't store geo coords in metadata. Store it in street-geo

commit 43d7714
Merge: abee710 d15bd99
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 14:12:32 2024 -0400

    Merge branch 'street-geo-editor' of https://github.com/3DStreet/3dstreet into street-geo-editor

commit abee710
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 14:12:00 2024 -0400

    get GOOGLE_API_KEY from firebaseConfig.apiKey

commit d15bd99
Author: Vincent Fretin <[email protected]>
Date:   Tue Jun 4 18:24:26 2024 +0200

    remove the whole dist folder and add it to gitignore

commit 695418a
Merge: b148095 5b9dc54
Author: Alexander Goryushkin <[email protected]>
Date:   Mon Jun 3 23:58:12 2024 -0400

    Merge branch 'street-geo-editor' of https://github.com/3DStreet/3dstreet into street-geo-editor

commit b148095
Author: Alexander Goryushkin <[email protected]>
Date:   Mon Jun 3 23:57:24 2024 -0400

    save/load geoData in JSON file
kfarr added a commit that referenced this pull request Jun 7, 2024
* add viewer param, hide viewer sidebar

* hide sky on enter ar

* Squashed commit of the following:

commit 403f97e
Author: Kieran Farr <[email protected]>
Date:   Tue Jun 4 21:39:05 2024 -0700

    prevent scrolling in geomodal

commit d71a7b5
Author: Kieran Farr <[email protected]>
Date:   Tue Jun 4 21:14:07 2024 -0700

    move search input below map

commit f26ec38
Author: Kieran Farr <[email protected]>
Date:   Tue Jun 4 21:12:41 2024 -0700

    update geopanel coords from entity instead of metadata

commit a4afc3a
Author: Kieran Farr <[email protected]>
Date:   Tue Jun 4 20:49:48 2024 -0700

    Add spring objects (#559)

    * update submodule for dist latest

    to add: waymo, uoregon objects, light rail vehicle size update

    * add u of o objects

    3DStreet/3dstreet-assets-source#84

    * add waymo

    * fix tram path for updated size

    * update submodule for trash truck

    * trash truck

commit ff551ce
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 22:55:20 2024 -0400

    update three-loader-3dtiles lib version

commit d1cbe64
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 22:54:00 2024 -0400

    remove old line to work 3dtiles with editor

commit c7a79fe
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 22:52:33 2024 -0400

    dynamically load aframe-loader-3dtiles-component, update code for it

commit c9a1a03
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 20:37:50 2024 -0400

    new aframe-loader-3dtiles dist
    set Editor camera if its active on init
    update lat,long and/or height in runtime

commit 2a04971
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 20:15:38 2024 -0400

    don't store geo coords in metadata. Store it in street-geo

commit 43d7714
Merge: abee710 d15bd99
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 14:12:32 2024 -0400

    Merge branch 'street-geo-editor' of https://github.com/3DStreet/3dstreet into street-geo-editor

commit abee710
Author: Alexander Goryushkin <[email protected]>
Date:   Tue Jun 4 14:12:00 2024 -0400

    get GOOGLE_API_KEY from firebaseConfig.apiKey

commit d15bd99
Author: Vincent Fretin <[email protected]>
Date:   Tue Jun 4 18:24:26 2024 +0200

    remove the whole dist folder and add it to gitignore

commit 695418a
Merge: b148095 5b9dc54
Author: Alexander Goryushkin <[email protected]>
Date:   Mon Jun 3 23:58:12 2024 -0400

    Merge branch 'street-geo-editor' of https://github.com/3DStreet/3dstreet into street-geo-editor

commit b148095
Author: Alexander Goryushkin <[email protected]>
Date:   Mon Jun 3 23:57:24 2024 -0400

    save/load geoData in JSON file

* merge assets too

* add pro badge to geo

this should be visible but disabled for non-pro users

* remove unneeded icons file

* fix autocomplete styling

* assets submodule update

* qr-code-ui-wip

next - upon click, then download png of qr code (or open in new tab)

* wip qrhandler

need qr code

* Squashed commit of the following:

commit c1b4c26
Author: Kieran Farr <[email protected]>
Date:   Thu Jun 6 22:29:31 2024 -0700

    pro user required for cloud save with long/lat

commit 165866a
Author: Kieran Farr <[email protected]>
Date:   Thu Jun 6 22:12:17 2024 -0700

    untitled instead of new scene

    reduce confusion for users wishing to create a new scene

commit e27b8cd
Author: Kieran Farr <[email protected]>
Date:   Thu Jun 6 22:11:52 2024 -0700

    wHoops

* do not load geo upon ar mode

why not just hide geospatial layers upon ar mode instead of preventing their load? because some of them are super heavy and can crash mobile devices

* update submodules and such
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant