Commit Graph
100 Commits
Author SHA1 Message Date
Hannes Janetzek 75206211f8 ignore++ 2013-11-23 21:19:40 +01:00
Hannes Janetzek 0d62cc5279 add GdxMapApp.init(GdxMap, config, size) for simple test-cases 2013-11-23 21:19:40 +01:00
Hannes Janetzek eb8fd81aef use TileClipper for mapsforge tiles 2013-11-23 21:19:40 +01:00
Hannes Janetzek d44489819a add TileClipper 2013-11-23 21:19:40 +01:00
Hannes Janetzek 6a28480510 PolygonLayer: repeat pattern textures 2013-11-23 21:19:40 +01:00
Hannes Janetzek 3b92134b2a TextRenderer: handle 'clear' on update to remove all previous labels 2013-11-23 21:19:40 +01:00
Hannes Janetzek af4df27d42 fix GeometryBuffer.clear(), first index should never be -1 2013-11-23 21:19:40 +01:00
Hannes Janetzek 19ee048582 add theme debugging switch 2013-11-23 21:19:40 +01:00
Hannes Janetzek 6bc24595da place area text on polygon 2013-11-23 21:19:40 +01:00
Hannes Janetzek 03908dc437 move theme textures 2013-11-23 21:19:40 +01:00
Hannes Janetzek 82061f1410 RenderTheme:
- use Area 'stroke' for rendering
- rename style-outline to outline-layer
- add 'outline' option to line for referencing outline-layer
- Text/Symbol remove 'symbol' String, only hold TextureRegion for symbol
- rename text options: font-size to size, font-style to style
- some refactoring
2013-11-23 21:19:40 +01:00
Hannes Janetzek 0ae1f99269 disable special 'thin-line' rendering again 2013-11-23 21:19:40 +01:00
Hannes Janetzek 0762e13c0f RenderTheme: add <m select="first">
- this stops checking sub-rules after first match
- the rules renderinstruction will only applied when
  any subrule matched
2013-11-23 21:19:40 +01:00
Hannes Janetzek fc1a907af0 fix: no NPE when theme is invalid 2013-11-23 21:19:40 +01:00
Hannes Janetzek 9189cbd51c move ThemeException to IRenderTheme 2013-11-23 21:19:40 +01:00
Hannes Janetzek 18d0bfc3c5 make TileManager.jobQueue private
- use hasTileJobs(), getTileJob(), jobCompleted() instead
2013-11-23 21:19:39 +01:00
Hannes Janetzek e35f39c9f4 add BufferObject.isMaxFill(), used to reduce number of in-memory tiles 2013-11-23 21:19:39 +01:00
Hannes Janetzek af37be4502 BufferObject: 'flip' buffer automatically when position != 0 2013-11-23 21:19:39 +01:00
Hannes Janetzek c07709803c fix animateToBBox 2013-11-23 21:19:39 +01:00
Hannes Janetzek 8ab84c4e85 updates themes:
- nicer amenity area color
- add osmarender symbols
- use 'extrusion' layer styles
- keep meadow and conservation below residential
- fade wood on zoomlevel 8
2013-11-23 21:18:50 +01:00
Hannes Janetzek 5367fe4537 fix: annotations.jar missing from classpath 2013-11-23 21:11:05 +01:00
Hannes Janetzek 03f5c7fc39 ignore++ 2013-11-23 21:11:05 +01:00
Hannes Janetzek 82f169f2d5 TagSet: refactor + add docs
- removed duplicate hasKey/hasValue functions
- renamed asString -> toString
2013-11-23 21:11:05 +01:00
Hannes Janetzek a6c2ac1d41 cleanup: remove orphaned class 2013-11-23 21:11:05 +01:00
Hannes Janetzek d1fa4d426f update GWT emulation 2013-11-23 21:11:05 +01:00
Hannes Janetzek 53572671de add ThemeException, formatting 2013-11-23 21:11:04 +01:00
Hannes Janetzek b5ec02e2a0 init static fillCoordinates outside of constructor 2013-11-23 21:11:04 +01:00
Hannes Janetzek f236fa33de add 'Extrusion' RenderInstruction to RenderTheme 2013-11-23 21:11:04 +01:00
Hannes Janetzek 206003e1ec improve tag-replacement(for theme cache) in VectorTileLoader 2013-11-23 21:11:04 +01:00
Hannes Janetzek 7c090e921a remove 'heigh','minHeight' fields from MapElement 2013-11-23 21:11:04 +01:00
Hannes Janetzek 5775c8cbf3 use @CheckReturnValue for safer pool/Inlist usage 2013-11-23 21:11:04 +01:00
Hannes Janetzek d771d70c3a remove TagSet.EMTPTY 2013-11-23 21:11:04 +01:00
Hannes Janetzek 47e6602f9b add GdxMap.onKeyDown() for direct use in subclasses, should be in Map maybe 2013-11-23 21:11:04 +01:00
Hannes Janetzek f4224eb4d1 gdx: update to current libgdx API 2013-11-23 21:11:04 +01:00
Hannes Janetzek 3c3d68d073 fix warning for MatchingCacheKey.equals() 2013-11-23 21:11:04 +01:00
Hannes Janetzek 7ef611945d Tessellator: formatting, dbg-- 2013-11-23 21:11:04 +01:00
Hannes Janetzek f807e003fd TextureItem: docs 2013-11-23 21:11:04 +01:00
Hannes Janetzek 9107beff7e throw exception when layer type is invalid 2013-11-23 21:11:04 +01:00
Hannes Janetzek d7b3ef43d6 use default glCullFace 2013-11-23 21:11:04 +01:00
Hannes Janetzek 538998cb83 throw exception when BufferObjects got lost 2013-11-23 21:11:04 +01:00
Hannes Janetzek 3e4aa25446 increase MAX_ZOOM default 2013-11-23 21:11:04 +01:00
Hannes Janetzek f34d23ca18 back to default OSM service 2013-11-23 21:11:04 +01:00
Hannes Janetzek 0cf7364c78 TextRenderer: cleanup, use label in loop 2013-11-23 21:11:04 +01:00
Hannes Janetzek 620ce368b5 use CheckReturnValue for BufferObject.release() 2013-11-23 21:11:04 +01:00
Hannes Janetzek 5b2cd72940 fix: cast to long for shift 2013-11-23 21:11:04 +01:00
Hannes Janetzek 92abdbb328 also *throw* exception 2013-11-23 21:11:04 +01:00
Hannes Janetzek c1bb637fbf fix: SymbolLayer first item from prevTextures could not have been removed 2013-11-23 21:11:04 +01:00
Hannes Janetzek 9653c02b46 add PointF 2013-11-23 21:11:04 +01:00
Hannes Janetzek 1226e6c292 add MapPosition(lat,lon,scale), Map.setMapPosition(lat,lon,scale) 2013-11-23 21:11:04 +01:00
Hannes Janetzek 170e8287ab add GeometryBuffer.translate(x,y)/scale() functions 2013-11-23 21:11:04 +01:00
Hannes Janetzek 01d98cbcb7 add Color.fade(color, alpha) 2013-11-23 21:11:04 +01:00
Hannes Janetzek 32d17cca18 utils.pool: remove debug + docs 2013-11-23 21:11:03 +01:00
Hannes Janetzek 113f8180cc reset GL program and texture state each frame 2013-11-23 21:11:03 +01:00
Hannes Janetzek 4ccc8ed147 add TileSet.contains(Tile) 2013-11-23 21:11:03 +01:00
Hannes Janetzek 68cd2f345a GeometryUtils: add docs 2013-11-23 21:11:03 +01:00
Hannes Janetzek ed7ff6e7a1 improve LineLayer rendering 2013-11-23 21:11:03 +01:00
Hannes Janetzek c05710fcdb oscim.core.Tag: cleanups
- consistent String constants
2013-11-23 21:11:03 +01:00
Hannes Janetzek 2db1cf8b6c org.oscim.backend: docs and cleanups 2013-11-23 21:11:03 +01:00
Hannes Janetzek a9d9c97bff move 'fillCoordinates' and uploadLayers from MapRenderer to ElementRenderer
- handle MeshLayer in ElementRenderer
2013-11-23 21:11:03 +01:00
Hannes Janetzek c519a4f34b start of MeshLayer for 2D Meshes w/ tessellation 2013-11-23 21:11:03 +01:00
Hannes Janetzek 836f6a60e0 improve Tessellator, no more 'synchronized' needed
- pass VertexItem arrays to tessGetVertices/Indices until
  everything is fetched
- re-reverse vertices in jni
2013-11-23 21:11:03 +01:00
Hannes Janetzek 768df7f6d6 some hints for building jni 2013-11-23 21:11:03 +01:00
Hannes Janetzek 3161013481 add VertexItem.getSize() 2013-11-23 21:11:03 +01:00
Hannes Janetzek 39c0fcafea share GL reference in RenderElement 2013-11-23 21:11:03 +01:00
Hannes Janetzek 47b8a379a4 ignore++ 2013-11-23 21:11:03 +01:00
Hannes Janetzek beba45fcdf use ArrayUtils.reverse(), some cleanups and docs 2013-11-23 21:11:03 +01:00
Hannes Janetzek 4c77ae6c4b add ArrayUtils.reverse() 2013-11-23 21:11:03 +01:00
Hannes Janetzek 178f096b60 add Inlist.appendList(), rename append() to appendItem() 2013-11-23 21:11:03 +01:00
Hannes Janetzek 3782ab8f57 project settings: remove cdt builder 2013-11-23 21:11:03 +01:00
Hannes Janetzek 86a77a77d6 update to new libgdx api 2013-11-23 21:11:03 +01:00
Hannes Janetzek 0c175119b9 desktop: remove duplicated GdxGL20, wrap LwjglGL20 2013-11-23 21:11:03 +01:00
Hannes Janetzek 1fd50d1faa desktop: export jars 2013-11-23 21:11:03 +01:00
Hannes Janetzek c720cf22aa consistent formatting 2013-11-23 21:10:22 +01:00
Hannes Janetzek 57dfd91378 add TestLogger 2013-11-23 21:10:21 +01:00
Hannes Janetzek ab53fecce5 vtm-gdx: key for tronrender theme 2013-11-23 21:10:21 +01:00
Hannes Janetzek 5a602786f3 add some example code 2013-11-23 21:10:21 +01:00
Hannes Janetzek 31e1fce550 settings: formatter 2013-11-23 21:10:21 +01:00
Hannes Janetzek b7b15e120a use jars from vtm-ext-libs 2013-11-23 21:10:21 +01:00
Hannes Janetzek 973949180f add FIXME 2013-11-23 21:10:21 +01:00
Hannes Janetzek 425c12593b enable PolygonLayer pattern textures and repeat (tile_size/texture_width) times 2013-11-23 21:10:21 +01:00
Hannes Janetzek fa28799a5b fix: also clear unused ELEMENT_ARRAY vbos 2013-11-23 21:10:21 +01:00
Hannes Janetzek 5c011a2402 reduce points on-the-fly while reading from mapfile 2013-11-23 21:10:21 +01:00
Hannes Janetzek 8a2060ca6e make constructor public 2013-11-23 21:10:21 +01:00
Hannes Janetzek e40d7136f1 FIX: jogl seems to be picky about flip to limit reads 2013-11-23 21:10:21 +01:00
Hannes Janetzek 7e6833d5fd try to load external themes from asset path first 2013-11-23 21:10:21 +01:00
Hannes Janetzek 21020abcbd theme: add osmarender patterns 2013-11-23 21:10:21 +01:00
Hannes Janetzek da4d1c1ee7 use libtess-jni in ExtrusionLayer, remove Triangle 2013-11-23 21:10:20 +01:00
Hannes Janetzek bc3885cd54 remove commented code 2013-11-23 21:10:20 +01:00
Hannes Janetzek 8cc115a108 fix: make updateAnimation synchronized 2013-11-23 21:10:20 +01:00
Hannes Janetzek 4aae6c0a09 fix MapAnimator: ensure 'adv' is within 0..1 2013-11-23 21:10:20 +01:00
Hannes Janetzek 3608e49885 formatting 2013-11-23 21:10:20 +01:00
Hannes Janetzek df9d94ac51 simplify LayerRenderer, move setMatrix to ElementRenderer 2013-11-23 21:10:20 +01:00
Hannes Janetzek 19b32adc34 add docs 2013-11-23 21:10:20 +01:00
Hannes Janetzek 5ce9024eae use MapRenderer.frametime 2013-11-23 21:10:20 +01:00
Hannes Janetzek c093fe3b0c add TouchListener Interface 2013-11-23 21:10:20 +01:00
Hannes Janetzek ba9300da91 API: remove Map.setMapCenter() -> use Map.setMapPosition 2013-11-23 21:10:20 +01:00
Hannes Janetzek 510c201e17 jni: add missing include 2013-11-23 21:10:20 +01:00
Hannes Janetzek 7dde869f4a refactor: utils.GlUtils -> renderer.GLUtils, utils.Matrix4 -> renderer.GLMatrix
- init 'GL' handle of rendering classes in MapRenderer.onSurfaceCreated,
  at this point handle is safe to use, i.e. GL context is available
- all LayerRenderer share one static 'GL' field now
2013-11-23 21:10:20 +01:00
Hannes Janetzek 83a276becf cleanups 2013-11-23 21:10:20 +01:00
Hannes Janetzek 4fadd929ee add docs 2013-11-23 21:10:20 +01:00