Droog71
/
Terasology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(JOML): Fixes invisible spawning when scale is used (#4198)

develop
Arthur Casals 2020-10-12 18:02:54 +02:00 committed by GitHub
parent 656f14bb82
commit 9bd77a64e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -13,4 +13,4 @@
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
</project>
</project>

2
engine/src/main/java/org/terasology/rendering/logic/SkeletalMeshComponent.java
View File

@ -19,7 +19,7 @@ package org.terasology.rendering.logic;
import com.google.common.collect.Lists;
import org.terasology.entitySystem.Owns;
import org.terasology.entitySystem.entity.EntityRef;
import org.terasology.math.geom.Vector3f;
import org.joml.Vector3f;
import org.terasology.network.Replicate;
import org.terasology.nui.Color;
import org.terasology.nui.properties.Range;

6
engine/src/main/java/org/terasology/rendering/opengl/OpenGLSkeletalMesh.java
View File

@ -64,8 +64,8 @@ public class OpenGLSkeletalMesh extends SkeletalMesh {
private SkeletalMeshData data;
private Vector3f scale;
private Vector3f translate;
private org.joml.Vector3f scale;
private org.joml.Vector3f translate;
private DisposalAction disposalAction;
@ -76,7 +76,7 @@ public class OpenGLSkeletalMesh extends SkeletalMesh {
reload(data);
}
public void setScaleTranslate(Vector3f newScale, Vector3f newTranslate) {
public void setScaleTranslate(org.joml.Vector3f newScale, org.joml.Vector3f newTranslate) {
this.scale = newScale;
this.translate = newTranslate;
}