Support libgdx 1.9.11
This commit is contained in:
parent
43b52de5d8
commit
4dfabfed22
@ -6,7 +6,7 @@ allprojects {
|
|||||||
group = 'org.mapsforge'
|
group = 'org.mapsforge'
|
||||||
version = 'master-SNAPSHOT'
|
version = 'master-SNAPSHOT'
|
||||||
|
|
||||||
ext.gdxVersion = "1.9.10"
|
ext.gdxVersion = "1.9.11"
|
||||||
ext.gwtVersion = "2.8.2"
|
ext.gwtVersion = "2.8.2"
|
||||||
ext.slf4jVersion = "1.7.28"
|
ext.slf4jVersion = "1.7.28"
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ public class GdxModelRenderer extends LayerRenderer {
|
|||||||
cam = new MapCamera(mMap);
|
cam = new MapCamera(mMap);
|
||||||
|
|
||||||
renderContext =
|
renderContext =
|
||||||
new RenderContext(new DefaultTextureBinder(DefaultTextureBinder.WEIGHTED, 1));
|
new RenderContext(new DefaultTextureBinder(DefaultTextureBinder.LRU, 1));
|
||||||
|
|
||||||
// shader = new DefaultShader(renderable.material,
|
// shader = new DefaultShader(renderable.material,
|
||||||
// renderable.mesh.getVertexAttributes(), true, false, 1, 0, 0, 0);
|
// renderable.mesh.getVertexAttributes(), true, false, 1, 0, 0, 0);
|
||||||
|
@ -61,7 +61,7 @@ public class GdxRenderer3D extends LayerRenderer {
|
|||||||
cam = new MapCamera(mMap);
|
cam = new MapCamera(mMap);
|
||||||
|
|
||||||
renderContext =
|
renderContext =
|
||||||
new RenderContext(new DefaultTextureBinder(DefaultTextureBinder.WEIGHTED, 1));
|
new RenderContext(new DefaultTextureBinder(DefaultTextureBinder.LRU, 1));
|
||||||
|
|
||||||
// shader = new DefaultShader(renderable.material,
|
// shader = new DefaultShader(renderable.material,
|
||||||
// renderable.mesh.getVertexAttributes(), true, false, 1, 0, 0, 0);
|
// renderable.mesh.getVertexAttributes(), true, false, 1, 0, 0, 0);
|
||||||
|
@ -580,7 +580,7 @@ public class GdxGL extends GwtGL20 implements GL {
|
|||||||
return glGetActiveAttrib(program,
|
return glGetActiveAttrib(program,
|
||||||
index,
|
index,
|
||||||
size,
|
size,
|
||||||
type);
|
(IntBuffer)type);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -588,7 +588,7 @@ public class GdxGL extends GwtGL20 implements GL {
|
|||||||
return glGetActiveUniform(program,
|
return glGetActiveUniform(program,
|
||||||
index,
|
index,
|
||||||
size,
|
size,
|
||||||
type);
|
(IntBuffer)type);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -179,7 +179,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
|||||||
lastWidth = graphics.getWidth();
|
lastWidth = graphics.getWidth();
|
||||||
lastHeight = graphics.getHeight();
|
lastHeight = graphics.getHeight();
|
||||||
Gdx.app = this;
|
Gdx.app = this;
|
||||||
Gdx.audio = new GwtAudio();
|
Gdx.audio = new DefaultGwtAudio();
|
||||||
Gdx.graphics = graphics;
|
Gdx.graphics = graphics;
|
||||||
Gdx.gl20 = graphics.getGL20();
|
Gdx.gl20 = graphics.getGL20();
|
||||||
Gdx.gl = Gdx.gl20;
|
Gdx.gl = Gdx.gl20;
|
||||||
|
@ -184,6 +184,26 @@ public class GwtGraphics implements Graphics {
|
|||||||
return canvas.getHeight();
|
return canvas.getHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSafeInsetLeft() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSafeInsetTop() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSafeInsetBottom() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSafeInsetRight() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long getFrameId() {
|
public long getFrameId() {
|
||||||
return frameId;
|
return frameId;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user