Terrain Chunking / Terrain Neighbors

build.gradle

@@ -35,6 +35,7 @@ allprojects {
         commonsLangVersion = '3.12.0'
         gltfVersion = '2.1.0'
         args4jVersion = '2.33'
+        lwjgl3Version = "3.3.2" // For MeshOptimizer
 
         ktxVersion = '1.12.0-rc1'
     }
@@ -91,6 +92,15 @@ project(":editor") {
         implementation "com.esotericsoftware:kryo:$kryoVersion"
         implementation "args4j:args4j:$args4jVersion"
 
+        api "org.lwjgl:lwjgl-meshoptimizer:$lwjgl3Version"
+        api "org.lwjgl:lwjgl-meshoptimizer:$lwjgl3Version:natives-linux"
+        api "org.lwjgl:lwjgl-meshoptimizer:$lwjgl3Version:natives-linux-arm32"
+        api "org.lwjgl:lwjgl-meshoptimizer:$lwjgl3Version:natives-linux-arm64"
+        api "org.lwjgl:lwjgl-meshoptimizer:$lwjgl3Version:natives-macos"
+        api "org.lwjgl:lwjgl-meshoptimizer:$lwjgl3Version:natives-macos-arm64"
+        api "org.lwjgl:lwjgl-meshoptimizer:$lwjgl3Version:natives-windows"
+        api "org.lwjgl:lwjgl-meshoptimizer:$lwjgl3Version:natives-windows-x86"
+
         // tests
         testImplementation "junit:junit:$junitVersion"
         testImplementation "org.mockito:mockito-all:$mockitoVersion"

commons/src/main/com/mbrlabs/mundus/commons/assets/Asset.java

@@ -103,4 +103,17 @@ public String toString() {
      */
     public abstract void applyDependencies();
 
+    /**
+     * Returns the loading priority of this asset. Some assets need to be loaded
+     * before others, e.g. a material asset needs to be loaded before a Model
+     *
+     * @return the loading priority of this asset
+     */
+    public int getLoadingPriority() {
+        if (this instanceof MaterialAsset || this instanceof TerrainLayerAsset) {
+            return 1;
+        }
+        return 2;
+    }
+
 }

commons/src/main/com/mbrlabs/mundus/commons/assets/AssetManager.java

@@ -40,6 +40,7 @@
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -267,12 +268,9 @@ protected void queueAssetForLoading(Meta m) {
                 TerrainLoader.TerrainParameter terrainParameter = new TerrainLoader.TerrainParameter(m.getTerrain());
                 gdxAssetManager.load(filePath, Terrain.class, terrainParameter);
             case MATERIAL:
-                // loads synchronously
-                break;
-            case WATER:
-                // loads synchronously
-                break;
+            case TERRAIN_LAYER:
             case SKYBOX:
+            case WATER:
                 // loads synchronously
                 break;
         }
@@ -312,17 +310,16 @@ public void finalizeLoad() throws AssetNotFoundException, MetaFileParseException
             loadAsset(metaLoader.load(meta));
         }
 
-        // resolve material assets
-        for (Asset asset : assets) {
-            if (asset instanceof MaterialAsset) {
-                asset.resolveDependencies(assetIndex);
-                asset.applyDependencies();
+        // Sort assets by loading priority
+        assets.sort(new Comparator<Asset>() {
+            @Override
+            public int compare(Asset a1, Asset a2) {
+                return Integer.compare(a1.getLoadingPriority(), a2.getLoadingPriority());
             }
-        }
+        });
 
-        // resolve other assets
+        // resolve assets
         for (Asset asset : assets) {
-            if (asset instanceof MaterialAsset) continue;
             if (asset instanceof ModelAsset) {
                 int modelBones = asset.getMeta().getModel().getNumBones();
                 maxNumBones = Math.max(modelBones, maxNumBones);
@@ -384,6 +381,9 @@ public Asset loadAsset(Meta meta) throws AssetNotFoundException {
             case TERRAIN:
                 asset = loadTerrainAsset(meta, assetFile);
                 break;
+            case TERRAIN_LAYER:
+                asset = loadTerrainLayerAsset(meta, assetFile);
+                break;
             case MODEL:
                 asset = loadModelAsset(meta, assetFile);
                 break;
@@ -431,6 +431,12 @@ private TerrainAsset loadTerrainAsset(Meta meta, FileHandle assetFile) {
         return asset;
     }
 
+    private TerrainLayerAsset loadTerrainLayerAsset(Meta meta, FileHandle assetFile) {
+        TerrainLayerAsset asset = new TerrainLayerAsset(meta, assetFile);
+        asset.load(gdxAssetManager);
+        return asset;
+    }
+
     private PixmapTextureAsset loadPixmapTextureAsset(Meta meta, FileHandle assetFile) {
         PixmapTextureAsset asset = new PixmapTextureAsset(meta, assetFile);
         asset.load(gdxAssetManager);

commons/src/main/com/mbrlabs/mundus/commons/assets/AssetType.java

@@ -16,8 +16,6 @@
 
 package com.mbrlabs.mundus.commons.assets;
 
-import com.mbrlabs.mundus.commons.shadows.ShadowResolution;
-
 /**
  * @author Marcus Brummer
  * @version 01-10-2016
@@ -36,7 +34,9 @@ public enum AssetType {
     /** Water file. Contains data for water. */
     WATER("Water"),
     /** Skybox file. Holds reference to skybox textures. **/
-    SKYBOX("Skybox");
+    SKYBOX("Skybox"),
+    /** Holds the terrain textures to be used. **/
+    TERRAIN_LAYER("Terrain Layer");
 
     private final String value;