vtm-gdx-poi3d module (#600)

settings.gradle

@@ -7,6 +7,7 @@ include ':vtm-app'
 include ':vtm-desktop'
 include ':vtm-extras'
 include ':vtm-gdx'
+include ':vtm-gdx-poi3d'
 include ':vtm-http'
 include ':vtm-ios'
 include ':vtm-ios-example'

vtm-gdx-poi3d/build.gradle

@@ -0,0 +1,17 @@
+apply plugin: 'java-library'
+apply plugin: 'maven'
+
+dependencies {
+    api project(':vtm-gdx')
+    api project(':vtm-models')
+}
+
+sourceSets {
+    main.java.srcDirs = ['src']
+}
+
+if (project.hasProperty("SONATYPE_USERNAME")) {
+    afterEvaluate {
+        project.apply from: "${rootProject.projectDir}/deploy.gradle"
+    }
+}

vtm-gdx-poi3d/src/VtmGdxPoi3D.gwt.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC
+    "-//Google Inc.//DTD Google Web Toolkit trunk//EN"
+    "http://google-web-toolkit.googlecode.com/svn/trunk/distro-source/core/src/gwt-module.dtd">
+<module rename-to="VtmGdxPoi3D">
+    <source path="org/oscim/gdx/poi3d" />
+</module>

vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelLayer.java

@@ -13,7 +13,7 @@
  * 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.test.gdx.poi3d;
+package org.oscim.gdx.poi3d;
 
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.graphics.g3d.Model;

vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelRenderer.java

@@ -1,4 +1,4 @@
-package org.oscim.test.gdx.poi3d;
+package org.oscim.gdx.poi3d;
 
 import com.badlogic.gdx.graphics.g3d.Environment;
 import com.badlogic.gdx.graphics.g3d.Model;

vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D.java

@@ -1,4 +1,4 @@
-package org.oscim.test.gdx.poi3d;
+package org.oscim.gdx.poi3d;
 
 import com.badlogic.gdx.graphics.g3d.Environment;
 import com.badlogic.gdx.graphics.g3d.Model;

vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D2.java

@@ -15,7 +15,7 @@
  * 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.test.gdx.poi3d;
+package org.oscim.gdx.poi3d;
 
 import com.badlogic.gdx.graphics.g3d.Environment;
 import com.badlogic.gdx.graphics.g3d.ModelBatch;

vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/MapCamera.java

@@ -1,4 +1,4 @@
-package org.oscim.test.gdx.poi3d;
+package org.oscim.gdx.poi3d;
 
 import com.badlogic.gdx.graphics.Camera;
 import com.badlogic.gdx.math.Matrix4;

vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/ModelHolder.java

@@ -12,7 +12,7 @@
  * 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.test.gdx.poi3d;
+package org.oscim.gdx.poi3d;
 
 import com.badlogic.gdx.graphics.g3d.Model;
 

vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/ModelPosition.java

@@ -12,7 +12,7 @@
  * 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.test.gdx.poi3d;
+package org.oscim.gdx.poi3d;
 
 import org.oscim.core.MercatorProjection;
 

vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/Poi3DLayer.java

@@ -14,7 +14,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.oscim.test.gdx.poi3d;
+package org.oscim.gdx.poi3d;
 
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.graphics.g3d.Model;

vtm-playground/build.gradle

@@ -5,6 +5,7 @@ dependencies {
     file("${rootDir}/vtm-desktop/natives").eachDir() { dir ->
         implementation files(dir.path)
     }
+    implementation project(':vtm-gdx-poi3d')
     implementation project(':vtm-http')
     implementation project(':vtm-jeo')
     implementation project(':vtm-json')

vtm-playground/src/org/oscim/test/gdx/poi3d/Gdx3DTest.java

@@ -19,6 +19,7 @@ package org.oscim.test.gdx.poi3d;
 
 import org.oscim.core.MapPosition;
 import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.poi3d.Poi3DLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;

vtm-web-app/build.gradle

@@ -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

vtm-web-app/src/org/oscim/web/VtmWebApp.gwt.xml

@@ -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' />

vtm-web-app/src/org/oscim/web/client/GwtMap.java

@@ -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));
         }

vtm-web/src/org/oscim/gdx/VtmWeb.gwt.xml

@@ -16,7 +16,7 @@
     <inherits name="com.badlogic.gdx.backends.Gdx" />
     <inherits name="com.google.gwt.user.theme.chrome.Chrome" />
 
-
+    <clear-configuration-property name="gdx.reflect.include" />
     <!--   <extend-configuration-property name="gdx.reflect.include" value="com.badlogic.gdx.scenes.scene2d" />
       <extend-configuration-property name="gdx.reflect.include" value="com.badlogic.gdx.math" />
       <extend-configuration-property name="gdx.reflect.include" value="com.badlogic.gdx.graphics.g2d.TextureRegion" />
@@ -30,10 +30,12 @@
       <extend-configuration-property name="gdx.reflect.include" value="com.badlogic.gdx.utils.ObjectMap" />
       <extend-configuration-property name="gdx.reflect.include" value="com.badlogic.gdx.utils.OrderedMap" />
       <extend-configuration-property name="gdx.reflect.include" value="com.badlogic.gdx.utils.Disposable" />
-      <extend-configuration-property name="gdx.reflect.include" value="com.badlogic.gdx.graphics.VertexAttribute" />
-      <extend-configuration-property name="gdx.reflect.include" value="com.badlogic.gdx.graphics.g3d.model" />
      -->
-    <clear-configuration-property name="gdx.reflect.include" />
+
+    <extend-configuration-property name="gdx.reflect.include"
+        value="com.badlogic.gdx.graphics.VertexAttribute" />
+    <extend-configuration-property name="gdx.reflect.include"
+        value="com.badlogic.gdx.graphics.g3d.model" />
     <extend-configuration-property name="gdx.reflect.include" value="java.util.List" />
     <extend-configuration-property name="gdx.reflect.include" value="java.util.ArrayList" />
     <extend-configuration-property name="gdx.reflect.include" value="java.util.Map" />