Skip to content

Commit c41de1e

Browse files
committed
Fixed transform hierarchy serialization
1 parent fe0ee24 commit c41de1e

5 files changed

Lines changed: 10 additions & 18 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
## ChangeLog
22

3-
# v1.1.10
4-
* Fixed model mode serialization issue
5-
* Fixed sub emitter serialization issue
6-
* Fixed Birth event doesn't correct
7-
* Fixed collision checking issue
3+
# v1.1.11
4+
* Fixed transform hierarchy serialization
5+
* Fixed occlusion of the bloom (thanks to @RogoShum)

common/src/main/java/com/lowdragmc/photon/client/gameobject/IFXObject.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,7 @@ default void updateScale(Vector3f newScale) {
151151
}
152152

153153
default void copyTransformFrom(IFXObject fxObject) {
154-
copyTransformFrom(fxObject, true, true);
155-
}
156-
157-
default void copyTransformFrom(IFXObject fxObject, boolean local, boolean copyParent) {
158-
transform().set(fxObject.transform(), local);
159-
if (copyParent) {
160-
transform().parent(fxObject.transform().parent());
161-
}
154+
transform().copyTransformFrom(fxObject.transform(), true, true);
155+
transform()._setInternalID(fxObject.transform().id());
162156
}
163157
}

fabric/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ loom {
4343
if (isJetBrainsRuntime()) {
4444
runs {
4545
client {
46-
vmArgs '-XX:+AllowEnhancedClassRedefinition'
47-
vmArgs '-XX:HotswapAgent=fatjar'
46+
// vmArgs '-XX:+AllowEnhancedClassRedefinition'
47+
// vmArgs '-XX:HotswapAgent=fatjar'
4848
}
4949
}
5050
}

forge/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ loom {
4747
if (isJetBrainsRuntime()) {
4848
runs {
4949
client {
50-
vmArgs '-XX:+AllowEnhancedClassRedefinition'
51-
vmArgs '-XX:HotswapAgent=fatjar'
50+
// vmArgs '-XX:+AllowEnhancedClassRedefinition'
51+
// vmArgs '-XX:HotswapAgent=fatjar'
5252
}
5353
}
5454
}

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencyResolutionManagement {
3636
def architecturyLoomVersion = "1.6-SNAPSHOT"
3737
def quiltFlowerVersion = "1.+"
3838
def macheteVersion = "1.+"
39-
def ldLibVersion = "1.0.39.a"
39+
def ldLibVersion = "1.0.41"
4040

4141
fabric {
4242
def parchment = version("parchment", parchmentVersion)

0 commit comments

Comments
 (0)