mirror of
https://github.com/GTNewHorizons/CodeChickenCore.git
synced 2026-11-16 18:54:51 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b738e8e073 | ||
|
|
a385d29ab3 | ||
|
|
60d44f3c7b | ||
|
|
6209831d08 | ||
|
|
7ae8b15810 | ||
|
|
08f3e4d42a |
No files matched your search
@@ -6,3 +6,10 @@ minecraft {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
test {
|
||||||
|
useJUnitPlatform()
|
||||||
|
testLogging {
|
||||||
|
events "passed", "skipped", "failed"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
// Add your dependencies here
|
// Add your dependencies here
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
testImplementation(platform('org.junit:junit-bom:5.14.1'))
|
||||||
|
testImplementation('org.junit.jupiter:junit-jupiter')
|
||||||
|
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
|
||||||
}
|
}
|
||||||
@@ -116,6 +116,7 @@ public class ClassDiscoverer {
|
|||||||
while (zipEntries.hasMoreElements()) {
|
while (zipEntries.hasMoreElements()) {
|
||||||
ZipEntry zipentry = zipEntries.nextElement();
|
ZipEntry zipentry = zipEntries.nextElement();
|
||||||
String fullname = zipentry.getName().replace('\\', '/');
|
String fullname = zipentry.getName().replace('\\', '/');
|
||||||
|
if (fullname.startsWith("META-INF/versions/")) continue;
|
||||||
int pos = fullname.lastIndexOf('/');
|
int pos = fullname.lastIndexOf('/');
|
||||||
String name = pos == -1 ? fullname : fullname.substring(pos + 1);
|
String name = pos == -1 ? fullname : fullname.substring(pos + 1);
|
||||||
if (!zipentry.isDirectory() && matcher.matches(name)) {
|
if (!zipentry.isDirectory() && matcher.matches(name)) {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package codechicken.lib.asm;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
import net.minecraft.launchwrapper.IClassTransformer;
|
import net.minecraft.launchwrapper.IClassTransformer;
|
||||||
import net.minecraft.launchwrapper.Launch;
|
import net.minecraft.launchwrapper.Launch;
|
||||||
@@ -107,6 +108,7 @@ public class ClassHeirachyManager implements IClassTransformer {
|
|||||||
private static class ClassInfo {
|
private static class ClassInfo {
|
||||||
|
|
||||||
public static final ClassInfo OBJECT = new ClassInfo();
|
public static final ClassInfo OBJECT = new ClassInfo();
|
||||||
|
private static final Map<String, String> STRING_POOL = new ConcurrentHashMap<>(256);
|
||||||
|
|
||||||
public final String superclass;
|
public final String superclass;
|
||||||
public final String[] interfaces;
|
public final String[] interfaces;
|
||||||
@@ -125,7 +127,7 @@ public class ClassHeirachyManager implements IClassTransformer {
|
|||||||
superclass = "java.lang.Object";
|
superclass = "java.lang.Object";
|
||||||
parent = OBJECT;
|
parent = OBJECT;
|
||||||
} else {
|
} else {
|
||||||
superclass = toKey(superName);
|
superclass = pool(toKey(superName));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interfaces == null || interfaces.length == 0) {
|
if (interfaces == null || interfaces.length == 0) {
|
||||||
@@ -133,7 +135,7 @@ public class ClassHeirachyManager implements IClassTransformer {
|
|||||||
} else {
|
} else {
|
||||||
this.interfaces = new String[interfaces.length];
|
this.interfaces = new String[interfaces.length];
|
||||||
for (int i = 0; i < interfaces.length; i++) {
|
for (int i = 0; i < interfaces.length; i++) {
|
||||||
this.interfaces[i] = toKey(interfaces[i]);
|
this.interfaces[i] = pool(toKey(interfaces[i]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -148,7 +150,7 @@ public class ClassHeirachyManager implements IClassTransformer {
|
|||||||
this.superclass = "java.lang.Object";
|
this.superclass = "java.lang.Object";
|
||||||
this.parent = OBJECT;
|
this.parent = OBJECT;
|
||||||
} else {
|
} else {
|
||||||
this.superclass = toKey(superclass.getName());
|
this.superclass = pool(toKey(superclass.getName()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final Class<?>[] interfaces = aclass.getInterfaces();
|
final Class<?>[] interfaces = aclass.getInterfaces();
|
||||||
@@ -157,7 +159,7 @@ public class ClassHeirachyManager implements IClassTransformer {
|
|||||||
} else {
|
} else {
|
||||||
this.interfaces = new String[interfaces.length];
|
this.interfaces = new String[interfaces.length];
|
||||||
for (int i = 0; i < interfaces.length; i++) {
|
for (int i = 0; i < interfaces.length; i++) {
|
||||||
this.interfaces[i] = toKey(interfaces[i].getName());
|
this.interfaces[i] = pool(toKey(interfaces[i].getName()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -172,5 +174,9 @@ public class ClassHeirachyManager implements IClassTransformer {
|
|||||||
this.parent = parentInfo;
|
this.parent = parentInfo;
|
||||||
return parentInfo.hasSuper(superclass);
|
return parentInfo.hasSuper(superclass);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static String pool(String s) {
|
||||||
|
return STRING_POOL.computeIfAbsent(s, Function.identity());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -12,7 +12,12 @@ import codechicken.lib.vec.BlockCoord;
|
|||||||
public class SimpleBrightnessModel implements CCRenderState.IVertexOperation {
|
public class SimpleBrightnessModel implements CCRenderState.IVertexOperation {
|
||||||
|
|
||||||
public static final int operationIndex = CCRenderState.registerOperation();
|
public static final int operationIndex = CCRenderState.registerOperation();
|
||||||
public static SimpleBrightnessModel instance = new SimpleBrightnessModel();
|
private static final ThreadLocal<SimpleBrightnessModel> instances = ThreadLocal
|
||||||
|
.withInitial(SimpleBrightnessModel::new);
|
||||||
|
|
||||||
|
public static SimpleBrightnessModel instance() {
|
||||||
|
return instances.get();
|
||||||
|
}
|
||||||
|
|
||||||
public IBlockAccess access;
|
public IBlockAccess access;
|
||||||
public BlockCoord pos = new BlockCoord();
|
public BlockCoord pos = new BlockCoord();
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package codechicken.lib.render;
|
package codechicken.lib.render;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.OpenGlHelper;
|
import net.minecraft.client.renderer.OpenGlHelper;
|
||||||
@@ -38,9 +39,9 @@ public class CCRenderState {
|
|||||||
return instances.get();
|
return instances.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static int nextOperationIndex;
|
private static volatile int nextOperationIndex;
|
||||||
|
|
||||||
public static int registerOperation() {
|
public static synchronized int registerOperation() {
|
||||||
return nextOperationIndex++;
|
return nextOperationIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,15 +88,52 @@ public class CCRenderState {
|
|||||||
int operationID();
|
int operationID();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ArrayList<VertexAttribute<?>> vertexAttributes = new ArrayList<>();
|
public static final class AttributeKey<T> {
|
||||||
|
|
||||||
private static int registerVertexAttribute(VertexAttribute<?> attr) {
|
private static final HashMap<String, AttributeKey<?>> nameMap = new HashMap<>();
|
||||||
vertexAttributes.add(attr);
|
private static final ArrayList<AttributeKey<?>> attributeKeys = new ArrayList<>();
|
||||||
return vertexAttributes.size() - 1;
|
private static int nextLegacyId;
|
||||||
|
|
||||||
|
public final String name;
|
||||||
|
public final int attributeKeyIndex;
|
||||||
|
public final int operationIndex;
|
||||||
|
private VertexAttribute<T> canonical;
|
||||||
|
|
||||||
|
private AttributeKey(String name) {
|
||||||
|
this.name = name;
|
||||||
|
this.attributeKeyIndex = attributeKeys.size();
|
||||||
|
this.operationIndex = registerOperation();
|
||||||
|
attributeKeys.add(this);
|
||||||
|
nameMap.put(name, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static synchronized <T> AttributeKey<T> create(String name) {
|
||||||
|
if (nameMap.containsKey(name))
|
||||||
|
throw new IllegalArgumentException("Duplicate registration of attribute with name: " + name);
|
||||||
|
return new AttributeKey<>(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
static synchronized <T> AttributeKey<T> createLegacy() {
|
||||||
|
return new AttributeKey<>("legacy#" + nextLegacyId++);
|
||||||
|
}
|
||||||
|
|
||||||
|
synchronized void setCanonical(VertexAttribute<T> attr) {
|
||||||
|
if (canonical == null) canonical = attr;
|
||||||
|
}
|
||||||
|
|
||||||
|
static synchronized AttributeKey<?> get(int index) {
|
||||||
|
return attributeKeys.get(index);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final AttributeKey<Vector3[]> NORMAL_KEY = AttributeKey.create("normal");
|
||||||
|
private static final AttributeKey<int[]> COLOUR_KEY = AttributeKey.create("colour");
|
||||||
|
private static final AttributeKey<int[]> LIGHTING_KEY = AttributeKey.create("lighting");
|
||||||
|
private static final AttributeKey<int[]> SIDE_KEY = AttributeKey.create("side");
|
||||||
|
private static final AttributeKey<LC[]> LC_KEY = AttributeKey.create("lc");
|
||||||
|
|
||||||
public static VertexAttribute<?> getAttribute(int index) {
|
public static VertexAttribute<?> getAttribute(int index) {
|
||||||
return vertexAttributes.get(index);
|
return AttributeKey.get(index).canonical;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -106,14 +144,26 @@ public class CCRenderState {
|
|||||||
*/
|
*/
|
||||||
public abstract static class VertexAttribute<T> implements IVertexOperation {
|
public abstract static class VertexAttribute<T> implements IVertexOperation {
|
||||||
|
|
||||||
public final int attributeIndex = registerVertexAttribute(this);
|
public final int attributeIndex;
|
||||||
private final int operationIndex = registerOperation();
|
private final int operationIndex;
|
||||||
/**
|
/**
|
||||||
* Set to true when the attrute is part of the pipeline. Should only be managed by CCRenderState when
|
* Set to true when the attrute is part of the pipeline. Should only be managed by CCRenderState when
|
||||||
* constructing the pipeline
|
* constructing the pipeline
|
||||||
*/
|
*/
|
||||||
public boolean active = false;
|
public boolean active = false;
|
||||||
|
|
||||||
|
protected VertexAttribute(AttributeKey<T> key) {
|
||||||
|
attributeIndex = key.attributeKeyIndex;
|
||||||
|
operationIndex = key.operationIndex;
|
||||||
|
key.setCanonical(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @deprecated keyless attributes get a per-construction index that is threadsafe */
|
||||||
|
@Deprecated
|
||||||
|
protected VertexAttribute() {
|
||||||
|
this(AttributeKey.createLegacy());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Construct a new array for storage of vertex attrutes in a model
|
* Construct a new array for storage of vertex attrutes in a model
|
||||||
*/
|
*/
|
||||||
@@ -189,7 +239,7 @@ public class CCRenderState {
|
|||||||
return instances.get().lightingAttrib;
|
return instances.get().lightingAttrib;
|
||||||
}
|
}
|
||||||
|
|
||||||
public VertexAttribute<Vector3[]> normalAttrib = new VertexAttribute<>() {
|
public VertexAttribute<Vector3[]> normalAttrib = new VertexAttribute<>(NORMAL_KEY) {
|
||||||
|
|
||||||
private Vector3[] normalRef;
|
private Vector3[] normalRef;
|
||||||
|
|
||||||
@@ -217,7 +267,7 @@ public class CCRenderState {
|
|||||||
else state.setNormalInstance(Rotation.axes[state.side]);
|
else state.setNormalInstance(Rotation.axes[state.side]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
public VertexAttribute<int[]> colourAttrib = new VertexAttribute<>() {
|
public VertexAttribute<int[]> colourAttrib = new VertexAttribute<>(COLOUR_KEY) {
|
||||||
|
|
||||||
private int[] colourRef;
|
private int[] colourRef;
|
||||||
|
|
||||||
@@ -239,7 +289,7 @@ public class CCRenderState {
|
|||||||
else state.setColourInstance(state.baseColour);
|
else state.setColourInstance(state.baseColour);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
public VertexAttribute<int[]> lightingAttrib = new VertexAttribute<>() {
|
public VertexAttribute<int[]> lightingAttrib = new VertexAttribute<>(LIGHTING_KEY) {
|
||||||
|
|
||||||
private int[] colourRef;
|
private int[] colourRef;
|
||||||
|
|
||||||
@@ -265,7 +315,7 @@ public class CCRenderState {
|
|||||||
state.setColourInstance(ColourRGBA.multiply(state.colour, colourRef[state.vertexIndex]));
|
state.setColourInstance(ColourRGBA.multiply(state.colour, colourRef[state.vertexIndex]));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
public VertexAttribute<int[]> sideAttrib = new VertexAttribute<>() {
|
public VertexAttribute<int[]> sideAttrib = new VertexAttribute<>(SIDE_KEY) {
|
||||||
|
|
||||||
private int[] sideRef;
|
private int[] sideRef;
|
||||||
|
|
||||||
@@ -292,7 +342,7 @@ public class CCRenderState {
|
|||||||
/**
|
/**
|
||||||
* Uses the position of the lightmatrix to compute LC if not provided
|
* Uses the position of the lightmatrix to compute LC if not provided
|
||||||
*/
|
*/
|
||||||
public VertexAttribute<LC[]> lightCoordAttrib = new VertexAttribute<>() {
|
public VertexAttribute<LC[]> lightCoordAttrib = new VertexAttribute<>(LC_KEY) {
|
||||||
|
|
||||||
private LC[] lcRef;
|
private LC[] lcRef;
|
||||||
private final Vector3 vec = new Vector3(); // for computation
|
private final Vector3 vec = new Vector3(); // for computation
|
||||||
|
|||||||
@@ -55,7 +55,10 @@ public class WorldExtensionManager {
|
|||||||
public void onChunkUnLoad(ChunkEvent.Unload event) {
|
public void onChunkUnLoad(ChunkEvent.Unload event) {
|
||||||
if (event.getChunk() instanceof EmptyChunk) return;
|
if (event.getChunk() instanceof EmptyChunk) return;
|
||||||
|
|
||||||
for (WorldExtension extension : worldMap.get(event.world)) extension.unloadChunk(event.getChunk());
|
WorldExtension[] extensions = worldMap.get(event.world);
|
||||||
|
if (extensions == null) return;
|
||||||
|
|
||||||
|
for (WorldExtension extension : extensions) extension.unloadChunk(event.getChunk());
|
||||||
|
|
||||||
if (event.world.isRemote) removeChunk(event.world, event.getChunk());
|
if (event.world.isRemote) removeChunk(event.world, event.getChunk());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,102 @@
|
|||||||
|
package codechicken.lib.render;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertSame;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CyclicBarrier;
|
||||||
|
import java.util.concurrent.ExecutorService;
|
||||||
|
import java.util.concurrent.Executors;
|
||||||
|
import java.util.concurrent.Future;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import codechicken.lib.vec.Vector3;
|
||||||
|
|
||||||
|
public class CCRenderStateThreadingTest {
|
||||||
|
|
||||||
|
private static int[] attribIndices() {
|
||||||
|
return new int[] { CCRenderState.normalAttrib().attributeIndex, CCRenderState.colourAttrib().attributeIndex,
|
||||||
|
CCRenderState.lightingAttrib().attributeIndex, CCRenderState.sideAttrib().attributeIndex,
|
||||||
|
CCRenderState.lightCoordAttrib().attributeIndex };
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void attributeIndicesStableAcrossThreads() throws Exception {
|
||||||
|
int[] main = attribIndices();
|
||||||
|
assertEquals(5, Arrays.stream(main).distinct().count());
|
||||||
|
|
||||||
|
ExecutorService pool = Executors.newFixedThreadPool(8);
|
||||||
|
try {
|
||||||
|
List<Future<int[]>> futures = new ArrayList<>();
|
||||||
|
for (int i = 0; i < 8; i++) futures.add(pool.submit(CCRenderStateThreadingTest::attribIndices));
|
||||||
|
for (Future<int[]> f : futures) assertArrayEquals(main, f.get(10, TimeUnit.SECONDS));
|
||||||
|
} finally {
|
||||||
|
pool.shutdownNow();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void modelBakedOnOneThreadIsReadableOnAnother() throws Exception {
|
||||||
|
ExecutorService bakeThread = Executors.newSingleThreadExecutor();
|
||||||
|
ExecutorService renderThread = Executors.newSingleThreadExecutor();
|
||||||
|
try {
|
||||||
|
CCModel model = bakeThread.submit(() -> {
|
||||||
|
CCModel m = CCModel.quadModel(4);
|
||||||
|
m.verts[0] = new Vertex5(0, 1, 0, 0, 0);
|
||||||
|
m.verts[1] = new Vertex5(0, 1, 1, 0, 1);
|
||||||
|
m.verts[2] = new Vertex5(1, 1, 1, 1, 1);
|
||||||
|
m.verts[3] = new Vertex5(1, 1, 0, 1, 0);
|
||||||
|
return m.computeNormals();
|
||||||
|
}).get(10, TimeUnit.SECONDS);
|
||||||
|
|
||||||
|
int side = renderThread.submit(() -> {
|
||||||
|
assertTrue(
|
||||||
|
model.hasAttribute(CCRenderState.normalAttrib()),
|
||||||
|
"normals baked on another thread not visible under this thread's attributeIndex");
|
||||||
|
Vector3[] normals = model.getAttributes(CCRenderState.normalAttrib());
|
||||||
|
assertNotNull(normals);
|
||||||
|
return CCModel.findSide(normals[0]);
|
||||||
|
}).get(10, TimeUnit.SECONDS);
|
||||||
|
|
||||||
|
assertEquals(1, side);
|
||||||
|
assertEquals(1, CCModel.findSide(model.getAttributes(CCRenderState.normalAttrib())[0]));
|
||||||
|
} finally {
|
||||||
|
bakeThread.shutdownNow();
|
||||||
|
renderThread.shutdownNow();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void concurrentFirstUseKeepsIndicesConsistent() throws Exception {
|
||||||
|
int threads = 16;
|
||||||
|
CyclicBarrier barrier = new CyclicBarrier(threads);
|
||||||
|
ExecutorService pool = Executors.newFixedThreadPool(threads);
|
||||||
|
try {
|
||||||
|
List<Future<int[]>> futures = new ArrayList<>();
|
||||||
|
for (int i = 0; i < threads; i++) futures.add(pool.submit(() -> {
|
||||||
|
barrier.await(10, TimeUnit.SECONDS);
|
||||||
|
return attribIndices();
|
||||||
|
}));
|
||||||
|
int[] expected = attribIndices();
|
||||||
|
for (Future<int[]> f : futures) assertArrayEquals(expected, f.get(10, TimeUnit.SECONDS));
|
||||||
|
} finally {
|
||||||
|
pool.shutdownNow();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAttributeReturnsCanonicalForIndex() {
|
||||||
|
int normalIndex = CCRenderState.normalAttrib().attributeIndex;
|
||||||
|
CCRenderState.VertexAttribute<?> canonical = CCRenderState.getAttribute(normalIndex);
|
||||||
|
assertNotNull(canonical);
|
||||||
|
assertEquals(normalIndex, canonical.attributeIndex);
|
||||||
|
assertSame(canonical, CCRenderState.getAttribute(normalIndex));
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user