Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[NOT READY] raster tile rendering #84

Closed
wants to merge 43 commits into from
Closed

[NOT READY] raster tile rendering #84

wants to merge 43 commits into from

Commits on Feb 28, 2014

  1. refactor sprite PNG/raster handling into reusable class

    @incanus
    incanus committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    c078c73 View commit details
    Browse the repository at this point in the history

  2. basic raster rendering w/ incorrect shader

    @incanus
    incanus committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    c09b31c View commit details
    Browse the repository at this point in the history

  3. working raster shader, albeit at 512px

    @incanus
    incanus committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    a2af448 View commit details
    Browse the repository at this point in the history

  4. make raster toggle API

    @incanus
    incanus committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    c776cd8 View commit details
    Browse the repository at this point in the history

  5. add controls for toggling raster

    @incanus
    incanus committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    8219129 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into raster-work

    @incanus
    incanus committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    3682ecf View commit details
    Browse the repository at this point in the history

  7. check state before raster "parse"

    @incanus
    incanus committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    4188749 View commit details
    Browse the repository at this point in the history

  8. we always want linear interpolation for rasters

    @incanus
    incanus committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    2562e5a View commit details
    Browse the repository at this point in the history

  9. vary max_zoom based on raster or vector

    @incanus
    incanus committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    d990054 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2014

  1. Merge branch 'master' into raster-work

    @incanus
    incanus committed Mar 3, 2014
    Configuration menu
    Copy the full SHA
    a9f2f92 View commit details
    Browse the repository at this point in the history

  2. add mipmap filtering & filter type enum

    @incanus
    incanus committed Mar 3, 2014
    1 Configuration menu
    Copy the full SHA
    611cec8 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2014

  1. erroneous const: well, you needn't

    @incanus
    incanus committed Mar 4, 2014
    Configuration menu
    Copy the full SHA
    fca5a63 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2014

  1. first cut of raster tiles at proper size (including retina support)

    @incanus
    incanus committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    643ac28 View commit details
    Browse the repository at this point in the history

  2. back out 611cec8; we don't need mipmapping after all (for now)

    @incanus
    incanus committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    ed59d28 View commit details
    Browse the repository at this point in the history

  3. clean up textures now that we have transient rasters

    @incanus
    incanus committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    49835af View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2014

  1. first cut of texture manager 

     - simplify namespacing
 - static raster tile image for now
    @incanus
    incanus committed Mar 12, 2014
    Configuration menu
    Copy the full SHA
    1aad1dc View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2014

  1. Merge branch 'master' into raster-work 

    Conflicts:
	include/llmr/map/map.hpp
	include/llmr/map/tile.hpp
	include/llmr/platform/platform.hpp
	include/llmr/renderer/painter.hpp
	src/map/map.cpp
	src/map/tile.cpp
	src/renderer/painter.cpp
	src/style/sprite.cpp
    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    9420935 View commit details
    Browse the repository at this point in the history

  2. we no longer need this in the header

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    98b1a55 View commit details
    Browse the repository at this point in the history

  3. determine raster/retina coverage dynamically on global tile size

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    dc35986 View commit details
    Browse the repository at this point in the history

  4. fix minor cast

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    8248b4d View commit details
    Browse the repository at this point in the history

  5. clarify comments

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    7fc7517 View commit details
    Browse the repository at this point in the history

  6. extra check just to be safe

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    11fc1cd View commit details
    Browse the repository at this point in the history

  7. removed unused routine

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    12b6425 View commit details
    Browse the repository at this point in the history

  8. don't try to bind sprite raster until it's loaded

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    7b8c9ce View commit details
    Browse the repository at this point in the history

  9. property fetch from texture pool for sprite raster

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    ed1c296 View commit details
    Browse the repository at this point in the history

  10. texturer -> texturepool rename

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    c76f561 View commit details
    Browse the repository at this point in the history

  11. move texture pool into domain of raster for better cleanup

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    b4dddb2 View commit details
    Browse the repository at this point in the history

  12. up texture pool size + cleanup logging

    @incanus
    incanus committed Mar 13, 2014
    Configuration menu
    Copy the full SHA
    8632a7c View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2014

  1. move to platform-specific raster image parsing & ditch libpng

    @incanus
    incanus committed Mar 14, 2014
    Configuration menu
    Copy the full SHA
    1eb5076 View commit details
    Browse the repository at this point in the history

  2. get rid of hardcoded raster image

    @incanus
    incanus committed Mar 14, 2014
    Configuration menu
    Copy the full SHA
    81d42ab View commit details
    Browse the repository at this point in the history

  3. be clearer about what we're transporting

    @incanus
    incanus committed Mar 14, 2014
    Configuration menu
    Copy the full SHA
    3e919f2 View commit details
    Browse the repository at this point in the history

  4. revert 1eb5076 & 3e919f2 platform-specific PNG decoding

    @incanus
    incanus committed Mar 14, 2014
    Configuration menu
    Copy the full SHA
    12bdf1b View commit details
    Browse the repository at this point in the history

  5. fix memory leak in PNG decoding

    @incanus
    incanus committed Mar 14, 2014
    Configuration menu
    Copy the full SHA
    2d12233 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2014

  1. fade in raster tiles

    @incanus
    incanus committed Mar 15, 2014
    Configuration menu
    Copy the full SHA
    763c900 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2014

  1. fix crash related to destructor order of texture pool

    @incanus
    incanus committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    aeebe17 View commit details
    Browse the repository at this point in the history

  2. re-add <memory> for std::shared_ptr use

    @incanus
    incanus committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    feb41db View commit details
    Browse the repository at this point in the history

  3. remove commented mutex; unneeded as texture pool access is main threa… 

    …d only
    @incanus
    incanus committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    3824797 View commit details
    Browse the repository at this point in the history

  4. remove obsolete lambda pointer

    @incanus
    incanus committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    4ca08d2 View commit details
    Browse the repository at this point in the history

  5. you have goto failed me for the last time

    @incanus
    incanus committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    fd960fb View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into raster-work 

    Conflicts:
	include/llmr/map/coverage.hpp
	macosx/main.mm
	src/map/coverage.cpp
	src/map/tile.cpp
    @incanus
    incanus committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    8143f49 View commit details
    Browse the repository at this point in the history

  7. remove dead member

    @incanus
    incanus committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    cc41ce8 View commit details
    Browse the repository at this point in the history

  8. add braces

    @incanus
    incanus committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    3719fef View commit details
    Browse the repository at this point in the history

  9. flesh out raster shader logging

    @incanus
    incanus committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    7f47c9b View commit details
    Browse the repository at this point in the history