mirror of
https://github.com/Jozufozu/Flywheel.git
synced 2024-11-10 12:34:11 +01:00
Merge branch 'dev' into vanilla-opt
# Conflicts: # src/main/java/com/jozufozu/flywheel/backend/instancing/Instancer.java
This commit is contained in:
commit
7ad7512e7e
@ -4,7 +4,7 @@ import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer;
|
||||
|
||||
public abstract class InstanceData {
|
||||
|
||||
protected final Instancer<?> owner;
|
||||
Instancer<?> owner;
|
||||
|
||||
boolean dirty;
|
||||
boolean removed;
|
||||
|
@ -60,15 +60,14 @@ public class Instancer<D extends InstanceData> {
|
||||
}
|
||||
|
||||
public D createInstance() {
|
||||
D instanceData = factory.create(this);
|
||||
instanceData.dirty = true;
|
||||
anyToUpdate = true;
|
||||
return _add(factory.create(this));
|
||||
}
|
||||
|
||||
synchronized (data) {
|
||||
data.add(instanceData);
|
||||
}
|
||||
public void stealInstance(D inOther) {
|
||||
if (inOther.owner == this) return;
|
||||
|
||||
return instanceData;
|
||||
inOther.owner.anyToRemove = true;
|
||||
_add(inOther);
|
||||
}
|
||||
|
||||
private void init() {
|
||||
@ -125,6 +124,18 @@ public class Instancer<D extends InstanceData> {
|
||||
}
|
||||
}
|
||||
|
||||
private D _add(D instanceData) {
|
||||
instanceData.owner = this;
|
||||
|
||||
instanceData.dirty = true;
|
||||
anyToUpdate = true;
|
||||
synchronized (data) {
|
||||
data.add(instanceData);
|
||||
}
|
||||
|
||||
return instanceData;
|
||||
}
|
||||
|
||||
protected void renderSetup() {
|
||||
if (anyToRemove) {
|
||||
removeDeletedInstances();
|
||||
@ -235,7 +246,7 @@ public class Instancer<D extends InstanceData> {
|
||||
final BitSet removeSet = new BitSet(oldSize);
|
||||
for (int i = 0; i < oldSize; i++) {
|
||||
final D element = this.data.get(i);
|
||||
if (element.removed) {
|
||||
if (element.removed || element.owner != this) {
|
||||
removeSet.set(i);
|
||||
removeCount++;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user