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.

Sign up for GitHub

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

Jump to bottom

Instancing models 3d tiles #3059

Merged
merged 28 commits into from
Oct 24, 2015
Merged

Instancing models 3d tiles #3059

merged 28 commits into from
Oct 24, 2015

Commits on Oct 5, 2015

  1. Added Model instancing

    @lilleyse
    lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    3415df3 View commit details
    Browse the repository at this point in the history

  2. Whitespace

    @pjcozzi @lilleyse
    pjcozzi authored and lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    aecfb3c View commit details
    Browse the repository at this point in the history

  3. Whitespace

    @pjcozzi @lilleyse
    pjcozzi authored and lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    37276da View commit details
    Browse the repository at this point in the history

  4. Whitespace

    @pjcozzi @lilleyse
    pjcozzi authored and lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    5bab8d6 View commit details
    Browse the repository at this point in the history

  5. Tweak doc

    @pjcozzi @lilleyse
    pjcozzi authored and lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    a65a038 View commit details
    Browse the repository at this point in the history

  6. Fixed jittering by rendering relative to bounding volume

    @lilleyse
    lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    a5add4e View commit details
    Browse the repository at this point in the history

  7. Moved all instancing code into ModelInstanceCollection

    @lilleyse
    lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    791a555 View commit details
    Browse the repository at this point in the history

  8. Small fix

    @lilleyse
    lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    b938c61 View commit details
    Browse the repository at this point in the history

  9. Tweak comment

    @pjcozzi @lilleyse
    pjcozzi authored and lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    33c4acd View commit details
    Browse the repository at this point in the history

  10. Style tweak

    @pjcozzi @lilleyse
    pjcozzi authored and lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    02781ce View commit details
    Browse the repository at this point in the history

  11. Style tweak

    @pjcozzi @lilleyse
    pjcozzi authored and lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    12904b8 View commit details
    Browse the repository at this point in the history

  12. Style tweak

    @pjcozzi @lilleyse
    pjcozzi authored and lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    a416ee8 View commit details
    Browse the repository at this point in the history

  13. Updated model instancing Sandcastle demo

    @lilleyse
    lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    4f14143 View commit details
    Browse the repository at this point in the history

  14. Minor fixes

    @lilleyse
    lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    b48b4f2 View commit details
    Browse the repository at this point in the history

  15. Rendering show and color using instanced attributes for now

    @lilleyse
    lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    b820a55 View commit details
    Browse the repository at this point in the history

  16. Support color and show when instancing is disabled

    @lilleyse
    lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    13d14c0 View commit details
    Browse the repository at this point in the history

  17. Instancing using batch texture

    @lilleyse
    lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    77b2547 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'instancing-models' into 3d-tiles

    @lilleyse
    lilleyse committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    61d5607 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2015

  1. Added instanced model 3d tile type

    @lilleyse
    lilleyse committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    bab0ba9 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2015

  1. Model instancing optimizations and cleanup

    @lilleyse
    lilleyse committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    d5ce3b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2015

  1. Tweak comment

    @pjcozzi
    pjcozzi committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    88efe56 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2015

  1. Removed Instancing 3D Tiles demo, using Cities instead

    @lilleyse
    lilleyse committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    be59252 View commit details
    Browse the repository at this point in the history

  2. Prevent instance collections from sharing the same Model

    @lilleyse
    lilleyse committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    bc10897 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2015

  1. Reverted previous commit, now share the same Model but create unique … 

    …vertex arrays
    @lilleyse
    lilleyse committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    948ad72 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2015

  1. Fixed memory leak in non-instanced code path

    @lilleyse
    lilleyse committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    69b858d View commit details
    Browse the repository at this point in the history

  2. Renamed Cesium3dTileBatchTable to Cesium3DTileBatchTableResources to … 

    …avoid ambiguity
    @lilleyse
    lilleyse committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    9ae609d View commit details
    Browse the repository at this point in the history

  3. Removed baseUrl from Cesium3DTileset

    @lilleyse
    lilleyse committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    a49b6fd View commit details
    Browse the repository at this point in the history

  4. Small change

    @lilleyse
    lilleyse committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    e19f70a View commit details
    Browse the repository at this point in the history