MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed static positions from SDF

Browse source
This commit is contained in:
paulevsGitch 2022-02-14 15:11:34 +03:00
parent f756673128
commit a5c3c97630
4 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/ru/bclib/BCLib.java
View file

@ -17,7 +17,6 @@ import ru.bclib.recipes.CraftingRecipes;
import ru.bclib.registry.BaseBlockEntities; import ru.bclib.registry.BaseBlockEntities;
import ru.bclib.registry.BaseRegistry; import ru.bclib.registry.BaseRegistry;
import ru.bclib.util.Logger; import ru.bclib.util.Logger;
import ru.bclib.util.ModUtil;
import ru.bclib.world.generator.BCLibEndBiomeSource; import ru.bclib.world.generator.BCLibEndBiomeSource;
import ru.bclib.world.generator.BCLibNetherBiomeSource; import ru.bclib.world.generator.BCLibNetherBiomeSource;
import ru.bclib.world.generator.GeneratorOptions; import ru.bclib.world.generator.GeneratorOptions;

3
src/main/java/ru/bclib/mixin/common/MainMixin.java
View file

@ -1,11 +1,8 @@
package ru.bclib.mixin.common; package ru.bclib.mixin.common;
import joptsimple.AbstractOptionSpec;
import joptsimple.ArgumentAcceptingOptionSpec; import joptsimple.ArgumentAcceptingOptionSpec;
import joptsimple.NonOptionArgumentSpec;
import joptsimple.OptionParser; import joptsimple.OptionParser;
import joptsimple.OptionSet; import joptsimple.OptionSet;
import joptsimple.OptionSpecBuilder;
import net.minecraft.server.Main; import net.minecraft.server.Main;
import net.minecraft.server.dedicated.DedicatedServerSettings; import net.minecraft.server.dedicated.DedicatedServerSettings;
import net.minecraft.world.level.storage.LevelStorageSource; import net.minecraft.world.level.storage.LevelStorageSource;

8
src/main/java/ru/bclib/sdf/operator/SDFCoordModify.java
View file

@ -5,7 +5,7 @@ import com.mojang.math.Vector3f;
import java.util.function.Consumer; import java.util.function.Consumer;
public class SDFCoordModify extends SDFUnary { public class SDFCoordModify extends SDFUnary {
private static final Vector3f POS = new Vector3f(); private static Vector3f pos = new Vector3f();
private Consumer<Vector3f> function; private Consumer<Vector3f> function;
public SDFCoordModify setFunction(Consumer<Vector3f> function) { public SDFCoordModify setFunction(Consumer<Vector3f> function) {
@ -15,8 +15,8 @@ public class SDFCoordModify extends SDFUnary {
@Override @Override
public float getDistance(float x, float y, float z) { public float getDistance(float x, float y, float z) {
POS.set(x, y, z); pos.set(x, y, z);
function.accept(POS); function.accept(pos);
return this.source.getDistance(POS.x(), POS.y(), POS.z()); return this.source.getDistance(pos.x(), pos.y(), pos.z());
} }
} }

6
src/main/java/ru/bclib/sdf/operator/SDFDisplacement.java
View file

@ -5,7 +5,7 @@ import com.mojang.math.Vector3f;
import java.util.function.Function; import java.util.function.Function;
public class SDFDisplacement extends SDFUnary { public class SDFDisplacement extends SDFUnary {
private static final Vector3f POS = new Vector3f(); private final Vector3f pos = new Vector3f();
private Function<Vector3f, Float> displace; private Function<Vector3f, Float> displace;
public SDFDisplacement setFunction(Function<Vector3f, Float> displace) { public SDFDisplacement setFunction(Function<Vector3f, Float> displace) {
@ -15,7 +15,7 @@ public class SDFDisplacement extends SDFUnary {
@Override @Override
public float getDistance(float x, float y, float z) { public float getDistance(float x, float y, float z) {
POS.set(x, y, z); pos.set(x, y, z);
return this.source.getDistance(x, y, z) + displace.apply(POS); return this.source.getDistance(x, y, z) + displace.apply(pos);
} }
} }