Skip to content
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

Jump to bottom

virtual #1475

Merged
merged 3 commits into from
Mar 3, 2024
Merged

virtual #1475

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a60473b
virtual
Feb 22, 2024
900f207
Update CHANGELOG.md and fix nits
saudet Feb 24, 2024
1d3aeeb
Merge branch 'master' into master
saudet Mar 3, 2024
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
8 changes: 8 additions & 0 deletions bullet/src/gen/java/org/bytedeco/bullet/BulletCollision/btCollisionWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@ private native void allocate(@Const btCollisionObject collisionObject,
public native @Cast("unsigned int") int m_flags(); public native RayResultCallback m_flags(int setter);
public native @Cast("bool") boolean hasHit();

@Virtual
public native @Cast("bool") boolean needsCollision(btBroadphaseProxy proxy0);

@Virtual
public native @Cast("btScalar") double addSingleResult(@ByRef LocalRayResult rayResult, @Cast("bool") boolean normalInWorldSpace);
}

Expand All @@ -127,6 +129,7 @@ private native void allocate(@Const btCollisionObject collisionObject,
public native @ByRef btVector3 m_hitNormalWorld(); public native ClosestRayResultCallback m_hitNormalWorld(btVector3 setter);
public native @ByRef btVector3 m_hitPointWorld(); public native ClosestRayResultCallback m_hitPointWorld(btVector3 setter);

@Virtual
public native @Cast("btScalar") double addSingleResult(@ByRef LocalRayResult rayResult, @Cast("bool") boolean normalInWorldSpace);
}

Expand All @@ -147,6 +150,7 @@ private native void allocate(@Const btCollisionObject collisionObject,
public native @ByRef btVector3Array m_hitPointWorld(); public native AllHitsRayResultCallback m_hitPointWorld(btVector3Array setter);
public native @ByRef btScalarArray m_hitFractions(); public native AllHitsRayResultCallback m_hitFractions(btScalarArray setter);

@Virtual
public native @Cast("btScalar") double addSingleResult(@ByRef LocalRayResult rayResult, @Cast("bool") boolean normalInWorldSpace);
}

Expand Down Expand Up @@ -187,6 +191,7 @@ private native void allocate(@Const btCollisionObject hitCollisionObject,

public native @Cast("bool") boolean needsCollision(btBroadphaseProxy proxy0);

@Virtual
public native @Cast("btScalar") double addSingleResult(@ByRef LocalConvexResult convexResult, @Cast("bool") boolean normalInWorldSpace);
}

Expand All @@ -205,6 +210,7 @@ private native void allocate(@Const btCollisionObject hitCollisionObject,
public native @ByRef btVector3 m_hitPointWorld(); public native ClosestConvexResultCallback m_hitPointWorld(btVector3 setter);
public native @Const btCollisionObject m_hitCollisionObject(); public native ClosestConvexResultCallback m_hitCollisionObject(btCollisionObject setter);

@Virtual
public native @Cast("btScalar") double addSingleResult(@ByRef LocalConvexResult convexResult, @Cast("bool") boolean normalInWorldSpace);
}

Expand All @@ -218,8 +224,10 @@ private native void allocate(@Const btCollisionObject hitCollisionObject,
public native int m_collisionFilterMask(); public native ContactResultCallback m_collisionFilterMask(int setter);
public native @Cast("btScalar") double m_closestDistanceThreshold(); public native ContactResultCallback m_closestDistanceThreshold(double setter);

@Virtual
public native @Cast("bool") boolean needsCollision(btBroadphaseProxy proxy0);

@Virtual
public native @Cast("btScalar") double addSingleResult(@ByRef btManifoldPoint cp, @Const btCollisionObjectWrapper colObj0Wrap, int partId0, int index0, @Const btCollisionObjectWrapper colObj1Wrap, int partId1, int index1);
}

Expand Down
1 change: 1 addition & 0 deletions bullet/src/gen/java/org/bytedeco/bullet/BulletCollision/btOverlapCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ public class btOverlapCallback extends Pointer {
public btOverlapCallback(Pointer p) { super(p); }

//return true for deletion of the pair
@Virtual
public native @Cast("bool") boolean processOverlap(@ByRef btBroadphasePair pair);
}
1 change: 1 addition & 0 deletions bullet/src/gen/java/org/bytedeco/bullet/BulletCollision/btOverlapFilterCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ public class btOverlapFilterCallback extends Pointer {
public btOverlapFilterCallback(Pointer p) { super(p); }

// return true when pairs need collision
@Virtual
public native @Cast("bool") boolean needBroadphaseCollision(btBroadphaseProxy proxy0, btBroadphaseProxy proxy1);
}
2 changes: 1 addition & 1 deletion bullet/src/main/java/org/bytedeco/bullet/presets/BulletCollision.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public void map(InfoMap infoMap) {
.put(new Info("btCollisionWorldImporter.h").linePatterns("struct btContactSolverInfo;").skip())
.put(new Info("btDispatcher.h").linePatterns("class btRigidBody;").skip())
.put(new Info("btPersistentManifold.h").linePatterns("struct btCollisionResult;").skip())

.put(new Info("btCollisionWorld", "btOverlapFilterCallback", "btOverlapCallback").virtualize())
.put(new Info(
"BT_MPR_FABS",
"BT_MPR_SQRT",
Expand Down