xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
455 Commits 1 Branch 24 Tags
b8b09f9455270de2676d9244a6778b58ecac49ed
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannes Janetzek b8b09f9455 theme: brighter swimming pool 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 a6a729244f added MapLensOverlay 2013-10-09 01:55:58 +02:00
Hannes Janetzek eac8047527 tile overlay experiments II 2013-10-09 01:55:58 +02:00
Hannes Janetzek a87a1b761c testing tile overlay 2013-10-09 01:55:58 +02:00
Hannes Janetzek 67e79d98b2 theme: fix water:stream width 2013-10-09 01:55:58 +02:00
Hannes Janetzek d3c31199f1 adapt building height to ground resolution 2013-10-09 01:55:58 +02:00
Hannes Janetzek 1d2fea48cc 5cm height step should suffice 2013-10-09 01:55:58 +02:00
Hannes Janetzek 118c74e810 use building heigh in cm. TODO need to match ground resolution 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 b7ca00ae8f use WayData container to pass geometry and tags to TileGenerator 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 a818e2f062 use MapPosition.copy(other) 2013-10-09 01:55:57 +02:00
Hannes Janetzek 72741ced7f smoother fling 2013-10-09 01:55:57 +02:00
Hannes Janetzek 8c8750a833 add GeometryBuffer class to pass data from MapDatabase to TileGenerator 2013-10-09 01:55:57 +02:00
Hannes Janetzek 64da69e5cf fix for RenderTheme commit 2013-10-09 01:55:57 +02:00
Hannes Janetzek 93a4910fb5 theme tweaks 2013-10-09 01:55:57 +02:00
Hannes Janetzek a6063997db make RenderTheme only return render instruction 
- i.e. dont pass render callback

remove unused matchWay function
 2013-10-09 01:55:57 +02:00
Hannes Janetzek 0b7edab572 fix debug renderer 2013-10-09 01:55:57 +02:00
Hannes Janetzek 76f762d862 hack-- 2013-10-09 01:55:57 +02:00
Hannes Janetzek 45b8bf75de cleanups 2013-10-09 01:55:57 +02:00
Hannes Janetzek 654ca7c5b8 merge updateVisibleList into updateMap 2013-10-09 01:55:57 +02:00
Hannes Janetzek 8d51c54318 share MapView with subclasses 2013-10-09 01:55:57 +02:00
Hannes Janetzek cf1eb4ada5 extract compileTileLayers function 2013-10-09 01:55:57 +02:00
Hannes Janetzek a1604b3b33 fix warning, cleanups 2013-10-09 01:55:57 +02:00
Hannes Janetzek 38e2ac110d - use self-made fling 
- add utilities from libgdx
 2013-10-09 01:55:57 +02:00
Hannes Janetzek a1fcac202c unused function 2013-10-09 01:55:57 +02:00
Hannes Janetzek f8f96c58cf map file reader: add houseNr and ref tags back 2013-10-09 01:55:57 +02:00
Hannes Janetzek 77947ea1ac rename BaseMap -> TileRenderer 2013-10-09 01:55:57 +02:00
Hannes Janetzek f9be7f1cd8 rename libtriangle-jni.so -> libtriangle.so 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 f440920a4b cleanups 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 2538ed8eb7 start splitting up Triangle 
removing non-library build and pre-ansi declarations
 2013-10-09 01:55:57 +02:00
Hannes Janetzek 22441bf527 avoid copy - pin coordinate buffer for triangulation 2013-10-09 01:55:57 +02:00
Hannes Janetzek f2bbc51558 no need to commit array 2013-10-09 01:55:57 +02:00
Hannes Janetzek 3e6ac7d5d4 add and use utility to set Int color as uniform 2013-10-09 01:55:56 +02:00
Hannes Janetzek f262efee7f Use native Matrix4 instead of float[16] 2013-10-09 01:55:56 +02:00
Hannes Janetzek af80759dae - add jni gl matrix utiles 
- move Triangle jni to subdir
 2013-10-09 01:55:56 +02:00
Hannes Janetzek 4f2daf69e9 dont scale markers when drawing to texture, TODO should be done in GL 2013-10-09 01:55:56 +02:00
Hannes Janetzek e47594d2b8 decrease fling speed 2013-10-09 01:55:56 +02:00
Hannes Janetzek 05e979d90c ignore++ 2013-10-09 01:55:56 +02:00
Hannes Janetzek 78d44dc985 move amenity areas below natural/landuse/leisure, showing parks in hospitals etc 2013-10-09 01:55:56 +02:00
Hannes Janetzek eb5de85b17 add README 2013-10-09 01:55:56 +02:00
Hannes Janetzek 2b47b92771 more contrast for buildings 2013-10-09 01:55:56 +02:00
Hannes Janetzek edd74160a1 fix bbox scale calculation 2013-10-09 01:55:56 +02:00
Hannes Janetzek 555a951d25 improve MapViewAnimation 2013-10-09 01:55:56 +02:00
Hannes Janetzek 064434896e this marker is hdpi 2013-10-09 01:55:56 +02:00
Hannes Janetzek 8c0e2525ce use ItemizedOverlay utility 'makeMarker' 
set marker bounds only once
 2013-10-09 01:55:56 +02:00
Hannes Janetzek 1a1345aa70 theme tweaks 2013-10-09 01:55:56 +02:00
Hannes Janetzek 1dbd30307b cleanups + tweaks 2013-10-09 01:55:56 +02:00
Hannes Janetzek 6b39c95905 moving all animation to MapViewPostion, 
- this also allows TileManager to predict next visible tiles
- got rid of zoom-level dependent scale
 2013-10-09 01:55:56 +02:00
Hannes Janetzek 246fd40f7a use PointF 2013-10-09 01:55:56 +02:00
Hannes Janetzek c9f980b99b fix projection, filter visible items by bbox 2013-10-09 01:55:56 +02:00
Hannes Janetzek efaafce08c use PointF instead of android int Point 2013-10-09 01:55:56 +02:00
Hannes Janetzek f508ddc1ff this-- 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 c14d101aef - allow bbox zoom to scale to MAX_END_SCALE 
- use FastMath.clamp
 2013-10-09 01:55:56 +02:00
Hannes Janetzek 2cb8a9d45f keep a reference to MapView in Overlay 2013-10-09 01:55:56 +02:00
Hannes Janetzek 8bd4d8e4d9 fix Triangle debug output 2013-10-09 01:55:56 +02:00
Hannes Janetzek cd54f0dfe6 begin integrating of area zoom interaction 2013-10-09 01:55:56 +02:00
Hannes Janetzek b0c1f122fe spring color theme 2013-10-09 01:55:55 +02:00
Hannes Janetzek 449b2b4709 - get rid of some osmdroid cruft 
- move default marker to 'res'
 2013-10-09 01:55:55 +02:00
Hannes Janetzek ebcd923025 spring cleaning 2013-10-09 01:55:55 +02:00
Hannes Janetzek 179212affc mapsforge file reader: 
- add support for file version 3 back
- project POIs
- fix sync of shared Header and Index
 2013-10-09 01:55:55 +02:00
Hannes Janetzek c82026fa6e dont add null value 'name' tags 2013-10-09 01:55:55 +02:00
Hannes Janetzek 65e4845fef grow ExtrusionLayer compiler buffer if necessary 2013-10-09 01:55:55 +02:00
Hannes Janetzek e05921efdd make getStartPosition() public 2013-10-09 01:55:55 +02:00
Hannes Janetzek 9b54d81dab mv TextOverlayExp to TextOverlay 2013-10-09 01:55:55 +02:00
Hannes Janetzek e1ce1b056b mapsforge should also produce implicitly clsed polys 2013-10-09 01:55:55 +02:00
Hannes Janetzek 615e91856f MULTIPLIER > SCALE 2013-10-09 01:55:55 +02:00
Hannes Janetzek 2c48530ce1 fix rule cache tag comparison with previous item 2013-10-09 01:55:55 +02:00
Hannes Janetzek 82eb60e2a9 cleanups 2013-10-09 01:55:55 +02:00
Hannes Janetzek fcc53630a6 cleanups + comments 2013-10-09 01:55:55 +02:00
Hannes Janetzek 97828c6f8b shorter shader handle names 2013-10-09 01:55:55 +02:00
Hannes Janetzek c0a08c11c8 rename COORD_MULTIPLIER to COORD_SCALE 2013-10-09 01:55:55 +02:00
Hannes Janetzek b3b392bdb8 update comments 2013-10-09 01:55:55 +02:00
Hannes Janetzek d322f9ac03 cleanups 2013-10-09 01:55:55 +02:00
Hannes Janetzek 654e666c81 mapsforge reader is halfway back to life 2013-10-09 01:55:55 +02:00
Hannes Janetzek 52a7518db9 cleanups 2013-10-09 01:55:55 +02:00
Hannes Janetzek 0e96747939 cleanups 2013-10-09 01:55:55 +02:00
Hannes Janetzek ebd7453348 more tilt 2013-10-09 01:55:55 +02:00
Hannes Janetzek 722663c5f8 dont mess with which pointer is which.. just use index 0 and 1 in gestures 2013-10-09 01:55:55 +02:00
Hannes Janetzek 51d2a845a0 print Triangle errors, instead of exiting 2013-10-09 01:55:55 +02:00
Hannes Janetzek 68e7bf863d update library version number 2013-10-09 01:55:55 +02:00
Hannes Janetzek 4d346ba2ae set mCurLayer null on clear 2013-10-09 01:55:54 +02:00
Hannes Janetzek b82cfbb95e limit maximum scanlines to bbox 2013-10-09 01:55:54 +02:00
Hannes Janetzek e53179eb7b use linear filter for stipple texture 2013-10-09 01:55:54 +02:00
Hannes Janetzek 67529446a4 cleanups + notes 2013-10-09 01:55:54 +02:00
Hannes Janetzek 716fbccf36 add utility function to get tile by index 2013-10-09 01:55:54 +02:00
Hannes Janetzek 9733702655 theme tweaks 2013-10-09 01:55:54 +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 ecedccb265 fix possible invalid vbo reads 
- make sure there is an additional vertex for interleaving
 2013-10-09 01:55:54 +02:00
Hannes Janetzek b328d769a5 check gl errors, cleanups 2013-10-09 01:55:54 +02:00
Hannes Janetzek 00f1fe9438 cleanups 2013-10-09 01:55:54 +02:00
Hannes Janetzek b440155e83 fix clamp parameter 2013-10-09 01:55:54 +02:00
Hannes Janetzek 2843c49ced fix stipple width 2013-10-09 01:55:54 +02:00