vtm-gdx-poi3d module (#600)
This commit is contained in:
@@ -17,6 +17,7 @@ sourceSets {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
providedCompile project(':vtm-gdx-poi3d')
|
||||
providedCompile project(':vtm-web')
|
||||
providedCompile 'ru.finam:slf4j-gwt:1.7.7.1'
|
||||
}
|
||||
@@ -25,6 +26,8 @@ dependencies {
|
||||
evaluationDependsOn(':vtm')
|
||||
evaluationDependsOn(':vtm-themes')
|
||||
evaluationDependsOn(':vtm-gdx')
|
||||
evaluationDependsOn(':vtm-gdx-poi3d')
|
||||
evaluationDependsOn(':vtm-models')
|
||||
evaluationDependsOn(':vtm-web')
|
||||
|
||||
gwt {
|
||||
@@ -48,6 +51,9 @@ gwt {
|
||||
src += files(project(':vtm-themes').sourceSets.main.allJava.srcDirs)
|
||||
src += files(project(':vtm-themes').sourceSets.main.resources.srcDirs)
|
||||
src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs)
|
||||
src += files(project(':vtm-gdx-poi3d').sourceSets.main.allJava.srcDirs)
|
||||
src += files(project(':vtm-models').sourceSets.main.allJava.srcDirs)
|
||||
src += files(project(':vtm-models').sourceSets.main.resources.srcDirs)
|
||||
src += files(project(':vtm-web').sourceSets.main.allJava.srcDirs)
|
||||
}
|
||||
|
||||
@@ -65,6 +71,12 @@ task copyThemeAssets(type: Copy) {
|
||||
include '**/*'
|
||||
}
|
||||
|
||||
task copyModelAssets(type: Copy) {
|
||||
from "$rootDir/vtm-models/resources/assets"
|
||||
into "assets"
|
||||
include '**/*'
|
||||
}
|
||||
|
||||
task copyThemeLocalAssets(type: Copy) {
|
||||
from "resources/assets"
|
||||
into "assets"
|
||||
@@ -85,6 +97,7 @@ task copyWarSources(type: Copy) {
|
||||
|
||||
tasks.withType(JavaCompile) { compileTask ->
|
||||
compileTask.dependsOn copyThemeAssets
|
||||
compileTask.dependsOn copyModelAssets
|
||||
compileTask.dependsOn copyThemeLocalAssets
|
||||
compileTask.dependsOn copyVtmAssets
|
||||
compileTask.dependsOn copyWarSources
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
<entry-point class="org.oscim.web.client.GwtLauncher" />
|
||||
<inherits name="org.oscim.gdx.VtmWeb" />
|
||||
<inherits name="VtmGdxPoi3D" />
|
||||
|
||||
<set-property name='gwt.logging.enabled' value='TRUE' />
|
||||
<set-property name='gwt.logging.consoleHandler' value='ENABLED' />
|
||||
|
||||
@@ -33,6 +33,7 @@ import org.oscim.gdx.GdxMap;
|
||||
import org.oscim.gdx.client.GwtGdxGraphics;
|
||||
import org.oscim.gdx.client.MapConfig;
|
||||
import org.oscim.gdx.client.MapUrl;
|
||||
import org.oscim.gdx.poi3d.Poi3DLayer;
|
||||
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
|
||||
import org.oscim.layers.tile.buildings.BuildingLayer;
|
||||
import org.oscim.layers.tile.buildings.S3DBTileLayer;
|
||||
@@ -154,6 +155,8 @@ class GwtMap extends GdxMap {
|
||||
mMap.layers().add(mBuildingLayer);
|
||||
}
|
||||
|
||||
mMap.layers().add(new Poi3DLayer(mMap, l));
|
||||
|
||||
if (!nolabels)
|
||||
mMap.layers().add(new LabelLayer(mMap, l));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user