|
|
|
@ -126,6 +126,8 @@ public class BlenderKey extends ModelKey { |
|
|
|
|
protected AnimationMatchMethod animationMatchMethod = AnimationMatchMethod.AT_LEAST_ONE_NAME_MATCH; |
|
|
|
|
/** The size of points that are loaded and do not belong to any edge of the mesh. */ |
|
|
|
|
protected float pointsSize = 1; |
|
|
|
|
/** The width of edges that are loaded from the mesh and do not belong to any face. */ |
|
|
|
|
protected float linesWidth = 1; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Constructor used by serialization mechanisms. |
|
|
|
@ -475,6 +477,22 @@ public class BlenderKey extends ModelKey { |
|
|
|
|
this.pointsSize = pointsSize; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @return the width of edges that are loaded from the mesh and do not belong to any face |
|
|
|
|
*/ |
|
|
|
|
public float getLinesWidth() { |
|
|
|
|
return linesWidth; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Sets the width of edges that are loaded from the mesh and do not belong to any face. |
|
|
|
|
* @param linesWidth |
|
|
|
|
* the width of edges that are loaded from the mesh and do not belong to any face |
|
|
|
|
*/ |
|
|
|
|
public void setLinesWidth(float linesWidth) { |
|
|
|
|
this.linesWidth = linesWidth; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* This mehtod sets the name of the WORLD data block taht should be used during file loading. By default the name is |
|
|
|
|
* not set. If no name is set or the given name does not occur in the file - the first WORLD data block will be used |
|
|
|
@ -532,6 +550,7 @@ public class BlenderKey extends ModelKey { |
|
|
|
|
oc.write(optimiseTextures, "optimise-textures", false); |
|
|
|
|
oc.write(animationMatchMethod, "animation-match-method", AnimationMatchMethod.AT_LEAST_ONE_NAME_MATCH); |
|
|
|
|
oc.write(pointsSize, "points-size", 1); |
|
|
|
|
oc.write(linesWidth, "lines-width", 1); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@ -555,6 +574,7 @@ public class BlenderKey extends ModelKey { |
|
|
|
|
optimiseTextures = ic.readBoolean("optimise-textures", false); |
|
|
|
|
animationMatchMethod = ic.readEnum("animation-match-method", AnimationMatchMethod.class, AnimationMatchMethod.AT_LEAST_ONE_NAME_MATCH); |
|
|
|
|
pointsSize = ic.readFloat("points-size", 1); |
|
|
|
|
linesWidth = ic.readFloat("lines-width", 1); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@ -580,7 +600,8 @@ public class BlenderKey extends ModelKey { |
|
|
|
|
result = prime * result + (skyGeneratedTextureShape == null ? 0 : skyGeneratedTextureShape.hashCode()); |
|
|
|
|
result = prime * result + skyGeneratedTextureSize; |
|
|
|
|
result = prime * result + (usedWorld == null ? 0 : usedWorld.hashCode()); |
|
|
|
|
result = prime * result + (int)pointsSize; |
|
|
|
|
result = prime * result + (int) pointsSize; |
|
|
|
|
result = prime * result + (int) linesWidth; |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -662,6 +683,9 @@ public class BlenderKey extends ModelKey { |
|
|
|
|
if (pointsSize != other.pointsSize) { |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
if (linesWidth != other.linesWidth) { |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|