xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,515 Commits 1 Branch 24 Tags
211efc4d5a317d3e3bd613bb36b46f926ac08c3d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannes Janetzek 211efc4d5a gradle: dont copy assets 2014-03-27 03:14:02 +01:00
Hannes Janetzek 53a705ead5 app++ 2014-03-27 03:14:02 +01:00
Hannes Janetzek 7673ab16e5 Merge branch 's3db' 2014-03-27 03:13:37 +01:00
Hannes Janetzek 37639f965c use vertexMapPool in ExtrusionLayer 2014-03-27 03:13:20 +01:00
Hannes Janetzek 2a58f43256 make KeyMap poolable 2014-03-27 03:13:20 +01:00
Hannes Janetzek a377e96128 cleanup: ExtrusionLayer 2014-03-27 03:13:20 +01:00
Hannes Janetzek e900b4243d fix: ExtrusionLayer get correct sumIndices 2014-03-27 03:13:20 +01:00
Hannes Janetzek 3b65983706 use GLShader for ExtrusionLayer 2014-03-27 03:13:20 +01:00
Hannes Janetzek 3b212214ab s3db: use custom keymap 2014-03-27 03:13:20 +01:00
Hannes Janetzek d434c11e78 add KeyMap, custom key-only HashMap 2014-03-27 03:13:20 +01:00
Hannes Janetzek bda73374ca compile extrusion layers into one vbo 2014-03-27 03:13:19 +01:00
Hannes Janetzek 0a76dafd9c fx: ExtrusionRenderer hacks 2014-03-27 03:13:19 +01:00
Hannes Janetzek 37ab92534a unify ExtrusionLayer vertex ids - TODO reduce allocations 2014-03-27 03:13:19 +01:00
Hannes Janetzek 6b388c12d1 s3db: add building material and colors 2014-03-27 03:13:19 +01:00
Hannes Janetzek bcaaa0637a s3db: colors, no alpha 2014-03-27 03:13:19 +01:00
Hannes Janetzek 581cddaa0e ExtrusionRenderer: 
- set matrix per tile, not per layer
- ExtrusionLayer must have a color
- add alpha option
- cleanups
 2014-03-27 03:13:19 +01:00
Hannes Janetzek 967ad4cba4 use default roof color only for flat roofs 2014-03-27 03:13:19 +01:00
Hannes Janetzek e52bed199a add cache for S3DB layer 2014-03-27 03:13:19 +01:00
Hannes Janetzek feeebae5fb remove tile load CancellationException 
- does not work with GWT async loading
 2014-03-27 03:13:19 +01:00
Hannes Janetzek f51fb210b8 refactor: split S3DB Layer/TileLoader 2014-03-27 03:13:19 +01:00
Hannes Janetzek aeff737250 S3DB: handle building/roof:color tag 2014-03-27 03:13:19 +01:00
Hannes Janetzek 8064dda6ac add mesh-only mode to ExtrusionRenderer/Layer 2014-03-27 03:13:18 +01:00
Hannes Janetzek eb41496c5a rename ExtrusionLayer public fields 2014-03-27 03:13:18 +01:00
Hannes Janetzek c2112d68aa try different normal encoding 2014-03-27 03:13:18 +01:00
Hannes Janetzek e67f4e8c62 s3db: add android example 2014-03-27 03:13:18 +01:00
Hannes Janetzek c02287fc9b cleanup: BuildingLayer 2014-03-27 03:13:18 +01:00
Hannes Janetzek a548e6c34b s3db: add S3DBLayer 2014-03-27 03:13:18 +01:00
Hannes Janetzek a18d20a916 s3db: render meshes with ExtrusionRenderer 2014-03-27 03:13:18 +01:00
Hannes Janetzek f929c15e2d cleanup: VectorTileLoader 2014-03-27 03:13:18 +01:00
Hannes Janetzek 5ad631f1ea skip rendering TileSet when zoom-level is not renderable 2014-03-27 03:13:18 +01:00
Hannes Janetzek cb2aee6d60 make LayerRenderer.isReady() public 2014-03-27 03:13:18 +01:00
Hannes Janetzek fb3e50cc88 s3db: add triangle geometry decoder 2014-03-27 03:13:18 +01:00
Hannes Janetzek 27750ac11e move depthOffset(Tile) to MapTile 2014-03-27 03:13:18 +01:00
Hannes Janetzek ea711aea77 move example renderer to playground 2014-03-27 03:13:17 +01:00
Hannes Janetzek ff56d5c67a Merge branch 'extract_shaders' 2014-03-27 03:12:45 +01:00
Hannes Janetzek afea93be73 remove obsolete shader GlUtils functions 2014-03-27 03:10:48 +01:00
Hannes Janetzek c6f44e7bbf gwt: use shader assets 
- add some url options for 'map' and 'theme'
- use local asset folder
- merge assets in local directory
 2014-03-27 03:05:44 +01:00
Hannes Janetzek 1b211df73e use GLShader for ExtrusionRenderer 2014-03-27 03:05:18 +01:00
Hannes Janetzek bed1edbc82 use GLShader for MeshLayer 2014-03-27 03:04:12 +01:00
Hannes Janetzek 1a9d3ca4fc use GLShader for BitmapLayer 2014-03-27 03:04:12 +01:00
Hannes Janetzek c107e197f5 use GLShader for LineTexLayer 2014-03-27 03:04:12 +01:00
Hannes Janetzek 0fb0aa59c2 use GLShader for PolygonLayer 2014-03-27 03:04:12 +01:00
Hannes Janetzek 357713b3a2 fix comments 2014-03-27 03:04:12 +01:00
Hannes Janetzek b44ef4144b use GLShader for LineLayer 2014-03-27 03:04:12 +01:00
Hannes Janetzek eccbf58c80 use GLShader for TextureLayer 2014-03-27 03:04:12 +01:00
Hannes Janetzek 18f6784e81 add GLShader: 
- load shaders from assets
- start to move shaders to asset files
 2014-03-27 03:03:31 +01:00
Hannes Janetzek 4205d42e7f testing: GL_STATIC_DRAW buffers 2014-03-27 00:35:51 +01:00
Hannes Janetzek 83dbce18fe gwt: print error message only 2014-03-27 00:35:51 +01:00
Hannes Janetzek 5b58898975 gwt: allow to create empty textures.. 2014-03-27 00:35:51 +01:00
Hannes Janetzek 19bd1dab9f gwt: increase fps 2014-03-27 00:35:51 +01:00
Hannes Janetzek 5f18415bf9 gwt: use slf4j in libgdx 2014-03-27 00:35:51 +01:00
Hannes Janetzek 9a16899824 gdx: add esc to exit 2014-03-27 00:35:51 +01:00
Hannes Janetzek d50a67527e desktop: change run parameters 2014-03-27 00:35:51 +01:00
Hannes Janetzek d507022c4a cleanup: Extrusion style 2014-03-27 00:35:51 +01:00
Hannes Janetzek 56a223e6c6 SyncPool/Pool: allow to pool any subclass of Inlist 2014-03-27 00:35:51 +01:00
Hannes Janetzek 6113d284d8 add Map.setTheme(IRenderTheme) 2014-03-27 00:35:51 +01:00
Hannes Janetzek 913afab264 BufferObject: find minimal buffer larger than requested size 2014-03-27 00:35:50 +01:00
Hannes Janetzek 7587c1a041 example: add ThemeStylerActivity 2014-03-18 03:09:29 +01:00
Hannes Janetzek 537b53d877 fixup theme 2014-03-18 03:04:38 +01:00
Hannes Janetzek 1a521d2ad4 gwt: stop tile loading when state is not 'loading' 2014-03-18 02:51:03 +01:00
Hannes Janetzek 818ea0b0c7 gwt: use LoadDelayTask to only load max one tile per frame 2014-03-18 02:51:03 +01:00
Hannes Janetzek a46940a6b1 remove tile load CancellationException 
does not work with GWT async loading
 2014-03-18 02:51:03 +01:00
Hannes Janetzek b0217767b8 use RenderStyle.current() to get the active style 2014-03-18 02:51:03 +01:00
Hannes Janetzek 1b09774413 PolygonLayer: use temporary area style array 2014-03-18 02:51:02 +01:00
Hannes Janetzek 8f0c51675d TexturePool: add function to initialize item with bitmap 2014-03-18 02:51:02 +01:00
Hannes Janetzek 2e56e3facc start BitmapTileLayer pool 2014-03-18 02:51:02 +01:00
Hannes Janetzek 879e0ccb81 docs: MapRenderer 2014-03-18 02:51:02 +01:00
Hannes Janetzek 4688943290 cleanup AwtBitmap 2014-03-18 02:51:02 +01:00
Hannes Janetzek 641977b5ca add color conversion for rgb-hsv and parser for rgba() strings 
parse rgb()/rgba() color strings
 2014-03-18 02:51:02 +01:00
Hannes Janetzek 1127660f2d add GwtInput to disable key callbacks on Document 2014-03-18 02:51:02 +01:00
Hannes Janetzek 61e2be18ab move cast into addVertex 2014-03-18 02:51:02 +01:00
Hannes Janetzek 77d33bb02c name clipMode magic-numbers, docs 2014-03-18 02:51:02 +01:00
Hannes Janetzek bd96c018f7 cleanup: Tag 2014-03-18 02:51:02 +01:00
Hannes Janetzek 31e1b0ec99 Merge branch 'tile_load_hooks' 2014-03-18 02:50:43 +01:00
Hannes Janetzek 8f94fa7ac5 add TileLoaderProcessHook to intercept MapElement processing 2014-03-18 02:47:41 +01:00
Hannes Janetzek 402e4c3cd6 let TileLoaderHook stop further processing 
- return false when no other loader hook should process
  the current element
 2014-03-18 02:47:41 +01:00
Hannes Janetzek c234507edb move Label/Symbol data from MapTile to LabelTileData 2014-03-18 02:47:41 +01:00
Hannes Janetzek 20d5c20e72 move Text/Symbol handling to LabelTileLoaderHook 2014-03-18 02:47:41 +01:00
Hannes Janetzek 2d15324ead insert new hooks at front 2014-03-18 02:47:41 +01:00
Hannes Janetzek bb2a86b5ac PathLayer - inner class should be static 2014-03-18 02:47:41 +01:00
Hannes Janetzek 56c4323959 docs: MapTile 2014-03-18 02:47:41 +01:00
Hannes Janetzek a475aa6c22 use Object as ID for TileData 2014-03-18 02:47:41 +01:00
Hannes Janetzek 7b9f2ac6bd start TileLoaderHook: 
- only create ExtrusionLayers when a BuildingLayer is attached
 2014-03-18 02:47:41 +01:00
Hannes Janetzek 1f5efb9a33 refactor: MapTile hold generic TileData - Testing 2014-03-18 02:47:41 +01:00
Hannes Janetzek 8926c84ca9 docs: MatchingCacheKey 2014-03-18 02:47:40 +01:00
Hannes Janetzek 3eba47b0bb get theme from VectorTileLayer, instead of setting it on Loader 2014-03-18 02:47:40 +01:00
Hannes Janetzek ff01b3f80d refactor: TileLoader.createLoader() 2014-03-18 02:47:40 +01:00
Hannes Janetzek d00e9771e0 move TagFilter stuff to OsmTileLayer 2014-03-18 02:47:40 +01:00
Hannes Janetzek 5ebc5b6244 example: fix theme menu radio toggle 2014-03-18 02:47:32 +01:00
Hannes Janetzek e7ad7110c8 example: move theme menu to base 2014-03-18 02:47:21 +01:00
Hannes Janetzek 192bd9c96c theme: slight orange primary roads 2014-03-18 02:47:13 +01:00
Hannes Janetzek 6188baa4db theme: add Newtron 
- fix: VtmThemes enum
 2014-03-18 02:46:38 +01:00
Hannes Janetzek 968d97f440 theme: disable tourism=info 2014-03-18 02:46:24 +01:00
Hannes Janetzek 2fd9addc59 reduce the exceptions thrown by theme loader to ThemeException 2014-03-18 02:43:32 +01:00
Hannes Janetzek 6f9d2dafb6 theme: just print error on lineSymbol in theme 2014-03-18 00:35:58 +01:00
Hannes Janetzek 0b68a9cf58 theme: disable (now working) area textures 2014-03-18 00:13:25 +01:00
Hannes Janetzek d502ab2561 theme: rename newtron enum 2014-03-18 00:11:14 +01:00
Hannes Janetzek fc9901e493 cleanup: move carto theme to not working mapnik tilesource 2014-03-18 00:09:58 +01:00
Hannes Janetzek 604c1449e4 Merge branch 'theme_refactor' 2014-03-17 23:24:46 +01:00
Hannes Janetzek 0a23dc2c27 theming changes: 
- select="first" also add its renderstyles when no sub-rule matched
  ... before they where only added when one subrule matched

- use select="when-matched" as last subrule in select="first" rules
  instead.
 2014-03-17 22:55:34 +01:00