xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
512 Commits 1 Branch 24 Tags
Commit Graph

57 Commits

Author SHA1 Message Date
Hannes Janetzek
bcb529906a - extract interface of RenderTheme 
- pass MapElement to RenderTheme
- refactor: join duplicated code for node and way matching
 2013-10-09 01:56:00 +02:00
Hannes Janetzek
7d767ec2e4 move 'simple' layer renderers to renderer.layer 2013-10-09 01:56:00 +02:00
Hannes Janetzek
6eb3b9221b MapView base layer is now a TileLayer 
- extract MapView base layer into TileLayer
- extract MapTile loading from GLRenderer
- move all tile layer related classes to layers.tile.*
- make Overlay subclass of InputLayer, which extends Layer
 2013-10-09 01:56:00 +02:00
Hannes Janetzek
5739eb5b93 simplify ScanBox use 2013-10-09 01:55:59 +02:00
Hannes Janetzek
24438c1e68 change max zoom-level to 24 
- fix bug in ScanBox where tiles where not visible when map rotation had a steep angle
- refactor ScanBox, add transScale utility
 2013-10-09 01:55:59 +02:00
Hannes Janetzek
9c3c860da8 cleanups 2013-10-09 01:55:59 +02:00
Hannes Janetzek
ab56cc4b18 pooled items now extend pool.Inlist and using generic pool.SyncPool 2013-10-09 01:55:59 +02:00
Hannes Janetzek
29c3f42043 fix concurrency bug: use a copy of RenderOverlays 2013-10-09 01:55:58 +02:00
Hannes Janetzek
491e41becc rename Tile.TILE_SIZE to Tile.SIZE, while I'm at refactoring 2013-10-09 01:55:58 +02:00
Hannes Janetzek
8e01dce85e -use absolute x/y position and scale in MapPosition 
- scale calculations look much nicer now, better always
   use 'double' unless you are sure about precision required
- finally got rid of zoomLevel relative coordinates
- cleanup MapPosition and MercatorProjection API functions
 2013-10-09 01:55:58 +02:00
Hannes Janetzek
c280bbaf50 workaround issue with clipped tiles when scale is greater 2 on zoom-level 17 2013-10-09 01:55:58 +02:00
Hannes Janetzek
93a723af3c refactor scale/translate of screen to map coordinates for tile visibility calulation 
cleanups
 2013-10-09 01:55:58 +02:00
Hannes Janetzek
bac46ac6e2 make building height consistent, at least independent of aspect ratio 2013-10-09 01:55:58 +02:00
Hannes Janetzek
bef8e125fb MapPosition: use int to represent zoomLevel 
add MapPosition.setFromLatLon utility
 2013-10-09 01:55:58 +02:00
Hannes Janetzek
cf1eb4ada5 extract compileTileLayers function 2013-10-09 01:55:57 +02:00
Hannes Janetzek
77947ea1ac rename BaseMap -> TileRenderer 2013-10-09 01:55:57 +02:00
Hannes Janetzek
3f4a8980a9 no need to 'flatten' projection anymore, depth test is only used for drawing clip rectangles 2013-10-09 01:55:57 +02:00
Hannes Janetzek
b0c02e0c56 use same quad indices in Texture- and LineTexRenderer 2013-10-09 01:55:57 +02:00
Hannes Janetzek
f262efee7f Use native Matrix4 instead of float[16] 2013-10-09 01:55:56 +02:00
Hannes Janetzek
5230aee091 avoid zoom-level relative calculation 2013-10-09 01:55:56 +02:00
Hannes Janetzek
c0a08c11c8 rename COORD_MULTIPLIER to COORD_SCALE 2013-10-09 01:55:55 +02:00
Hannes Janetzek
a581996f25 On options change set 'clearMap' flag instead of direct clearAndRedraw 2013-10-09 01:55:54 +02:00
Hannes Janetzek
7cf4ca27f3 - add initial version of line stipple renderer 
- 'vbo' moved to 'Layers'
 2013-10-09 01:55:54 +02:00
Hannes Janetzek
45bb326258 update copyright 2013-10-09 01:55:53 +02:00
Hannes Janetzek
34bffcc15f labeling testing 2013-10-09 01:55:53 +02:00
Hannes Janetzek
55030c1166 refactor: dont pass matrices with MapPosition -> use GLRender.Matrices 2013-10-09 01:55:53 +02:00
Hannes Janetzek
c53805aded release locked tiles for labeling directly 2013-10-09 01:55:52 +02:00
Hannes Janetzek
6466a65545 tiles are already locked when in use by GLRenderer 2013-10-09 01:55:52 +02:00
Hannes Janetzek
7c6ec614a2 make TileManager non-static 2013-10-09 01:55:52 +02:00
Hannes Janetzek
f2b7a9fdf8 formatting 2013-10-09 01:55:52 +02:00
Hannes Janetzek
7df1ceeff1 - handle limiting of unused loaded tiles in limitCache 
- remove unused tiles based on distance to map center
 2013-10-09 01:55:51 +02:00
Hannes Janetzek
0d87aabd3d add function to get visible tiles only 2013-10-09 01:55:51 +02:00
Hannes Janetzek
019c39d8b8 start render early 2013-10-09 01:55:51 +02:00
Hannes Janetzek
e99a4279bf keep track of GL_BLEND state: GLState.blend(enable) 2013-10-09 01:55:51 +02:00
Hannes Janetzek
f93d0944a3 use 0x80 as stencil buffer CLIP_BIT 2013-10-09 01:55:50 +02:00
Hannes Janetzek
249478216f limit framerate 2013-10-09 01:55:50 +02:00
Hannes Janetzek
4e19553f9e move uploadOverlay to BasicOverlay 2013-10-09 01:55:50 +02:00
Hannes Janetzek
bb22ecd7e3 extract Layer drawing utilities from RenderOverlay into BasicOverlay 2013-10-09 01:55:50 +02:00
Hannes Janetzek
5f03a33492 it probably makes no sense to cycle ByteBuffers for upload to GL 2013-10-09 01:55:50 +02:00
Hannes Janetzek
42964861b8 - BufferObject.get(): try to return a BufferObject with matching size so that glSubBufferData is used more often 
- use BufferObject in ExtrusionLayer - fixes also wrong call to glDeleteBuffer from non-glThread
 2013-10-09 01:55:49 +02:00
Hannes Janetzek
1dd7e3c7a8 rename BaseLayer -> BaseMap 2013-10-09 01:55:49 +02:00
Hannes Janetzek
dcb6e11ee8 use debugview switch to enable depth test shader 2013-10-09 01:55:48 +02:00
Hannes Janetzek
74cf517b15 cleanup 2013-10-09 01:55:48 +02:00
Hannes Janetzek
80de20a423 reworking the gl projection/unprojection stuff 2013-10-09 01:55:47 +02:00
Hannes Janetzek
e50ea0c2ba refactor: move rendering of base layers to separate class 
- keep track of GL state in GLState
 2013-10-09 01:52:20 +02:00
Hannes Janetzek
99ce02a9bd -rename BuildingOverlay -> ExtrusionOverlay, 
even if there is probably nothing else to extrude
- started to draw extrusion layer for proxy tiles
- fixed depth offsetting..
 2013-10-09 01:52:20 +02:00
Hannes Janetzek
cfa56c00f6 move TileGenerator from 'renderer' to 'generator' package 2013-10-09 01:47:44 +02:00
Hannes Janetzek
eb0b7a8c0c add beginnings of OverlayModel, rendering only a box atm 
- modified gl projection so that map layer is always between near- and far-plane
 2013-10-09 01:47:43 +02:00
Hannes Janetzek
a8b25d07ad keep tile loading state in JobTile.state 2013-10-09 01:47:43 +02:00
Hannes Janetzek
3dc36e108a - rename class Tiles -> TileSet 
- cleanup + comments
 2013-10-09 01:47:43 +02:00