From a9adff98e607de62233bf300b70e9f89028a49d4 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Wed, 16 Apr 2014 14:17:32 -0400
Subject: [PATCH] allow for TileMesh assets depended on by a loaded
 TileMeshCollection to not need to specify a texture atlas (will use the
 parent TileMeshCollection's texture atlas)

---
 .../tilemap3d/assets/tilemesh/TileMeshCollectionLoader.java  | 5 ++++-
 .../blarg/gdx/tilemap3d/assets/tilemesh/TileMeshLoader.java  | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshCollectionLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshCollectionLoader.java
index 98aa23e..9122eb5 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshCollectionLoader.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshCollectionLoader.java
@@ -31,8 +31,11 @@ public class TileMeshCollectionLoader extends AsynchronousAssetLoader<TileMeshCo
 		if (definition.textureAtlas != null)
 			deps.add(new AssetDescriptor(definition.textureAtlas, TextureAtlas.class));
 
+		TileMeshLoader.TileMeshParameters params = new TileMeshLoader.TileMeshParameters();
+		params.defaultTextureAtlas = definition.textureAtlas;
+
 		for (String tileMeshFile : definition.tiles) {
-			deps.add(new AssetDescriptor(tileMeshFile, TileMesh.class));
+			deps.add(new AssetDescriptor(tileMeshFile, TileMesh.class, params));
 		}
 
 		return deps;
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshLoader.java
index 7121a12..7d27b69 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshLoader.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshLoader.java
@@ -14,6 +14,7 @@ import com.badlogic.gdx.utils.Array;
 @SuppressWarnings("unchecked")
 public class TileMeshLoader extends AsynchronousAssetLoader<TileMesh, TileMeshLoader.TileMeshParameters> {
 	public static class TileMeshParameters extends AssetLoaderParameters<TileMesh> {
+		public String defaultTextureAtlas;
 	}
 
 	public TileMeshLoader(FileHandleResolver resolver) {
@@ -30,6 +31,10 @@ public class TileMeshLoader extends AsynchronousAssetLoader<TileMesh, TileMeshLo
 
 		if (definition.textureAtlas != null)
 			deps.add(new AssetDescriptor(definition.textureAtlas, TextureAtlas.class));
+		else if (parameter != null && parameter.defaultTextureAtlas != null) {
+			definition.textureAtlas = parameter.defaultTextureAtlas;
+			deps.add(new AssetDescriptor(definition.textureAtlas, TextureAtlas.class));
+		}
 
 		if (!definition.cube) {
 			if (definition.model != null)