[Scummvm-git-logs] scummvm master -> c93031b82640020e5d0882d03bde55c7ed0e9227
grisenti
noreply at scummvm.org
Wed Sep 6 19:39:42 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c93031b826 HPL1: Fix incorrect interface types
Commit: c93031b82640020e5d0882d03bde55c7ed0e9227
https://github.com/scummvm/scummvm/commit/c93031b82640020e5d0882d03bde55c7ed0e9227
Author: grisenti (emanuele at grisenti.net)
Date: 2023-09-06T21:39:28+02:00
Commit Message:
HPL1: Fix incorrect interface types
Changed paths:
engines/hpl1/engine/libraries/newton/Newton.h
engines/hpl1/engine/libraries/newton/core/dg.h
engines/hpl1/engine/libraries/newton/physics/dgBody.h
engines/hpl1/engine/libraries/newton/physics/dgCollisionUserMesh.h
engines/hpl1/engine/libraries/newton/physics/dgConstraint.h
engines/hpl1/engine/libraries/newton/physics/dgContact.h
diff --git a/engines/hpl1/engine/libraries/newton/Newton.h b/engines/hpl1/engine/libraries/newton/Newton.h
index b9fb58d46fe..41d819af050 100644
--- a/engines/hpl1/engine/libraries/newton/Newton.h
+++ b/engines/hpl1/engine/libraries/newton/Newton.h
@@ -273,8 +273,8 @@ typedef void (*NewtonUserMeshCollisionCollideCallback)(NewtonUserMeshCollisionCo
typedef dFloat(*NewtonUserMeshCollisionRayHitCallback)(NewtonUserMeshCollisionRayHitDesc *const lineDescData);
typedef void (*NewtonUserMeshCollisionGetCollisionInfo)(void *const userData, NewtonCollisionInfoRecord *const infoRecord);
typedef void (*NewtonUserMeshCollisionGetFacesInAABB)(void *const userData, const dFloat *const p0, const dFloat *const p1,
- const dFloat *const *const vertexArray, int *const vertexCount, int *const vertexStrideInBytes,
- const int *const indexList, int maxIndexCount, const int *const userDataList);
+ const dFloat *const *const vertexArray, int32 *const vertexCount, int32 *const vertexStrideInBytes,
+ const int32 *const indexList, int32 maxIndexCount, const int32 *const userDataList);
typedef dFloat(*NewtonCollisionTreeRayCastCallback)(const NewtonBody *const body, const NewtonCollision *const treeCollision, dFloat interception, dFloat *normal, int faceId, void *usedData);
typedef dFloat(*NewtonHeightFieldRayCastCallback)(const NewtonBody *const body, const NewtonCollision *const heightFieldCollision, dFloat interception, int row, int col, dFloat *normal, int faceId, void *usedData);
@@ -285,8 +285,8 @@ typedef void (*NewtonTreeCollisionCallback)(const NewtonBody *const bodyWithTree
int vertexCount, const dFloat *const vertex, int vertexStrideInBytes);
typedef void (*NewtonBodyDestructor)(const NewtonBody *const body);
-typedef void (*NewtonApplyForceAndTorque)(NewtonBody *const body, dFloat timestep, int threadIndex);
-typedef void (*NewtonSetTransform)(const NewtonBody *const body, const dFloat *const matrix, int threadIndex);
+typedef void (*NewtonApplyForceAndTorque)(NewtonBody *const body, dFloat timestep, int32 threadIndex);
+typedef void (*NewtonSetTransform)(const NewtonBody *const body, const dFloat *const matrix, int32 threadIndex);
typedef int (*NewtonIslandUpdate)(const NewtonWorld *const newtonWorld, const void *islandHandle, int bodyCount);
typedef void (*NewtonBodyLeaveWorld)(const NewtonBody *const body, int threadIndex);
@@ -295,12 +295,12 @@ typedef void (*NewtonCollisionDestructor)(const NewtonWorld *const newtonWorld,
typedef int (*NewtonCollisionCompoundBreakableCallback)(NewtonMesh *const mesh, void *const userData, dFloat *const planeMatrixOut);
-typedef int (*NewtonGetBuoyancyPlane)(const int collisionID, void *const context, const dFloat *const globalSpaceMatrix, dFloat *const globalSpacePlane);
+typedef int (*NewtonGetBuoyancyPlane)(const int32 collisionID, void *const context, const dFloat *const globalSpaceMatrix, dFloat *const globalSpacePlane);
typedef unsigned(*NewtonWorldRayPrefilterCallback)(const NewtonBody *const body, const NewtonCollision *const collision, void *const userData);
typedef dFloat(*NewtonWorldRayFilterCallback)(const NewtonBody *const body, const dFloat *const hitNormal, int collisionID, void *const userData, dFloat intersectParam);
-typedef int (*NewtonOnAABBOverlap)(const NewtonMaterial *const material, const NewtonBody *const body0, const NewtonBody *const body1, int threadIndex);
+typedef int (*NewtonOnAABBOverlap)(const NewtonMaterial *const material, const NewtonBody *const body0, const NewtonBody *const body1, int32 threadIndex);
typedef void (*NewtonContactsProcess)(const NewtonJoint *const contact, dFloat timestep, int threadIndex);
typedef void (*NewtonBodyIterator)(const NewtonBody *const body, void *const userData);
diff --git a/engines/hpl1/engine/libraries/newton/core/dg.h b/engines/hpl1/engine/libraries/newton/core/dg.h
index de159a98a36..748398118e7 100644
--- a/engines/hpl1/engine/libraries/newton/core/dg.h
+++ b/engines/hpl1/engine/libraries/newton/core/dg.h
@@ -60,6 +60,8 @@
#include "dgPolyhedraMassProperties.h"
#include "dgDelaunayTetrahedralization.h"
+#include "common/system.h"
+
class NewtonMesh;
class NewtonBody;
class NewtonWorld;
diff --git a/engines/hpl1/engine/libraries/newton/physics/dgBody.h b/engines/hpl1/engine/libraries/newton/physics/dgBody.h
index 40a9daf8ddf..87d9c6c0905 100644
--- a/engines/hpl1/engine/libraries/newton/physics/dgBody.h
+++ b/engines/hpl1/engine/libraries/newton/physics/dgBody.h
@@ -61,11 +61,11 @@ public:
};
typedef void(dgApi *OnBodyDestroy)(const NewtonBody *const me);
-typedef void(dgApi *OnApplyExtForceAndTorque)(NewtonBody *const me, dFloat timestep, int threadIndex);
-typedef void(dgApi *OnMatrixUpdateCallback)(const NewtonBody *const body, const dFloat *const matrix, int threadIndex);
+typedef void(dgApi *OnApplyExtForceAndTorque)(NewtonBody *const me, dFloat timestep, int32 threadIndex);
+typedef void(dgApi *OnMatrixUpdateCallback)(const NewtonBody *const body, const dFloat *const matrix, int32 threadIndex);
typedef dgUnsigned32(dgApi *OnRayPrecastAction)(const NewtonBody *const body, const NewtonCollision *const collision, void *const userData);
typedef dgFloat32(dgApi *OnRayCastAction)(const NewtonBody *const body, const dFloat *const hitNormal, int collisionID, void *const userData, dFloat intersectParam);
-typedef dgUnsigned32(dgApi *GetBuoyancyPlane)(const int collisionID, void *const context, const dFloat *const globalSpaceMatrix, dFloat *const globalSpacePlane);
+typedef dgUnsigned32(dgApi *GetBuoyancyPlane)(const int32 collisionID, void *const context, const dFloat *const globalSpaceMatrix, dFloat *const globalSpacePlane);
#define OverlapTest(body0, body1) dgOverlapTest((body0)->m_minAABB, (body0)->m_maxAABB, (body1)->m_minAABB, (body1)->m_maxAABB)
//#define OverlapTest_SSE(body0,body1) dgOverlapTest_SSE ((body0)->m_minAABB, (body0)->m_maxAABB, (body1)->m_minAABB, (body1)->m_maxAABB)
diff --git a/engines/hpl1/engine/libraries/newton/physics/dgCollisionUserMesh.h b/engines/hpl1/engine/libraries/newton/physics/dgCollisionUserMesh.h
index 0e35c96a873..269b9e9c218 100644
--- a/engines/hpl1/engine/libraries/newton/physics/dgCollisionUserMesh.h
+++ b/engines/hpl1/engine/libraries/newton/physics/dgCollisionUserMesh.h
@@ -31,8 +31,8 @@ typedef void(dgApi *OnUserMeshCollideCallback)(NewtonUserMeshCollisionCollideDes
typedef dgFloat32(dgApi *OnUserMeshRayHitCallback)(NewtonUserMeshCollisionRayHitDesc *const lineDescData);
typedef void (dgApi *UserMeshCollisionInfo)(void *userData, dgCollisionInfo *infoRecord);
typedef void(dgApi *UserMeshFacesInAABB)(void *const userData, const dFloat *const p0, const dFloat *const p1,
- const dFloat *const *const vertexArray, int *const vertexCount, int *const vertexStrideInBytes,
- const int *const indexList, int maxIndexCount, const int *const userDataList);
+ const dFloat *const *const vertexArray, int32 *const vertexCount, int32 *const vertexStrideInBytes,
+ const int32 *const indexList, int32 maxIndexCount, const int32 *const userDataList);
class dgUserMeshCreation {
public:
diff --git a/engines/hpl1/engine/libraries/newton/physics/dgConstraint.h b/engines/hpl1/engine/libraries/newton/physics/dgConstraint.h
index 871567e1e81..de87fbfd317 100644
--- a/engines/hpl1/engine/libraries/newton/physics/dgConstraint.h
+++ b/engines/hpl1/engine/libraries/newton/physics/dgConstraint.h
@@ -43,7 +43,7 @@ class dgWorld;
class dgConstraint;
class dgBilateralBounds;
-typedef void(dgApi *ConstraintsForceFeeback)(const NewtonJoint *const userJoint, dFloat timestep, int threadIndex);
+typedef void(dgApi *ConstraintsForceFeeback)(const NewtonJoint *const userJoint, dFloat timestep, int32 threadIndex);
class dgConstraintInfo {
public:
diff --git a/engines/hpl1/engine/libraries/newton/physics/dgContact.h b/engines/hpl1/engine/libraries/newton/physics/dgContact.h
index 80e03059e04..0dcdd73e281 100644
--- a/engines/hpl1/engine/libraries/newton/physics/dgContact.h
+++ b/engines/hpl1/engine/libraries/newton/physics/dgContact.h
@@ -38,8 +38,8 @@ class dgPolygonMeshDesc;
#define DG_MAX_CONTATCS 128
#define DG_CACHE_PAIR_BUFFER 256
-typedef int(dgApi *OnAABBOverlap)(const NewtonMaterial *const material, const NewtonBody *const body0, const NewtonBody *const body1, int threadIndex);
-typedef void(dgApi *OnContactCallback)(const NewtonJoint *const contact, dFloat timestep, int threadIndex);
+typedef int(dgApi *OnAABBOverlap)(const NewtonMaterial *const material, const NewtonBody *const body0, const NewtonBody *const body1, int32 threadIndex);
+typedef void(dgApi *OnContactCallback)(const NewtonJoint *const contact, dFloat timestep, int32 threadIndex);
class dgActiveContacts: public dgList<dgContact *> {
public:
More information about the Scummvm-git-logs
mailing list