Adopted new Math and Widget changes
This commit is contained in:
parent
e608bf21fe
commit
ff77134ead
15 changed files with 62 additions and 51 deletions
|
@ -4,7 +4,6 @@ import org.betterx.bclib.BCLib;
|
|||
import org.betterx.bclib.util.BlocksHelper;
|
||||
import org.betterx.bclib.util.MHelper;
|
||||
|
||||
import com.mojang.math.Vector3f;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.ItemOverrides;
|
||||
|
@ -23,6 +22,7 @@ import net.fabricmc.api.Environment;
|
|||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import org.joml.Vector3f;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package org.betterx.bclib.client.models;
|
||||
|
||||
import com.mojang.math.Vector3f;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import org.joml.Vector3f;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
package org.betterx.bclib.client.models;
|
||||
|
||||
import com.mojang.math.Matrix4f;
|
||||
import com.mojang.math.Vector3f;
|
||||
import com.mojang.math.Vector4f;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.resources.model.ModelState;
|
||||
|
@ -11,6 +8,10 @@ import net.minecraft.core.Direction;
|
|||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
|
||||
import org.joml.Matrix4f;
|
||||
import org.joml.Vector3f;
|
||||
import org.joml.Vector4f;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public class UnbakedQuad {
|
||||
private static final Vector4f POS = new Vector4f();
|
||||
|
@ -55,7 +56,7 @@ public class UnbakedQuad {
|
|||
float y = data[dataIndex++]; // Y
|
||||
float z = data[dataIndex++]; // Z
|
||||
POS.set(x, y, z, 0);
|
||||
POS.transform(matrix);
|
||||
POS.mul(matrix);
|
||||
vertexData[index] = Float.floatToIntBits(POS.x()); // X
|
||||
vertexData[index | 1] = Float.floatToIntBits(POS.y()); // Y
|
||||
vertexData[index | 2] = Float.floatToIntBits(POS.z()); // Z
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue