Commit Graph
100 Commits
Author SHA1 Message Date
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
Hannes Janetzek f049673412 add file header 2013-11-23 21:10:20 +01:00
Hannes Janetzek 43de62f4bc use Closeable interface in IOUtils 2013-11-23 21:10:20 +01:00
Hannes Janetzek eab0f5e87a remove unused functions 2013-11-23 21:10:20 +01:00
Hannes Janetzek 57b94e1d5d theme: use our schema 2013-11-23 21:10:20 +01:00
Hannes Janetzek 0dc0ec9394 cleanup VectorTileLoader 2013-11-23 21:10:20 +01:00
Hannes Janetzek eada09d060 API: SymbolItem add set(x,y,symbol,billboard) 2013-11-23 21:10:20 +01:00
Hannes Janetzek 61e9deb101 use new GeometryBuffer functions 2013-11-23 21:10:20 +01:00
Hannes Janetzek 949ebb5d8e API: GeometryBuffer add getNumPoints(), getPoint():PointF
- ignore start of new geometry when the current is empty
2013-11-23 21:10:20 +01:00
Hannes Janetzek 1a4e3b4c7c combine mStrokeScale and mLineScaleFactor 2013-11-23 21:10:20 +01:00
Hannes Janetzek d91402da3c add getters for MapTile state, modify 'state' only within package
- clear tile in TileManager when loading has failed
2013-11-23 21:10:19 +01:00
Hannes Janetzek 0107ade039 fix MapAnimator.animateTo()
- cleanups
2013-11-23 21:10:19 +01:00
Hannes Janetzek f6bb944907 API: add TileSet.{lockTiles,releaseTiles,setTiles} 2013-11-23 21:10:19 +01:00
Hannes Janetzek e5761ef601 fix warnings, cleanups 2013-11-23 21:10:19 +01:00
Hannes Janetzek 1421a1f6b6 API: remove TileSource.getMapInfo(), cleanups
- move MapInfo to mapfile package
2013-11-23 21:10:19 +01:00
Hannes Janetzek 1738bfd0bc remove DebugSettings class 2013-11-23 21:10:19 +01:00
Hannes Janetzek 4f1b3f262b refactor and document Map
- merge Layers into Map
- change UpdateEvent to Map.UpdateListener
- make updateLayers protected
2013-11-23 21:10:19 +01:00
Hannes Janetzek 9a82c24a89 cleanup and document Viewport
- rename project() to toScreenPoint()
2013-11-23 21:10:19 +01:00
Hannes Janetzek 3b5539da22 cleanup: unused code 2013-11-23 21:10:19 +01:00
Hannes Janetzek b71ef1667c remove obsolete class 2013-11-23 21:10:19 +01:00
Hannes Janetzek 96b582b58d fix function signature 2013-11-23 21:10:19 +01:00
Hannes Janetzek 7a35bb48b1 API: PolygonLayer add addPolygon(GeometryBuffer) 2013-11-23 21:10:19 +01:00
Hannes Janetzek 15aa35e56f API: LayerRenderer add isReady() 2013-11-23 21:10:19 +01:00
Hannes Janetzek 7f4cdc86bc workaround: strip shader 'precision' qualifier for desktop GL 2013-11-23 21:10:19 +01:00
Hannes Janetzek 131876463a add jni build instructions and remove build files 2013-11-23 21:10:19 +01:00
Hannes Janetzek 36a721a8e1 fixup Layer 2013-11-23 21:10:19 +01:00
Hannes Janetzek a660048bcb gdx: simplify sub-classing GdxMap apps, add createLayers() 2013-11-23 21:10:19 +01:00
Hannes Janetzek 1498325ecd settings: export libs and projects 2013-11-23 21:10:19 +01:00
Hannes Janetzek 1c0315cd54 docs 2013-11-23 21:10:19 +01:00
Hannes Janetzek d50a6fa203 fix: assets path links for eclipse 2013-11-23 21:10:19 +01:00
Hannes Janetzek 876b8b6d37 refactor: IRenderCallback -> IRenderTheme.Callback
- more consistent function names
2013-11-23 21:10:19 +01:00
Hannes Janetzek 1137f48882 fix: ensure that variables are not modified while rendering 2013-11-23 21:10:19 +01:00
Hannes Janetzek 2f9e303889 refactor: for -> while 2013-11-23 21:10:19 +01:00
Hannes Janetzek 027c2e7618 theme: change some theme attribute names and fix renderTheme.xsd
- element '<use-* name="x">' changed to <* use="x">
- style 'name' attribute changed to 'id'
2013-11-23 21:10:18 +01:00
Hannes Janetzek 8fe8c3a1f2 refactor: merge BitmapUtils.createBitmap() into CanvasAdapter 2013-11-23 21:10:18 +01:00
Hannes Janetzek 0f52eff9c9 comment out all InputLayer stuff 2013-11-23 21:10:18 +01:00
Hannes Janetzek 4e01de31f7 some event mechanism 2013-11-23 21:10:18 +01:00
Hannes Janetzek 5389f59df0 jni: use double coordinates in Triangle. try to return safely when internal error occured 2013-11-23 21:10:18 +01:00
Hannes Janetzek 67a3cbadf7 package/naming reorganization:
- RenderLayer -> LayerRenderer
  as this LayerRenderer just the rendering implementation of a Layer
  - not a 'layer' itself
- move renderer.sublayer.*Renderer into their respective *Layer classes
- move layers.labeling to layers.tile.vector.labeling
  (until there is a common labeling framework)
- remove layers.overlay
  - move Marker stuff to layers.marker
- merge TileRenderer into TileRenderLayer

- rename renderer.sublayers to renderer.elements
- move layers.tile.* to tiling package
- move tilesource.* to tiling.source

- rename oscim.view -> oscim.map
2013-11-23 21:09:30 +01:00
Hannes Janetzek c6eedc4df7 eclipse: link relative assets path 2013-10-09 02:38:01 +02:00
Hannes Janetzek 7c0e1540cb RenderTheme: ignore missing symbol atlas for now. formatting 2013-10-09 02:38:01 +02:00
Hannes Janetzek d05c4ad0d1 return null when asset cannot be read 2013-10-09 02:38:01 +02:00
Hannes Janetzek 6f2f74089b theme: start porting osmarender theme 2013-10-09 02:38:01 +02:00
Hannes Janetzek e43545eec9 html: fix
- maybe some 'dependency injection' might help here
  behaviour of static vars is kind of nasty with GWT
2013-10-09 02:38:01 +02:00
Hannes Janetzek 3eca8ee8b4 remove orphaned classes 2013-10-09 02:38:01 +02:00
Hannes Janetzek 0aa7818731 API change: RenderLayer
- use setReady(bool) instead of public field
- no more implicit call to compile() when 'newData' is true
  -> call compile() when needed
- make RenderLayer function protected
2013-10-09 02:38:01 +02:00
Hannes Janetzek eb1e8b63c5 refactor: extract animation stuff from Viewport into MapAnimator 2013-10-09 02:38:01 +02:00
Hannes Janetzek 51c2c5d62a optimize: inline temporary variable in shader 2013-10-09 02:38:01 +02:00
Hannes Janetzek 2474fe621b ITileCache: remove setStoragePath from API 2013-10-09 02:38:01 +02:00
Hannes Janetzek 6fbfeb2848 refactor: change Layer.destroy to Layer.onDetach 2013-10-09 02:38:01 +02:00
Hannes Janetzek d397624fdc refactor: PointD -> Point, remove PointF 2013-10-09 02:38:00 +02:00
Hannes Janetzek e203f2916d cleanup and formatting 2013-10-09 02:38:00 +02:00
Hannes Janetzek 819189b706 refactor: rename variable 2013-10-09 02:38:00 +02:00
Hannes Janetzek fba6f44f30 cleanup + formatting 2013-10-09 02:38:00 +02:00