Skip to content

InstancedGeometry: re-implement no-arg version of updateInstances() #2036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2023
Merged

InstancedGeometry: re-implement no-arg version of updateInstances() #2036

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions jme3-core/src/main/java/com/jme3/scene/instancing/InstancedGeometry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public class InstancedGeometry extends Geometry {

private int firstUnusedIndex = 0;
private int numVisibleInstances = 0;
private Camera cam;

public InstancedGeometry() {
super();
Expand Down Expand Up @@ -275,6 +276,13 @@ private void swap(int idx1, int idx2) {
}
}

/**
* @Deprecated use {@link #updateInstances(com.jme3.renderer.Camera)
*/
public void updateInstances() {
updateInstances(cam);
}

public void updateInstances(Camera cam) {
FloatBuffer fb = (FloatBuffer) transformInstanceData.getData();
fb.limit(fb.capacity());
Expand Down Expand Up @@ -415,6 +423,12 @@ private void updateAllInstanceData() {
allInstanceData = allData.toArray(new VertexBuffer[allData.size()]);
}

@Override
public boolean checkCulling(Camera cam) {
this.cam = cam;
return super.checkCulling(cam);
}

@Override
public int collideWith(Collidable other, CollisionResults results) {
return 0; // Ignore collision
Expand Down