gered/gdx-tilemap3d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

forgot the other place to add this

Browse source
This commit is contained in:
Gered 2013-12-31 12:59:36 -05:00
parent 5ef70cb13e
commit eb5c40513b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/TileMeshCollectionLoader.java
View file

@ -17,7 +17,6 @@ import com.badlogic.gdx.graphics.g3d.loader.G3dModelLoader;
import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.Json; import com.badlogic.gdx.utils.Json;
import com.badlogic.gdx.utils.JsonReader; import com.badlogic.gdx.utils.JsonReader;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -220,8 +219,9 @@ public final class TileMeshCollectionLoader {
} }
} }
if (tileDef.collisionShape != null) { if (tileDef.collisionShape != null) {
collisionModel = null; // using a shape instead! collisionModel = CollisionShapes.get(tileDef.collisionShape);
throw new NotImplementedException(); if (collisionModel == null)
throw new RuntimeException("collisionShape not recognized.");
} }
collection.add(submodels, colors, scaleToSizes, positionOffsets, collisionModel, materialMapping, opaqueSides, lightValue, alpha, translucency, color, scaleToSize, positionOffset, collisionPositionOffset); collection.add(submodels, colors, scaleToSizes, positionOffsets, collisionModel, materialMapping, opaqueSides, lightValue, alpha, translucency, color, scaleToSize, positionOffset, collisionPositionOffset);