mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-01 09:57:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix one residual merge conflict.

Browse source 
creating matrix stacks is expensive, but correct.
This commit is contained in:
JozsefA 2021-02-17 14:27:49 -08:00
parent 24ab4e181f
commit 9b4d53d452
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
View file

@ -799,7 +799,7 @@ public abstract class Contraption {
Block block = info.state.getBlock(); Block block = info.state.getBlock();
CompoundNBT tag = info.nbt; CompoundNBT tag = info.nbt;
MovementBehaviour movementBehaviour = AllMovementBehaviours.of(block); MovementBehaviour movementBehaviour = AllMovementBehaviours.of(block);
if (tag == null || (movementBehaviour != null && movementBehaviour.hasSpecialMovementRenderer())) if (tag == null)
return; return;
tag.putInt("x", info.pos.getX()); tag.putInt("x", info.pos.getX());

5
src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
View file

@ -25,7 +25,7 @@ public class SuperByteBuffer extends TemplateBuffer {
} }
// Vertex Position // Vertex Position
private final MatrixStack transforms; private MatrixStack transforms;
// Vertex Texture Coords // Vertex Texture Coords
private SpriteShiftFunc spriteShiftFunc; private SpriteShiftFunc spriteShiftFunc;
@ -152,7 +152,8 @@ public class SuperByteBuffer extends TemplateBuffer {
.endVertex(); .endVertex();
} }
while (!transforms.isEmpty()) transforms.pop(); transforms = new MatrixStack();
spriteShiftFunc = null; spriteShiftFunc = null;
shouldColor = false; shouldColor = false;
shouldLight = false; shouldLight = false;