diff --git a/src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java b/src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java index 584c8dd7f..185dc8740 100644 --- a/src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/lodTemplates/AbstractLodTemplate.java @@ -51,7 +51,7 @@ public abstract class AbstractLodTemplate double x, double y, double z, int red, int green, int blue, int alpha) { - + //buffer.vertex(x, y, z).color(red, green, blue, alpha).normal(direction.getNormal().getX(), direction.getNormal().getY(), direction.getNormal().getZ()).endVertex(); buffer.vertex(x, y, z).color(red, green, blue, alpha).normal(direction.getNormal().getX(), direction.getNormal().getY(), direction.getNormal().getZ()).endVertex(); } diff --git a/src/main/java/com/seibel/lod/objects/LevelContainer.java b/src/main/java/com/seibel/lod/objects/LevelContainer.java index 72006de7f..94bcd2c36 100644 --- a/src/main/java/com/seibel/lod/objects/LevelContainer.java +++ b/src/main/java/com/seibel/lod/objects/LevelContainer.java @@ -9,7 +9,7 @@ import java.util.concurrent.ConcurrentMap; public interface LevelContainer { public static final char VERTICAL_DATA_DELIMITER = '\t'; - public static final char DATA_DELIMITER = '\n'; + public static final char DATA_DELIMITER = ' '; /**With this you can add data to the level container * * @param data actual data to add in a array of long format. diff --git a/src/main/java/com/seibel/lod/objects/SingleLevelContainer.java b/src/main/java/com/seibel/lod/objects/SingleLevelContainer.java index 3d45c89e4..88984802e 100644 --- a/src/main/java/com/seibel/lod/objects/SingleLevelContainer.java +++ b/src/main/java/com/seibel/lod/objects/SingleLevelContainer.java @@ -77,13 +77,15 @@ public class SingleLevelContainer implements LevelContainer newData = 0; for(tempIndex = 0; tempIndex < 16; tempIndex++) { + if(index+tempIndex >= inputString.length()) + break; currentChar = inputString.charAt(index+tempIndex); - if(currentChar == ','){ + if(currentChar == DATA_DELIMITER){ break; } shift = (15-tempIndex)*4; digit = Character.digit(currentChar,16); - newData += ((long) (digit & 0xf)) << shift; + newData += ((((long) digit & 0xf)) << shift); } newData = newData >>> (shift); data[x][z] = newData;