xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,848 Commits 1 Branch 24 Tags
c3cf2885483a2649730eaf162096105fa59ba381
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannes Janetzek c3cf288548 disable use of glBufferSubData for all adreno 3xx 
- should fix the issue reported for galaxy 4 mini
 2015-04-22 06:37:28 +02:00
Hannes Janetzek 1bb112e685 fix: line shader must have highp 2015-04-22 06:33:06 +02:00
Hannes Janetzek 00ceb9f359 fix overflow: use int offsets in TextureItem 
should fix #144

- using quad-indices the offsets are not limited to max vertex ids
 2015-03-19 14:16:56 +01:00
Hannes Janetzek 35c22e68dc update gradle, fix #142 jeo dependencies 
- featuring: travis makin trouble
 2015-03-19 14:16:35 +01:00
Hannes Janetzek ecc26caec0 example: add MapScaleBar 2014-12-04 00:43:53 +01:00
Hannes Janetzek d32b13fed4 fix: GLViewport.useScreenCoordinates 
- fixes: MapScaleBar not being visible
 2014-12-04 00:41:03 +01:00
Hannes Janetzek 711ca7f6d9 gradle: more fun 2014-11-20 01:01:27 +01:00
Hannes Janetzek aaec15a66a gradle: fix vtm-android install + generate source jars 2014-11-20 00:27:48 +01:00
Hannes Janetzek 77f383913d fix: lost labels 2014-11-20 00:26:42 +01:00
Hannes Janetzek e6d42a5a61 gradle: warn when submodules are missing 
- sth better than 'Configuration with name 'default' not found'
 2014-11-17 19:00:28 +01:00
Hannes Janetzek ef391a3994 gradle: update android tooling 2014-11-17 18:51:22 +01:00
Hannes Janetzek 6c98e600bc example: add building layer to mapforge example 2014-11-12 06:40:13 +01:00
Hannes Janetzek 1d5fa4b9db mapsforge: remove duplicate points 2014-11-12 06:38:58 +01:00
Hannes Janetzek a492aaa733 GeometryBuffer: add simplify() method 2014-11-12 06:38:29 +01:00
Hannes Janetzek 424126216c fix: Viewport.getDepth() for y == 0 2014-11-12 05:39:01 +01:00
Hannes Janetzek c3ac8a412c PolygonBucket: dont test bbox visibility with overzoom > 2 
- workaround: seems there can be some overflow in GLMatrix.prj2d()
 2014-11-12 05:38:36 +01:00
Hannes Janetzek 3178787954 mapsforge: refactor MapDatabase 
Conflicts:
	vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
 2014-11-12 05:38:36 +01:00
Hannes Janetzek 4fdae2a94c mapsforge: also need to clip lines to avoid overflow 2014-11-12 05:38:36 +01:00
Hannes Janetzek 68fe1f8b8a mapsforge: estimate whether a closed way is line or polygon 
- refactor projection
- cleanups
 2014-11-04 19:02:43 +01:00
Hannes Janetzek ef34ba9766 fix: dont limit tile overzoom 2014-11-04 19:01:42 +01:00
Hannes Janetzek bf2909585b gradle: update GWT 2014-11-03 01:36:24 +01:00
Hannes Janetzek a85b435fb6 remove zoomMin/zoomMax from TileManager constructor 2014-11-03 01:36:03 +01:00
Hannes Janetzek 4c78f8652b fix: UrlTileSource.Builder was hiding zoom values from TileSource.Builder 
- values set thorugh builder.minZoom()/maxZoom() were ignored

should fix: #120
 2014-11-03 01:32:56 +01:00
Hannes Janetzek f4ffac44d2 gradle: update to 2.1 and android targetSdk 21 
- add android-appcompat subproject
 2014-10-24 21:38:47 +02:00
Hannes Janetzek 0bc45dfd74 fix: polygon texture default fill 2014-10-13 23:36:34 +02:00
Hannes Janetzek df909daccb theme: tweaks 2014-10-10 20:33:18 +02:00
Hannes Janetzek fa62602826 Canvas: pass fill+stroke for drawing text 2014-10-10 19:58:14 +02:00
Hannes Janetzek a8641ce535 playground: mapzen style map 2014-10-10 18:07:43 +02:00
Hannes Janetzek bbe6067569 fix: show tiles at the highest scale 
need to investigate the real cause..
 2014-10-10 17:31:48 +02:00
Hannes Janetzek f7b539f5c7 updated default theme: 
- use textures for slight roughness of 'natural' features
- increase font size
 2014-10-10 17:31:48 +02:00
Hannes Janetzek 78d438dfe6 pass fx option with S3DBLayer constructor 2014-10-10 17:31:48 +02:00
Hannes Janetzek a098e669c3 ExtrusionLayer: animate when loaded 2014-10-10 17:31:48 +02:00
Hannes Janetzek 3f3dca30d7 add Color.isOpaque util 2014-10-10 17:31:47 +02:00
Hannes Janetzek 7b9301d479 PolygonBucket: enable fade and tinting of textured polygons 2014-10-10 17:31:47 +02:00
Hannes Janetzek 01a41d5f87 android-example: reenable cache.. 2014-10-10 17:31:47 +02:00
Hannes Janetzek 0b1fba58bb fix: AreaStyle blend 2014-10-10 17:31:47 +02:00
Hannes Janetzek 29f19b36ce wip: StyleBuilder 2014-10-10 17:31:47 +02:00
Hannes Janetzek 1ded32d303 fixup: area fade 2014-10-10 17:31:47 +02:00
Hannes Janetzek ffe14e11d5 bring vtm-android-gdx back to life 2014-10-10 17:31:47 +02:00
Hannes Janetzek 846d90f9fe nicer gl api 
- java class name should suffice as namespace
- also use import static gl instance seems to work now with Gwt
 2014-10-10 03:23:37 +02:00
Hannes Janetzek b2008aa086 use MAX_INDICES with bindQuadIndices() 2014-10-10 03:23:30 +02:00
Hannes Janetzek b0ee833301 wip: Bucket API 2014-10-10 03:23:17 +02:00
Hannes Janetzek 9d86c6306d VertexData: float params add() versions 2014-10-10 03:23:06 +02:00
Hannes Janetzek 03f6f96988 add option for non-billboard MarkerSymbols 2014-10-10 03:22:34 +02:00
Hannes Janetzek 113ea64297 TileManager: allow setting zoomlevel-switch thresholds 2014-10-09 10:11:51 +02:00
Hannes Janetzek 7f2f798a94 fix: 'load parent by default' 
- dont load parent when using zoom-level table
- only load parent when over-scale is less than 1.5
 2014-10-09 10:01:45 +02:00
Hannes Janetzek de04030257 android-example: enable building layer 2014-10-09 04:01:58 +02:00
Hannes Janetzek 7053cf8405 android: convert unsupported bitmap formats 
- might fix png8 on older devices
 2014-10-09 03:44:05 +02:00
Hannes Janetzek ded178be6c TileManager: just drop index on re-init 
- dont modify index of locked tiles..
- fixes one more bug from monkey test
 2014-10-09 03:19:03 +02:00
Hannes Janetzek d1daa92126 TileManager: load parent by default 2014-10-09 03:11:08 +02:00
Hannes Janetzek 5a4e422740 fix: TileGridLayer without text 
- lines were not set..

fixes #111
 2014-10-04 19:52:19 +02:00
Hannes Janetzek 9b5d31bcf3 useless sync 2014-10-03 07:30:01 +02:00
Hannes Janetzek de24860ad4 dead is dead 2014-10-03 07:30:01 +02:00
Hannes Janetzek 1a4ec3f7ad fix: one more missing sync 2014-10-03 07:29:51 +02:00
Hannes Janetzek 8f6f1bf238 android monkey tests 2014-10-03 05:19:13 +02:00
Hannes Janetzek 82525ec769 limit OSciMap min zoom-level 2014-10-03 05:19:13 +02:00
Hannes Janetzek 26cb2e6603 simplify PausableThread 
- make pausing work properly
 2014-10-03 05:19:13 +02:00
Hannes Janetzek 33c645e888 close UrlTile conn on cancel 
- synchronize connect() and close()
 2014-10-03 05:19:12 +02:00
Hannes Janetzek 71715dccd9 fixing MapTile state logic 2014-10-03 05:19:12 +02:00
Hannes Janetzek 5f9a9cc909 TileLoader/TileDataSource: add cancel() method 
- used to force closing sockets when changing theme or tilesource
 2014-10-03 05:19:12 +02:00
Hannes Janetzek 41085f915e LwHttp: increase timeouts 
- wip: HttpEngine docs
 2014-10-01 10:00:10 +02:00
Hannes Janetzek 5109eda6da fix: TileManager reload failed tiles 
- properly clear previous TileSet
- CANCEL state tiles will be cleared when they return from tile-worker
 2014-10-01 09:59:55 +02:00
Hannes Janetzek e20a342f81 fix: PolygonBucket screen intersection test 
- actually make a box
 2014-10-01 09:59:40 +02:00
Hannes Janetzek 85377b42c4 fix: use fadeTime from original tile 2014-09-20 06:16:27 +02:00
Hannes Janetzek cb3296ebdd playground tests 2014-09-20 02:23:32 +02:00
Hannes Janetzek a8400dd48a TileManager: 
- set zoomMin/Max for current TileSource
- add zoom-level switch threshold
- add TileManager.getTile()
- remove releaseTiles()
- extract JobCompletedEvent from anonymous class
 2014-09-20 02:23:32 +02:00
Hannes Janetzek 3fa121d31a VectorTileLoader: dont add faded out polygon layers 2014-09-20 02:23:31 +02:00
Hannes Janetzek 8303a611ea TileRenderer: get correct fade-time for proxies 2014-09-20 02:23:31 +02:00
Hannes Janetzek 2aa75ddbf5 MeshBucket: add special add() for convex polygon 2014-09-20 02:23:31 +02:00
Hannes Janetzek b5214ef35a MeshBucket: use blend/fade color 2014-09-20 02:23:31 +02:00
Hannes Janetzek e32f45b585 S3DB/Buildings: 
- allow multiple building extrusion buckets per tile
  (differently colored buildings depending on tags)
- fixed ExtrusionBucket index offsets
- rename more layer -> bucket
 2014-09-20 02:23:31 +02:00
Hannes Janetzek 84c094000b OffscreenRenderer: use depthTexture for SSAO modes 2014-09-20 02:23:31 +02:00
Hannes Janetzek 3577e648d1 make LayerRenderer methods public to enable composition 2014-09-20 02:23:31 +02:00
Hannes Janetzek c632b865b0 PolygonBucket: reenable per bucket visibility test 2014-09-20 02:23:31 +02:00
Hannes Janetzek 33c48b3d53 BucketRenderer: add default implementation for update() 
- handy for simple (debug) layers
 2014-09-20 02:23:30 +02:00
Hannes Janetzek 2317975c63 RenderBuckets: add clearBuckets 2014-09-20 02:23:30 +02:00
Hannes Janetzek b031f98fff fixup: layer -> bucket variable names 2014-09-20 02:23:30 +02:00
Hannes Janetzek b057c56466 fix: BucketRenderer unified base/tex buckets 2014-09-20 02:23:30 +02:00
Hannes Janetzek a60f326e16 RenderBuckets: optimization 
- start search from current when searched level is greater than current
 2014-09-20 02:23:30 +02:00
Hannes Janetzek 66653df3dc fix: dont let TextureBuckets interfere with other bucket 'levels' 
- make TextureLayer.textures protected
 2014-09-20 02:23:30 +02:00
Hannes Janetzek 3a30476f7e GLState: track buffer bindings 
- reset buffer bindings at frame start
 2014-09-20 02:23:30 +02:00
Hannes Janetzek 3f8b028d60 RenderBuckets: unify baseBuckets and textureBuckets 
... finally
 2014-09-20 02:23:30 +02:00
Hannes Janetzek f6d85ce8bd refactor: rename render 'layers' to 'buckets' 
- the name I was looking for for a long time :)
  also less confusion with map layers
- move renderer.elements -> renderer.bucket
- rename RenderBuckets functions
- rename BucketRenderer.layers -> buckets
 2014-09-20 01:31:07 +02:00
Hannes Janetzek b4a567884f unify Indexed- and RenderElement 
- remove IndexedRenderElement

- ExtrusionLayer: clear temporary data in prepare()
  - ie. dont wait to release shared Vertexs until compile()
- ExtrusionLayer: make naming consistent with ElementLayers
  - in particular use of 'numIndices', 'numVertices'
 2014-09-20 01:31:06 +02:00
Hannes Janetzek 8741357c9a GL20: fix parameter name indices -> offset 2014-09-20 01:31:06 +02:00
Hannes Janetzek 20afbfe230 use new Tessellator for Mesh- and ExtrusionLayer 2014-09-20 01:31:06 +02:00
Hannes Janetzek 7db70f239f jni: new Tesselator 2014-09-20 01:31:06 +02:00
Hannes Janetzek 59ab24da90 jni: add GLMatrix proj2d/3d 2014-09-20 01:07:03 +02:00
Hannes Janetzek c34bc3306c RenderElement: docs 2014-09-20 01:07:03 +02:00
Hannes Janetzek 31a45b0468 add ElementLayer/RenderElement prepare() 
- used to prepare for compile() when all layer data is added
 2014-09-20 01:07:03 +02:00
Hannes Janetzek 990e04477c GeometryBuffer: switch to int[] indices 2014-09-20 01:07:03 +02:00
Hannes Janetzek 7be8155939 GeometryBuffer: 
- add getPoint(i, point)
- addPoint(PointF)
- getPointX/Y

GeomBuffer: api
 2014-09-20 01:07:03 +02:00
Hannes Janetzek d6cf845fef PolygonLayer optimizations: 
- check of polygon elements are visible
- use AreaStyle.hasAlpha() to enable blending
- GLState.testDepth()
- LineClipper: add outcode(x,y)
 2014-09-20 01:07:03 +02:00
Hannes Janetzek 01830707dc MapRenderer: refactor native buffer utils 2014-09-20 01:07:02 +02:00
Hannes Janetzek a835d44187 VertexData: docs 
- remove superfluous static get()
 2014-09-20 01:07:02 +02:00
Hannes Janetzek 123b0aa098 renderer: cleanups 2014-09-20 01:07:02 +02:00
Hannes Janetzek e645696adb MapRenderer: increase shared quad vertices 2014-09-20 01:07:02 +02:00
Hannes Janetzek e830252c85 wip: use HairLine for PolygonLayer outlines 2014-09-20 01:07:02 +02:00
Hannes Janetzek 7bf2544a83 PolygonLayer: cleanups 2014-09-20 01:07:02 +02:00
Hannes Janetzek b69923e05d PolygonLayer: separate drawing of stencil clip region 2014-09-20 01:07:02 +02:00