Skip to content

Commit

Permalink
refactor: improve disk drive model baking in forge
Browse files Browse the repository at this point in the history
  • Loading branch information
@raoulvdberge
raoulvdberge committed Dec 29, 2023
1 parent e24705a commit 745cc14
Show file tree
Hide file tree
Showing 6 changed files with 124 additions and 315 deletions.
210 changes: 90 additions & 120 deletions ...com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBakedModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,23 @@
import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity;
import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveBlock;
import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection;
import com.refinedmods.refinedstorage2.platform.forge.support.render.DiskModelBaker;
import com.refinedmods.refinedstorage2.platform.forge.support.render.ItemBakedModel;
import com.refinedmods.refinedstorage2.platform.forge.support.render.RotationTranslationModelBaker;
import com.refinedmods.refinedstorage2.platform.forge.support.render.TransformationBuilder;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.BiFunction;
import java.util.function.Function;
import javax.annotation.Nullable;

import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.mojang.math.Transformation;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.block.model.BakedQuad;
Expand All @@ -38,50 +40,46 @@
import org.joml.Vector3f;

class DiskDriveBakedModel extends BakedModelWrapper<BakedModel> {
private static final Vector3f[] TRANSLATORS = new Vector3f[8];

static {
private final LoadingCache<CacheKey, List<BakedQuad>> cache;
private final ItemOverrides itemOverrides = new DiskDriveItemOverrides();
private final Vector3f[] diskTranslations = new Vector3f[8];

DiskDriveBakedModel(final BakedModel baseModel,
final RotationTranslationModelBaker baseModelBaker,
final DiskModelBaker diskModelBaker,
final RotationTranslationModelBaker ledInactiveModelBaker) {
super(baseModel);
int i = 0;
for (int y = 0; y < 4; ++y) {
for (int x = 0; x < 2; ++x) {
TRANSLATORS[i++] = new Vector3f(
x == 0 ? -(2F / 16F) : -(9F / 16F),
-((y * 3F) / 16F) - (2F / 16F),
0
);
this.diskTranslations[i++] = getDiskTranslation(x, y);
}
}
}

private final BakedModel baseModel;
private final Function<BiDirection, BakedModel> baseModelBakery;
private final Map<Item, BiFunction<BiDirection, Vector3f, BakedModel>> diskModelBakeries;
private final Map<Item, Function<Vector3f, BakedModel>> diskItemModelBakeries;
private final Function<Vector3f, BakedModel> ledInactiveModelBakery;

private final ItemOverrides overrides = new DiskDriveItemOverrides();

private final LoadingCache<DiskDriveStateCacheKey, List<BakedQuad>> cache = CacheBuilder
.newBuilder()
.build(new DiskDriveCacheLoader());
private final Map<List<Item>, DiskDriveItemBakedModel> itemCache = new HashMap<>();

DiskDriveBakedModel(final Function<BiDirection, BakedModel> baseModelBakery,
final BakedModel baseModel,
final Map<Item, BiFunction<BiDirection, Vector3f, BakedModel>> diskModelBakeries,
final Map<Item, Function<Vector3f, BakedModel>> diskItemModelBakeries,
final Function<Vector3f, BakedModel> ledInactiveModelBakery) {
super(baseModel);
this.baseModel = baseModel;
this.baseModelBakery = baseModelBakery;
this.diskModelBakeries = diskModelBakeries;
this.diskItemModelBakeries = diskItemModelBakeries;
this.ledInactiveModelBakery = ledInactiveModelBakery;
this.cache = CacheBuilder.newBuilder().build(CacheLoader.from(cacheKey -> {
final Transformation rotation = TransformationBuilder.create().rotate(cacheKey.direction).build();
final RandomSource rand = RandomSource.create();
final List<BakedQuad> quads = new ArrayList<>(
baseModelBaker.bake(rotation).getQuads(null, cacheKey.side, rand)
);
for (int j = 0; j < diskTranslations.length; ++j) {
final Disk disk = cacheKey.disks[j];
quads.addAll(getDiskQuads(diskModelBaker, cacheKey, disk, j));
if (cacheKey.withInactiveLed && disk.state() == StorageState.INACTIVE) {
final Transformation ledTransform = TransformationBuilder
.create()
.rotate(cacheKey.direction)
.translate(diskTranslations[j])
.build();
quads.addAll(ledInactiveModelBaker.bake(ledTransform).getQuads(null, cacheKey.side, rand));
}
}
return quads;
}));
}

@Override
public ItemOverrides getOverrides() {
return overrides;
return itemOverrides;
}

@Override
Expand All @@ -101,17 +99,51 @@ public List<BakedQuad> getQuads(@Nullable final BlockState state,
if (disks == null) {
return super.getQuads(state, side, rand);
}
final DiskDriveStateCacheKey cacheKey = new DiskDriveStateCacheKey(
state,
side,
disks,
rand,
direction
return cache.getUnchecked(new CacheKey(side, false, direction, disks));
}

private List<BakedQuad> getDiskQuads(final DiskModelBaker diskBakers,
final CacheKey cacheKey,
final Disk disk,
final int index) {
if (disk.state() == StorageState.NONE || disk.item() == null) {
return Collections.emptyList();
}
final RotationTranslationModelBaker diskBaker = diskBakers.forDisk(disk.item());
if (diskBaker == null) {
return Collections.emptyList();
}
final Transformation diskTransform = TransformationBuilder.create()
.rotate(cacheKey.direction)
.translate(diskTranslations[index])
.build();
return diskBaker.bake(diskTransform).getQuads(null, cacheKey.side, RandomSource.create());
}

private static Vector3f getDiskTranslation(final int x, final int y) {
return new Vector3f(
x == 0 ? -(2F / 16F) : -(9F / 16F),
-((y * 3F) / 16F) - (2F / 16F),
0
);
return cache.getUnchecked(cacheKey);
}

private class DiskDriveItemOverrides extends ItemOverrides {
private final LoadingCache<CacheKey, BakedModel> itemCache = CacheBuilder.newBuilder().build(
CacheLoader.from(cacheKey -> new ItemBakedModel(
originalModel,
cache.getUnchecked(cacheKey),
Map.of(
Direction.NORTH, cache.getUnchecked(cacheKey.withSide(Direction.NORTH)),
Direction.EAST, cache.getUnchecked(cacheKey.withSide(Direction.EAST)),
Direction.SOUTH, cache.getUnchecked(cacheKey.withSide(Direction.SOUTH)),
Direction.WEST, cache.getUnchecked(cacheKey.withSide(Direction.WEST)),
Direction.UP, cache.getUnchecked(cacheKey.withSide(Direction.UP)),
Direction.DOWN, cache.getUnchecked(cacheKey.withSide(Direction.DOWN))
)
))
);

@Nullable
@Override
public BakedModel resolve(final BakedModel bakedModel,
Expand All @@ -121,41 +153,20 @@ public BakedModel resolve(final BakedModel bakedModel,
final int seed) {
final CompoundTag tag = BlockItem.getBlockEntityData(stack);
if (tag == null) {
return baseModel.getOverrides().resolve(bakedModel, stack, level, entity, seed);
return originalModel.getOverrides().resolve(bakedModel, stack, level, entity, seed);
}
final List<Item> disks = new ArrayList<>();
for (int i = 0; i < TRANSLATORS.length; ++i) {
final Item disk = AbstractDiskDriveBlockEntity.getDisk(tag, i);
disks.add(disk);
final Disk[] disks = new Disk[8];
for (int i = 0; i < diskTranslations.length; ++i) {
final Item diskItem = AbstractDiskDriveBlockEntity.getDisk(tag, i);
disks[i] = new Disk(diskItem, diskItem == null ? StorageState.NONE : StorageState.INACTIVE);
}
return itemCache.computeIfAbsent(disks, key -> new DiskDriveItemBakedModel(
bakedModel,
diskItemModelBakeries,
ledInactiveModelBakery,
TRANSLATORS,
disks
));
return itemCache.getUnchecked(new CacheKey(null, true, BiDirection.NORTH, disks));
}
}

private static final class DiskDriveStateCacheKey {
private final BlockState state;
@Nullable
private final Direction side;
private final Disk[] disks;
private final RandomSource random;
private final BiDirection direction;

DiskDriveStateCacheKey(final BlockState state,
@Nullable final Direction side,
final Disk[] disks,
final RandomSource random,
final BiDirection direction) {
this.state = state;
this.side = side;
this.disks = disks;
this.random = random;
this.direction = direction;
private record CacheKey(@Nullable Direction side, boolean withInactiveLed, BiDirection direction, Disk[] disks) {
CacheKey withSide(final Direction newSide) {
return new CacheKey(newSide, withInactiveLed, direction, disks);
}

@Override
Expand All @@ -166,57 +177,16 @@ public boolean equals(final Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
final DiskDriveStateCacheKey that = (DiskDriveStateCacheKey) o;
return state.equals(that.state) && side == that.side && Arrays.equals(disks, that.disks);
final CacheKey cacheKey = (CacheKey) o;
return side == cacheKey.side && direction == cacheKey.direction && Arrays.equals(disks, cacheKey.disks)
&& withInactiveLed == cacheKey.withInactiveLed;
}

@Override
public int hashCode() {
int result = Objects.hash(state, side);
int result = Objects.hash(side, direction, withInactiveLed);
result = 31 * result + Arrays.hashCode(disks);
return result;
}
}

private class DiskDriveCacheLoader extends CacheLoader<DiskDriveStateCacheKey, List<BakedQuad>> {
@Override
public List<BakedQuad> load(final DiskDriveStateCacheKey key) {
final List<BakedQuad> quads = new ArrayList<>(getBaseQuads(key.state, key.random, key.side, key.direction));
for (int i = 0; i < TRANSLATORS.length; ++i) {
final Disk disk = key.disks[i];
quads.addAll(getDiskQuads(key, disk, i));
}
return quads;
}

@SuppressWarnings("deprecation")
private List<BakedQuad> getDiskQuads(final DiskDriveStateCacheKey key,
final Disk disk,
final int index) {
if (disk.state() == StorageState.NONE) {
return Collections.emptyList();
}
final var diskModelBakery = diskModelBakeries.get(disk.item());
if (diskModelBakery == null) {
return Collections.emptyList();
}
return diskModelBakery.apply(key.direction, TRANSLATORS[index]).getQuads(
key.state,
key.side,
key.random
);
}

@SuppressWarnings("deprecation")
private List<BakedQuad> getBaseQuads(final BlockState state,
final RandomSource rand,
@Nullable final Direction side,
final BiDirection direction) {
return baseModelBakery.apply(direction).getQuads(
state,
side,
rand
);
}
}
}
113 changes: 0 additions & 113 deletions ...refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveItemBakedModel.java
View file

This file was deleted.

Loading

0 comments on commit 745cc14

Please sign in to comment.