xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
126 Commits 1 Branch 24 Tags
45cf6620a9f59f08911425a3289cf35883920a9f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannes Janetzek 45cf6620a9 - keep track of vertex array state in GLRenderer.enableVertexArrays 
- use static imports for GL functions
 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 60637f7440 make uniform handle local var 2013-10-09 01:47:43 +02:00
Hannes Janetzek c9137aa790 pack colors to array before passing to gl 2013-10-09 01:47:43 +02:00
Hannes Janetzek e4276ae9c4 avoid overflow when reading more than 64k into buffer 
(we had only two tiles where this could have happend :)
 2013-10-09 01:47:43 +02:00
Hannes Janetzek c5663df198 close polygons implicitly when using OSciMap2 database 2013-10-09 01:47:43 +02:00
Hannes Janetzek 3c5efd17bd fix buffer overflow 2013-10-09 01:47:43 +02:00
Hannes Janetzek d5b480cf22 lint changed its opinion on whether FloatMath is faster than Math. need to do some benchmarks.. 
http://code.google.com/p/android/issues/detail?id=36199
 2013-10-09 01:47:43 +02:00
Hannes Janetzek 4c458d9d1f improve dbg msg 2013-10-09 01:47:43 +02:00
Hannes Janetzek 74b5de13b8 use internal zoomLevel limits for now 2013-10-09 01:47:43 +02:00
Hannes Janetzek 7f598f5ccf - MapView now requires to setMapDatabase(MapOptions) explicitly 
- pass MapOptions when opening MapDatabase
 2013-10-09 01:47:43 +02:00
Hannes Janetzek 2ac904ecef avoid possible segv when recreating tiles (e.g. when returning to MapActivity) 2013-10-09 01:47:43 +02:00
Hannes Janetzek 17a610e06e add comments 2013-10-09 01:47:43 +02:00
Hannes Janetzek e666eb6a82 reset connection on transmission error 2013-10-09 01:47:43 +02:00
Hannes Janetzek 31f1ad661c remove old oscim protocol definition 2013-10-09 01:47:43 +02:00
Hannes Janetzek 481a5e079e disable poi symbols for tiles, currently broken and should be done in overlay 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
Hannes Janetzek 64c56ce7df always (re-)set VertexAttribArray state, solves issue with gl hanging on S3 2013-10-09 01:46:34 +02:00
Hannes Janetzek adc808f505 handle more overlay events 2013-10-09 01:46:34 +02:00
Hannes Janetzek b863882302 allow interception of all touch events 2013-10-09 01:46:34 +02:00
Hannes Janetzek 695c1532d6 a point, with floats 2013-10-09 01:40:21 +02:00
Hannes Janetzek dd64d6da26 fix: unlock tiles properly onResume 2013-10-09 01:40:21 +02:00
Hannes Janetzek 7dd171dc24 unix line delimiters 2013-10-09 01:40:21 +02:00
Hannes Janetzek 807e5c4f30 no more maxIndices per texture 2013-10-09 01:40:21 +02:00
Hannes Janetzek b7aaaef485 - improve way-labeling 
- let nomination search places instead of tags
 2013-10-09 01:40:21 +02:00
Hannes Janetzek 0eda94864f TileMapApp: improve POI overlays 2013-10-09 01:40:21 +02:00
Hannes Janetzek cbceb2c6e9 increase min-distance point reduction for overlay paths 2013-10-09 01:40:21 +02:00
Hannes Janetzek e65911fb07 fix against overflowing max polygon offset (whatever that value might be...) 2013-10-09 01:40:21 +02:00
Hannes Janetzek 5916f1be5e - extract App into separate project, make VectorTileMap a library project 
- added minimum MapActivity example
 2013-10-09 01:40:21 +02:00
Hannes Janetzek ab5962d56c add osmdroid overlays + bonuspack 2013-10-09 01:40:21 +02:00
Hannes Janetzek 65a6f91f3c project config 2013-10-09 01:40:21 +02:00
Hannes Janetzek 78aac5f019 - rename MapRenderer to TileManager and refactor 
- move overlay renderer to own package
- slight TouchHandler improvements, not start rotation when scaling
 2013-10-09 01:40:21 +02:00
Hannes Janetzek 98246fe50b - rotate multiple bitmaps to draw and upload textures 2013-10-09 01:40:19 +02:00
Hannes Janetzek 9efe46e3ba cleanups 2013-10-09 01:39:51 +02:00
Hannes Janetzek 4a06553ddc more work on overlay renderer: 
- moved text rendering to overlay
- added grid overlay
 2013-10-09 01:27:43 +02:00
Hannes Janetzek 33d8865d7b - started overlays 
- started symbol layer
- move renderer and generator out of view package
  - hopefully the last big refactoring for a while...
- improve perspective, plane should be more far away to decrease foreshortening
 2013-10-09 01:27:43 +02:00
Hannes Janetzek 2713f3bc6f show oscimapv2 backend 2013-10-09 01:22:48 +02:00
Hannes Janetzek 525af0e2a4 - no need for double precision in visible tile calculation 2013-10-09 01:22:48 +02:00
Hannes Janetzek 5c36bd7c46 improve tilt gesture detection a little 2013-10-09 01:22:48 +02:00
Hannes Janetzek 6e63158b3d theme tweaks 2013-10-09 01:22:48 +02:00
Hannes Janetzek b4dd83fc09 - improve tile locking (use ref counter instead of boolean) 
- flip over date line (inserting placeholder tiles in renderer)
- make view coordinates consistent with tile coordinates (flip on y-axis)
 2013-10-09 01:22:48 +02:00
Hannes Janetzek 5bf9deef89 - prevent possible concurrency between updateMap 'clear' tiles and onDrawFrame 
- no need to sync tile in uploadTileData anymore, now that proxies are locked properly
- cleanups
 2013-10-09 01:22:48 +02:00
Hannes Janetzek fbc39c65cb cleanups 2013-10-09 01:22:48 +02:00
Hannes Janetzek dae474922a shorten string 2013-10-09 01:22:48 +02:00
Hannes Janetzek 7b247f3af3 refactor for readability 2013-10-09 01:22:48 +02:00
Hannes Janetzek 4fafce24b8 extract compareBytes method 2013-10-09 01:22:48 +02:00
Hannes Janetzek 93d57c2577 add copyright 2013-10-09 01:22:48 +02:00
Hannes Janetzek c5e3be9d2b - started to move Matrices to MapViewPosition as these can be shared with 
MapRenderer(TileLoader) and GLRenderer.
- using inverse projection to determine visible tiles and mapping screen-coordinates to model
- making MapPosition not final, reuse instance to get Position in Map-/GLRender

added: ScanBox scanline fill used for calculating visible tiles

rename:
- ShortPool -> VertexPool
- tile.isActive -> isLocked
 2013-10-09 01:22:47 +02:00
Hannes Janetzek 8ec405cf5c - added tilt view gesture 
- use simple line shader when rotation is disabled
 2013-10-09 01:22:47 +02:00
Hannes Janetzek 7d7cf10d89 - fixed MapViewPosition scaleMap 
- fixed GLRender isVisible() for proxy tiles
- smoother scale animation
 2013-10-09 01:22:47 +02:00
Hannes Janetzek 8d57bc7531 unprojection stuff, needed for scan-line visibility checker 2013-10-09 01:22:47 +02:00
Hannes Janetzek 4a5142fdf6 keep mapfile-writer/db from bit-rotting 2013-10-09 01:22:47 +02:00
Hannes Janetzek 19344e39cf starting to add some perspective 2013-10-09 01:22:47 +02:00
Hannes Janetzek 7ac44bc3df do not cancel loading in limitCache for now 2013-10-09 01:22:47 +02:00
Hannes Janetzek 363cf8b029 add available zoomlevel to MapInfo 2013-10-09 01:22:47 +02:00
Hannes Janetzek 6ee2a85e12 fixes: 
- start MapWorkers at end of init
- check for screensize > 0 in updateMap
 2013-10-09 01:22:47 +02:00
Hannes Janetzek e54e6e1c46 MapGenerator -> TileGenerator 2013-10-09 01:22:47 +02:00
Hannes Janetzek d3f8f7ceef remove actionbar 2013-10-09 01:22:47 +02:00
Hannes Janetzek 28cc35a32d rename MapGenerator -> TileGenerator 2013-10-09 01:22:33 +02:00
Hannes Janetzek a1317a9de5 - remove swrenderer 
- rearchitect:
 now that MapView is a ViewGroup and MapRenderer is the GLSurfaceView.
- lock/unlock proxy tiles properly to not be removed from cache while in use
 2013-10-09 01:22:33 +02:00
Hannes Janetzek caea9cd7c9 move PausableThread to mapgenerator package 
- add experimental regionlookup
 2013-10-09 01:22:33 +02:00
Hannes Janetzek e2da87d8e0 switch package org.mapsforge -> org.oscim 2013-10-09 01:22:33 +02:00
Hannes Janetzek 489f07dd5d some more refactoring: 
- pass map<key,val> as settings to db open instead of mapfile
- started to clean up this 'get start position' mess
 2013-10-09 01:17:35 +02:00
Hannes Janetzek ab69675d69 fix segv... set initial map position when not in config 2013-10-09 01:17:35 +02:00
Hannes Janetzek 53636cff30 - add compass 
- add 'fix orientation' option
- bugfix segv in limitLoadQueue
- remove redundant MapController
- refactor out Location stuff from TileMap
 2013-10-09 01:17:35 +02:00
Hannes Janetzek baa40ed9ea comments and cleanups 2013-10-09 01:17:35 +02:00
Hannes Janetzek 69fe74facc - refactor: moving parts of MapRenderer that run on main thread to new TileLoader class 
- adding option for enable rotation.. still needs work
- renaming json db to test - it doesnt do json but still handy for testing
 2013-10-09 01:17:35 +02:00
Hannes Janetzek 2d90a4dea4 refactoring: MapTile -> JobTile, GLMapTile -> MapTile, TreeTile -> QuadTree 2013-10-09 01:17:35 +02:00
Hannes Janetzek d2a2dfb2f2 - MapDatabase: add writeInt to bytestring frunction, cleanups 2013-10-09 01:17:35 +02:00
Hannes Janetzek 232f4d577d cleanup 2013-10-09 01:17:35 +02:00
Hannes Janetzek 17ae9fe098 merge ScaleListener into TouchHandler 2013-10-09 01:17:35 +02:00
Hannes Janetzek 026a0674cd make tile file cache work, still not enabled 2013-10-09 01:17:34 +02:00
Hannes Janetzek 7b8a959a21 cleanup 2013-10-09 01:17:34 +02:00
Hannes Janetzek 6357c2fa2a cleanup tile cache 'limiting functions' 2013-10-09 01:17:34 +02:00
Hannes Janetzek 4763ea8989 use extrem simple and lightweight handmade http client. 2013-10-09 01:17:34 +02:00
Hannes Janetzek abfb2c9fec fix glconfigchooser for asus transformer 2013-10-09 01:17:34 +02:00
Hannes Janetzek f01f5c7bfa reuse RenderTheme cache key 2013-10-09 01:17:34 +02:00
Hannes Janetzek 9b697cc05d no control flow in shader, hth for htc 2013-10-09 01:17:34 +02:00
Hannes Janetzek c01aa685a2 improve distance function, hard to get active/proxy tiles in limitCache now 2013-10-09 01:17:34 +02:00
Hannes Janetzek 2f0270e696 vertices became smaller, decrease poolitem size 2013-10-09 01:17:34 +02:00
Hannes Janetzek 18d10e744c - add multi-linestrings / -polygons in one go 2013-10-09 01:17:34 +02:00
Hannes Janetzek 7c95930ba3 - pack line texture coordinates in least significant bits of extrusion vector 
- saving 4 bytes per vertex :)
- use premultiplied alpha,fixing issues on HTC and no reason no to use premul
- fix issue on HTC desire, went out-of-memory when setting buffer data to zero ?!
  - delete buffer and rereate instead
- use 565 color config for devices that prefer it (HTC...)
 2013-10-09 01:17:34 +02:00
Hannes Janetzek 7f469a6316 disable postgis backend 2013-10-09 01:17:34 +02:00
Hannes Janetzek 32e9d366ac bug fix: really clear depth buffer, forgot to enable depth mask 2013-10-09 01:17:34 +02:00
Hannes Janetzek 7647e1827e modify zoom-in gesture to scale from focus center 2013-10-09 01:17:34 +02:00
Hannes Janetzek b210c5ee73 remember theme preference 2013-10-09 01:17:34 +02:00
Hannes Janetzek 1a27f56313 - making oscimap default backend 
- added about-screen
- added TreeTile for Tile lookup, dropping that HashMap
- using simple line-shader instead of std-derivatives one,
  about twice as faster here
- use distance calculation from MapRenderer - removing TileScheduler
- no need for MapGeneratorJob, pass MapTile directly to MapWorkers
- added two-finger tap gestures for zoom-in/out
- added tub/tron rendertheme
- started caching for oscimap
- add x/y coordinates to MapPosition, using it in MapRenderer
- create tag hash when needed
- no need for long tile coordinates max zoomlevel 31 should suffice
 2013-10-09 01:17:34 +02:00
Hannes Janetzek 78e39af35a cancel loading when tile is removed from cache 2013-10-09 01:17:34 +02:00
Hannes Janetzek 38e2b9296c update copyright 2013-10-09 01:17:34 +02:00
Hannes Janetzek a0b7f3a4ca less logging 2013-10-09 01:17:34 +02:00
Hannes Janetzek 91ba202082 - fix adding vbo id twice to pool. null tile.vbo in clear. phew 
- improve depth buffer clipping, no more overlapping of polygons
  and use it to clip proxy tiles too
- simplify limitCache function
- linelayers, dont use systemarraycopy for small arrays
 2013-10-09 01:17:34 +02:00
Hannes Janetzek ba90664ee2 fix regression, make sure not to upload a tile that will be cleared 2013-10-09 01:17:33 +02:00
Hannes Janetzek 14fe4a6892 use half the textures, take from non-visible tiles when needed 2013-10-09 01:17:33 +02:00
Hannes Janetzek 2fccf0f214 - initial way labeling 
- add no-projection option for mapdata
- use depth buffer for line clipping to tile - no more scissor, yay!
- extract line and poly render function from maprenderer
- use one vbo for both polys and lines
- use linear interpolator for fling-scroller
- add 'exclusive' negative matcher to rendertheme
- add some more options to rendertheme, kind of inheritance at least for
  lines, see theme
- add caching for node tags -> renderinstructions
- ...
 2013-10-09 01:17:33 +02:00
Hannes Janetzek 1cf0c02dd2 - switched to using shorts instead of float/half-float 
- fixed flickering caused by stencil/scissor combination on nexus
- added blending option for areas in rendertheme
 2013-10-09 01:17:33 +02:00
Hannes Janetzek 7f573f0ac4 started work on labeling 2013-10-09 01:17:33 +02:00
Hannes Janetzek 331aa6bf68 clear all tiles on clearAndRedraw, 
cleanups
 2013-10-09 01:17:33 +02:00
Hannes Janetzek 4cae011d85 fix hanging UI on MapWorker.pause/.proceed 2013-10-09 01:17:33 +02:00
Hannes Janetzek 165221f42a tweaks 2013-10-09 01:17:33 +02:00
Hannes Janetzek 69fe443b30 pbmap: handle layer field 2013-10-09 01:17:33 +02:00