mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 19:15:32 +00:00
RenderItem can now use baked quad color
This commit is contained in:
1 parent
93cd9722b0
commit
b14cfa45e5
5 files changed
+57
-7
No files matched your search
@@ -26,6 +26,8 @@ import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.client.renderer.WorldRenderer;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.block.model.ItemTransformVec3f;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
@@ -656,4 +658,25 @@ public class ForgeHooksClient
|
||||
ret.mul(tmp);
|
||||
return ret;
|
||||
}
|
||||
|
||||
public static void putQuadColor(WorldRenderer renderer, BakedQuad quad, int color)
|
||||
{
|
||||
float cr = color & 0xFF;
|
||||
float cg = (color >>> 8) & 0xFF;
|
||||
float cb = (color >>> 16) & 0xFF;
|
||||
float ca = (color >>> 24) & 0xFF;
|
||||
for(int i = 0; i < 4; i++)
|
||||
{
|
||||
int vc = quad.getVertexData()[3 + 7 * i];
|
||||
float vcr = vc & 0xFF;
|
||||
float vcg = (vc >>> 8) & 0xFF;
|
||||
float vcb = (vc >>> 16) & 0xFF;
|
||||
float vca = (vc >>> 24) & 0xFF;
|
||||
int ncr = Math.min(0xFF, (int)(cr * vcr / 0xFF));
|
||||
int ncg = Math.min(0xFF, (int)(cg * vcg / 0xFF));
|
||||
int ncb = Math.min(0xFF, (int)(cb * vcb / 0xFF));
|
||||
int nca = Math.min(0xFF, (int)(ca * vca / 0xFF));
|
||||
renderer.putColorRGBA(renderer.getColorIndex(i + 1), ncr, ncg, ncb, nca);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package net.minecraftforge.client.model;
|
||||
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
public interface IColoredBakedQuad {
|
||||
public static class ColoredBakedQuad extends BakedQuad implements IColoredBakedQuad
|
||||
{
|
||||
public ColoredBakedQuad(int[] data, int tintIndex, EnumFacing side)
|
||||
{
|
||||
super(data, tintIndex, side);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -26,6 +26,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.model.Attributes;
|
||||
import net.minecraftforge.client.model.IColoredBakedQuad.ColoredBakedQuad;
|
||||
import net.minecraftforge.client.model.ICustomModelLoader;
|
||||
import net.minecraftforge.client.model.IFlexibleBakedModel;
|
||||
import net.minecraftforge.client.model.IModel;
|
||||
@@ -465,7 +466,7 @@ public class B3DLoader implements ICustomModelLoader
|
||||
buf.flip();
|
||||
int[] data = new int[VERTICES_IN_QUAD * format.getNextOffset() / BYTES_IN_INT];
|
||||
buf.asIntBuffer().get(data);
|
||||
builder.add(new BakedQuad(data, -1, EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z)));
|
||||
builder.add(new ColoredBakedQuad(data, -1, EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z)));
|
||||
}
|
||||
quads = builder.build();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user