3129 Commits

Author SHA1 Message Date
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