Skip to content

Commit

Permalink
Allow VertexViews to hold a memory owner
Browse files Browse the repository at this point in the history
- Remove MemoryBlock parameter from SimpleQuadMesh constructors
  • Loading branch information
PepperCode1 committed Sep 10, 2024
1 parent 1a8ed8d commit 14ca1d3
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

import java.util.List;

import dev.engine_room.flywheel.api.instance.InstanceType;

import dev.engine_room.flywheel.api.instance.InstancerProvider;

import org.joml.Vector4fc;

import dev.engine_room.flywheel.api.instance.InstanceType;
import dev.engine_room.flywheel.api.instance.InstancerProvider;
import dev.engine_room.flywheel.api.material.Material;

public interface Model {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,21 @@

import dev.engine_room.flywheel.api.vertex.MutableVertexList;
import dev.engine_room.flywheel.api.vertex.VertexList;
import dev.engine_room.flywheel.lib.memory.MemoryBlock;

public final class SimpleQuadMesh implements QuadMesh {
private final VertexList vertexList;
// Unused but we need to hold on to a reference so the cleaner doesn't nuke us.
private final MemoryBlock data;
private final Vector4f boundingSphere;
@Nullable
private final String descriptor;

public SimpleQuadMesh(VertexList vertexList, MemoryBlock data, @Nullable String descriptor) {
public SimpleQuadMesh(VertexList vertexList, @Nullable String descriptor) {
this.vertexList = vertexList;
this.data = data;
boundingSphere = ModelUtil.computeBoundingSphere(vertexList);
this.descriptor = descriptor;
}

public SimpleQuadMesh(VertexList vertexList, MemoryBlock data) {
this(vertexList, data, null);
public SimpleQuadMesh(VertexList vertexList) {
this(vertexList, null);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ public static SimpleQuadMesh blockVerticesToMesh(BufferBuilder.RenderedBuffer bu

vertexView.ptr(dstPtr);
vertexView.vertexCount(vertexCount);
vertexView.nativeMemoryOwner(dst);

return new SimpleQuadMesh(vertexView, dst, meshDescriptor);
return new SimpleQuadMesh(vertexView, meshDescriptor);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static Mesh convert(ModelPart modelPart, @Nullable PoseStack poseStack, @

VertexView vertexView = new PosTexNormalVertexView();
vertexView.load(data);
return new SimpleQuadMesh(vertexView, data, "source=ModelPartConverter");
return new SimpleQuadMesh(vertexView, "source=ModelPartConverter");
}

public static Mesh convert(ModelLayerLocation layer, @Nullable TextureAtlasSprite sprite, String... childPath) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package dev.engine_room.flywheel.lib.vertex;

import org.jetbrains.annotations.Nullable;

public abstract class AbstractVertexView implements VertexView {
protected long ptr;
protected int vertexCount;
@Nullable
private Object nativeMemoryOwner;

@Override
public long ptr() {
Expand All @@ -23,4 +27,15 @@ public int vertexCount() {
public void vertexCount(int vertexCount) {
this.vertexCount = vertexCount;
}

@Override
@Nullable
public final Object nativeMemoryOwner() {
return nativeMemoryOwner;
}

@Override
public final void nativeMemoryOwner(@Nullable Object owner) {
nativeMemoryOwner = owner;
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.engine_room.flywheel.lib.vertex;

import org.jetbrains.annotations.Nullable;
import org.lwjgl.system.MemoryUtil;

import dev.engine_room.flywheel.api.vertex.MutableVertexList;
Expand All @@ -14,6 +15,17 @@ public interface VertexView extends MutableVertexList {

long stride();

@Nullable
Object nativeMemoryOwner();

/**
* The memory referenced by this vertex view's pointer may be owned by another object, such that the memory is
* automatically freed when the other object becomes phantom reachable or is garbage collected. Use this method to
* ensure this vertex view retains a strong reference to the memory owner so this vertex view's pointer remains
* valid even when no other references to the memory owner are retained.
*/
void nativeMemoryOwner(@Nullable Object owner);

default void load(MemoryBlock data) {
long bytes = data.size();
long stride = stride();
Expand All @@ -24,6 +36,7 @@ default void load(MemoryBlock data) {

ptr(data.ptr());
vertexCount(vertexCount);
nativeMemoryOwner(data);
}

@Override
Expand Down

0 comments on commit 14ca1d3

Please sign in to comment.