fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved TESR rendering for inscriber again:

Browse Source 
- Use storage block tag to determine if the larger transform should be used to show it in the inscriber.
- Use an easing function to retract the stamp
This commit is contained in:
Sebastian Hartte
2020-06-14 13:40:22 +02:00
parent 190060754d
commit f5a56682dd
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/tesr/InscriberTESR.java
+22 -16
View File
@@ -15,7 +15,6 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.inventory.container.PlayerContainer;
import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@@ -41,14 +40,6 @@ public final class InscriberTESR extends TileEntityRenderer<TileInscriber>
super(rendererDispatcherIn); super(rendererDispatcherIn);
} }
// See https://easings.net/#easeOutBack
private static float ease(float x) {
float c1 = 1.70158f;
float c3 = c1 + 1;
return (float) (1 + c3 * Math.pow(x - 1, 3) + c1 * Math.pow(x - 1, 2));
}
@Override @Override
public void render(TileInscriber tile, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int combinedLight, int combinedOverlay) { public void render(TileInscriber tile, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int combinedLight, int combinedOverlay) {
@@ -78,10 +69,9 @@ public final class InscriberTESR extends TileEntityRenderer<TileInscriber>
if( progress > 1.0f ) if( progress > 1.0f )
{ {
progress = 1.0f - ( progress - 1.0f ); progress = 1.0f - ( easeDecompressMotion(progress - 1.0f) );
} else { } else {
// Only apply the easing function on the way down progress = easeCompressMotion(progress);
progress = ease(progress);
} }
float press = 0.2f; float press = 0.2f;
@@ -184,12 +174,12 @@ public final class InscriberTESR extends TileEntityRenderer<TileInscriber>
vb.endVertex(); vb.endVertex();
} }
private static final ResourceLocation TAG_STORAGE_BLOCKS = new ResourceLocation("forge:storage_blocks");
private void renderItem( MatrixStack ms, final ItemStack stack, final float o, IRenderTypeBuffer buffers, int combinedLight, int combinedOverlay ) private void renderItem( MatrixStack ms, final ItemStack stack, final float o, IRenderTypeBuffer buffers, int combinedLight, int combinedOverlay )
{ {
if( !stack.isEmpty() ) if( !stack.isEmpty() )
{ {
final ItemStack sis = stack.copy(); // FIXME WHY????
ms.push(); ms.push();
// move to center // move to center
ms.translate( 0.5f, 0.5f + o, 0.5f ); ms.translate( 0.5f, 0.5f + o, 0.5f );
@@ -197,13 +187,15 @@ public final class InscriberTESR extends TileEntityRenderer<TileInscriber>
// set scale // set scale
ms.scale( ITEM_RENDER_SCALE, ITEM_RENDER_SCALE, ITEM_RENDER_SCALE ); ms.scale( ITEM_RENDER_SCALE, ITEM_RENDER_SCALE, ITEM_RENDER_SCALE );
ItemRenderer itemRenderer = Minecraft.getInstance().getItemRenderer();
// heuristic to scale items down much further than blocks // heuristic to scale items down much further than blocks
if( !( sis.getItem() instanceof BlockItem ) ) if( !stack.getItem().getTags().contains(TAG_STORAGE_BLOCKS) )
{ {
ms.scale( 0.5f, 0.5f, 0.5f ); ms.scale( 0.5f, 0.5f, 0.5f );
} }
Minecraft.getInstance().getItemRenderer().renderItem(sis, ItemCameraTransforms.TransformType.FIXED, combinedLight, combinedOverlay, ms, buffers); itemRenderer.renderItem(stack, ItemCameraTransforms.TransformType.FIXED, combinedLight, combinedOverlay, ms, buffers);
ms.pop(); ms.pop();
} }
} }
@@ -214,4 +206,18 @@ public final class InscriberTESR extends TileEntityRenderer<TileInscriber>
evt.addSprite(TEXTURE_INSIDE.getTextureLocation()); evt.addSprite(TEXTURE_INSIDE.getTextureLocation());
} }
} }
// See https://easings.net/#easeOutBack
private static float easeCompressMotion(float x) {
float c1 = 1.70158f;
float c3 = c1 + 1;
return (float) (1 + c3 * Math.pow(x - 1, 3) + c1 * Math.pow(x - 1, 2));
}
// See https://easings.net/#easeInQuint
private static float easeDecompressMotion(float x) {
return x * x * x * x * x;
}
} }