Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(JOML): remove legacy typeHandlers #4478

Merged
merged 4 commits into from
Feb 8, 2021
Merged

feat(JOML): remove legacy typeHandlers #4478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06e0e15
feat(JOML): remove legacy typeHandlers
pollend Feb 7, 2021
97cef75
Merge branch 'develop' into feat/joml-remove-legacy-type-handlers
skaldarnar Feb 7, 2021
c7f6f3a
Merge branch 'develop' into feat/joml-remove-legacy-type-handlers
jdrueckert Feb 8, 2021
a7f1166
chore: remove unused imports
jdrueckert Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 0 additions & 20 deletions engine/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerLibraryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
import org.terasology.joml.geom.Rectanglef;
import org.terasology.joml.geom.Rectanglei;
import org.terasology.math.IntegerRange;
import org.terasology.math.geom.Quat4f;
import org.terasology.math.geom.Vector2f;
import org.terasology.math.geom.Vector2i;
import org.terasology.math.geom.Vector3f;
import org.terasology.math.geom.Vector3i;
import org.terasology.math.geom.Vector4f;
import org.terasology.naming.Name;
import org.terasology.nui.Color;
import org.terasology.nui.Colorc;
Expand Down Expand Up @@ -60,12 +54,6 @@
import org.terasology.persistence.typeHandling.mathTypes.Vector4fcTypeHandler;
import org.terasology.persistence.typeHandling.mathTypes.Vector4iTypeHandler;
import org.terasology.persistence.typeHandling.mathTypes.Vector4icTypeHandler;
import org.terasology.persistence.typeHandling.mathTypes.legacy.LegacyQuat4fTypeHandler;
import org.terasology.persistence.typeHandling.mathTypes.legacy.LegacyVector2fTypeHandler;
import org.terasology.persistence.typeHandling.mathTypes.legacy.LegacyVector2iTypeHandler;
import org.terasology.persistence.typeHandling.mathTypes.legacy.LegacyVector3fTypeHandler;
import org.terasology.persistence.typeHandling.mathTypes.legacy.LegacyVector3iTypeHandler;
import org.terasology.persistence.typeHandling.mathTypes.legacy.LegacyVector4fTypeHandler;
import org.terasology.persistence.typeHandling.reflection.ModuleEnvironmentSandbox;
import org.terasology.persistence.typeHandling.reflection.SerializationSandbox;
import org.terasology.reflection.TypeRegistry;
Expand Down Expand Up @@ -114,14 +102,6 @@ public static TypeHandlerLibrary forModuleEnvironment(ModuleManager moduleManage
}

private static void populateWithDefaultHandlers(TypeHandlerLibrary serializationLibrary) {
// LEGACY
serializationLibrary.addTypeHandler(Vector4f.class, new LegacyVector4fTypeHandler());
serializationLibrary.addTypeHandler(Vector3f.class, new LegacyVector3fTypeHandler());
serializationLibrary.addTypeHandler(Vector2f.class, new LegacyVector2fTypeHandler());
serializationLibrary.addTypeHandler(Vector3i.class, new LegacyVector3iTypeHandler());
serializationLibrary.addTypeHandler(Vector2i.class, new LegacyVector2iTypeHandler());
serializationLibrary.addTypeHandler(Quat4f.class, new LegacyQuat4fTypeHandler());

// Current Supported
serializationLibrary.addTypeHandlerFactory(new AssetTypeHandlerFactory());

Expand Down
46 changes: 0 additions & 46 deletions ...ava/org/terasology/persistence/typeHandling/mathTypes/legacy/LegacyQuat4fTypeHandler.java
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions ...a/org/terasology/persistence/typeHandling/mathTypes/legacy/LegacyVector2fTypeHandler.java
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions ...a/org/terasology/persistence/typeHandling/mathTypes/legacy/LegacyVector2iTypeHandler.java
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions ...a/org/terasology/persistence/typeHandling/mathTypes/legacy/LegacyVector3fTypeHandler.java
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions ...a/org/terasology/persistence/typeHandling/mathTypes/legacy/LegacyVector3iTypeHandler.java
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions ...a/org/terasology/persistence/typeHandling/mathTypes/legacy/LegacyVector4fTypeHandler.java
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions engine/src/main/java/org/terasology/utilities/gson/legacy/LegacyQuat4fTypeAdapter.java
View file
Open in desktop

This file was deleted.