xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename RenderOverlay -> RenderLayer

Browse Source
This commit is contained in:
Hannes Janetzek 2013-04-28 04:53:29 +02:00
parent b3f4ee444c
commit 9824aa72e5
9 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/oscim/layers/tile/TileRenderLayer.java
View File

@ -20,13 +20,13 @@ import static org.oscim.layers.tile.MapTile.STATE_READY;
import org.oscim.core.MapPosition;
import org.oscim.renderer.BufferObject;
import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.RenderLayer;
import org.oscim.renderer.GLRenderer.Matrices;
import org.oscim.renderer.overlays.RenderOverlay;
import org.oscim.utils.ScanBox;
import org.oscim.view.MapView;
import android.util.Log;
public class TileRenderLayer extends RenderOverlay {
public class TileRenderLayer extends RenderLayer {
private final static String TAG = TileRenderLayer.class.getName();
private final float[] mBoxCoords;

4
src/org/oscim/overlay/GenericOverlay.java
View File

@ -14,7 +14,7 @@
*/
package org.oscim.overlay;
import org.oscim.renderer.overlays.RenderOverlay;
import org.oscim.renderer.RenderLayer;
import org.oscim.view.MapView;
public class GenericOverlay extends Overlay {
@ -24,7 +24,7 @@ public class GenericOverlay extends Overlay {
* @param renderer
* ...
*/
public GenericOverlay(MapView mapView, RenderOverlay renderer) {
public GenericOverlay(MapView mapView, RenderLayer renderer) {
super(mapView);
mLayer = renderer;
}

10
src/org/oscim/renderer/GLRenderer.java
View File

@ -31,7 +31,6 @@ import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
import org.oscim.layers.tile.MapTile;
import org.oscim.renderer.layer.Layers;
import org.oscim.renderer.overlays.RenderOverlay;
import org.oscim.theme.IRenderTheme;
import org.oscim.utils.GlUtils;
import org.oscim.utils.Matrix4;
@ -266,20 +265,21 @@ public class GLRenderer implements GLSurfaceView.Renderer {
}
}
/* update overlays */
RenderOverlay[] overlays = mMapView.getOverlayManager().getRenderLayers();
/* update layers*/
RenderLayer[] overlays = mMapView.getOverlayManager().getRenderLayers();
for (int i = 0, n = overlays.length; i < n; i++)
overlays[i].update(mMapPosition, positionChanged, tilesChanged, mMatrices);
/* draw overlays */
/* draw layers */
for (int i = 0, n = overlays.length; i < n; i++) {
RenderOverlay renderLayer = overlays[i];
RenderLayer renderLayer = overlays[i];
if (renderLayer.newData) {
renderLayer.compile();
renderLayer.newData = false;
}
if (renderLayer.isReady)
renderLayer.render(mMapPosition, mMatrices);
}

7
src/org/oscim/renderer/overlays/RenderOverlay.java → src/org/oscim/renderer/RenderLayer.java
View File

@ -12,15 +12,14 @@
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.renderer.overlays;
package org.oscim.renderer;
import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.GLRenderer.Matrices;
import org.oscim.view.MapView;
public abstract class RenderOverlay {
public abstract class RenderLayer {
protected final MapView mMapView;
// keep the Position for which the Overlay is rendered
@ -32,7 +31,7 @@ public abstract class RenderOverlay {
// flag set by GLRenderer when data is compiled
public boolean isReady;
public RenderOverlay(MapView mapView) {
public RenderLayer(MapView mapView) {
mMapView = mapView;
mMapPosition = new MapPosition();
}

3
src/org/oscim/renderer/overlays/BasicOverlay.java
View File

@ -17,6 +17,7 @@ package org.oscim.renderer.overlays;
import org.oscim.core.MapPosition;
import org.oscim.renderer.BufferObject;
import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.RenderLayer;
import org.oscim.renderer.GLRenderer.Matrices;
import org.oscim.renderer.GLState;
import org.oscim.renderer.layer.Layer;
@ -31,7 +32,7 @@ import org.oscim.view.MapView;
import android.opengl.GLES20;
// Base class to use the Layers drawing 'API'
public abstract class BasicOverlay extends RenderOverlay {
public abstract class BasicOverlay extends RenderLayer {
public final Layers layers;

3
src/org/oscim/renderer/overlays/CustomOverlay.java
View File

@ -21,6 +21,7 @@ import java.nio.FloatBuffer;
import org.oscim.core.MapPosition;
import org.oscim.renderer.GLRenderer.Matrices;
import org.oscim.renderer.GLState;
import org.oscim.renderer.RenderLayer;
import org.oscim.utils.GlUtils;
import org.oscim.view.MapView;
@ -33,7 +34,7 @@ import android.opengl.GLES20;
* https://github.com/dalinaum/opengl-es-book-samples/tree/master/Android
* */
public class CustomOverlay extends RenderOverlay {
public class CustomOverlay extends RenderLayer {
private int mProgramObject;
private int hVertexPosition;

3
src/org/oscim/renderer/overlays/ExtrusionOverlay.java
View File

@ -25,6 +25,7 @@ import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.TileRenderLayer;
import org.oscim.layers.tile.TileSet;
import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.RenderLayer;
import org.oscim.renderer.GLRenderer.Matrices;
import org.oscim.renderer.GLState;
import org.oscim.renderer.layer.ExtrusionLayer;
@ -37,7 +38,7 @@ import android.util.Log;
/**
* @author Hannes Janetzek
*/
public class ExtrusionOverlay extends RenderOverlay {
public class ExtrusionOverlay extends RenderLayer {
private final static String TAG = ExtrusionOverlay.class.getName();
private final TileRenderLayer mTileLayer;

3
src/org/oscim/renderer/overlays/ViewOverlay.java
View File

@ -15,10 +15,11 @@
package org.oscim.renderer.overlays;
import org.oscim.core.MapPosition;
import org.oscim.renderer.RenderLayer;
import org.oscim.renderer.GLRenderer.Matrices;
import org.oscim.view.MapView;
public class ViewOverlay extends RenderOverlay {
public class ViewOverlay extends RenderLayer {
public ViewOverlay(MapView mapView) {

10
src/org/oscim/view/LayerManager.java
View File

@ -24,7 +24,7 @@ import org.oscim.core.PointF;
import org.oscim.layers.InputLayer;
import org.oscim.layers.Layer;
import org.oscim.overlay.Overlay.Snappable;
import org.oscim.renderer.overlays.RenderOverlay;
import org.oscim.renderer.RenderLayer;
import android.content.Context;
import android.util.Log;
@ -78,9 +78,9 @@ public class LayerManager extends AbstractList<Layer> implements OnGestureListen
}
private boolean mDirtyLayers;
private RenderOverlay[] mDrawLayers;
private RenderLayer[] mDrawLayers;
public RenderOverlay[] getRenderLayers() {
public RenderLayer[] getRenderLayers() {
if (mDirtyLayers)
updateLayers();
@ -123,12 +123,12 @@ public class LayerManager extends AbstractList<Layer> implements OnGestureListen
mLayers[i] = o;
}
mDrawLayers = new RenderOverlay[numRenderLayers];
mDrawLayers = new RenderLayer[numRenderLayers];
mInputLayer = new InputLayer[numInputLayers];
for (int i = 0, cntR = 0, cntI = 1, n = mLayerList.size(); i < n; i++) {
Layer o = mLayerList.get(i);
RenderOverlay l = o.getLayer();
RenderLayer l = o.getLayer();
if (l != null)
mDrawLayers[cntR++] = l;