mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-14 22:00:05 +00:00
fix some warnings
This commit is contained in:
parent
aa40b8487f
commit
030d723db6
@ -413,10 +413,10 @@ bool GLInstancingRenderer::readSingleInstanceTransformToCPU(float* position, flo
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLInstancingRenderer::writeSingleInstanceTransformToCPU(const float* position, const float* orientation, int bodyUniqueId)
|
void GLInstancingRenderer::writeSingleInstanceTransformToCPU(const float* position, const float* orientation, int srcIndex2)
|
||||||
{
|
{
|
||||||
|
|
||||||
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(srcIndex2);
|
||||||
b3Assert(pg);
|
b3Assert(pg);
|
||||||
|
|
||||||
if (pg==0)
|
if (pg==0)
|
||||||
@ -439,9 +439,9 @@ void GLInstancingRenderer::writeSingleInstanceTransformToCPU(const float* positi
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void GLInstancingRenderer::readSingleInstanceTransformFromCPU(int bodyUniqueId, float* position, float* orientation)
|
void GLInstancingRenderer::readSingleInstanceTransformFromCPU(int srcIndex2, float* position, float* orientation)
|
||||||
{
|
{
|
||||||
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(srcIndex2);
|
||||||
b3Assert(pg);
|
b3Assert(pg);
|
||||||
int srcIndex = pg->m_internalInstanceIndex;
|
int srcIndex = pg->m_internalInstanceIndex;
|
||||||
|
|
||||||
@ -457,9 +457,9 @@ void GLInstancingRenderer::readSingleInstanceTransformFromCPU(int bodyUniqueId,
|
|||||||
orientation[2] = m_data->m_instance_quaternion_ptr[srcIndex*4+2];
|
orientation[2] = m_data->m_instance_quaternion_ptr[srcIndex*4+2];
|
||||||
orientation[3] = m_data->m_instance_quaternion_ptr[srcIndex*4+3];
|
orientation[3] = m_data->m_instance_quaternion_ptr[srcIndex*4+3];
|
||||||
}
|
}
|
||||||
void GLInstancingRenderer::writeSingleInstanceColorToCPU(const double* color, int bodyUniqueId)
|
void GLInstancingRenderer::writeSingleInstanceColorToCPU(const double* color, int srcIndex2)
|
||||||
{
|
{
|
||||||
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(srcIndex2);
|
||||||
b3Assert(pg);
|
b3Assert(pg);
|
||||||
int srcIndex = pg->m_internalInstanceIndex;
|
int srcIndex = pg->m_internalInstanceIndex;
|
||||||
|
|
||||||
@ -469,9 +469,9 @@ void GLInstancingRenderer::writeSingleInstanceColorToCPU(const double* color, in
|
|||||||
m_data->m_instance_colors_ptr[srcIndex*4+3]=float(color[3]);
|
m_data->m_instance_colors_ptr[srcIndex*4+3]=float(color[3]);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLInstancingRenderer::writeSingleInstanceColorToCPU(const float* color, int bodyUniqueId)
|
void GLInstancingRenderer::writeSingleInstanceColorToCPU(const float* color, int srcIndex2)
|
||||||
{
|
{
|
||||||
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(srcIndex2);
|
||||||
b3Assert(pg);
|
b3Assert(pg);
|
||||||
int srcIndex = pg->m_internalInstanceIndex;
|
int srcIndex = pg->m_internalInstanceIndex;
|
||||||
|
|
||||||
@ -481,9 +481,9 @@ void GLInstancingRenderer::writeSingleInstanceColorToCPU(const float* color, int
|
|||||||
m_data->m_instance_colors_ptr[srcIndex*4+3]=color[3];
|
m_data->m_instance_colors_ptr[srcIndex*4+3]=color[3];
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLInstancingRenderer::writeSingleInstanceScaleToCPU(const float* scale, int bodyUniqueId)
|
void GLInstancingRenderer::writeSingleInstanceScaleToCPU(const float* scale, int srcIndex2)
|
||||||
{
|
{
|
||||||
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(srcIndex2);
|
||||||
b3Assert(pg);
|
b3Assert(pg);
|
||||||
int srcIndex = pg->m_internalInstanceIndex;
|
int srcIndex = pg->m_internalInstanceIndex;
|
||||||
|
|
||||||
@ -492,11 +492,11 @@ void GLInstancingRenderer::writeSingleInstanceScaleToCPU(const float* scale, int
|
|||||||
m_data->m_instance_scale_ptr[srcIndex*3+2]=scale[2];
|
m_data->m_instance_scale_ptr[srcIndex*3+2]=scale[2];
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLInstancingRenderer::writeSingleInstanceSpecularColorToCPU(const double* specular, int bodyUniqueId)
|
void GLInstancingRenderer::writeSingleInstanceSpecularColorToCPU(const double* specular, int srcIndex2)
|
||||||
{
|
{
|
||||||
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(srcIndex2);
|
||||||
b3Assert(pg);
|
b3Assert(pg);
|
||||||
int srcIndex = pg->m_internalInstanceIndex;
|
int graphicsIndex = pg->m_internalInstanceIndex;
|
||||||
|
|
||||||
int totalNumInstances = 0;
|
int totalNumInstances = 0;
|
||||||
|
|
||||||
@ -505,7 +505,7 @@ void GLInstancingRenderer::writeSingleInstanceSpecularColorToCPU(const double* s
|
|||||||
for (int i=0;i<m_graphicsInstances.size();i++)
|
for (int i=0;i<m_graphicsInstances.size();i++)
|
||||||
{
|
{
|
||||||
totalNumInstances+=m_graphicsInstances[i]->m_numGraphicsInstances;
|
totalNumInstances+=m_graphicsInstances[i]->m_numGraphicsInstances;
|
||||||
if (srcIndex<totalNumInstances)
|
if (srcIndex2<totalNumInstances)
|
||||||
{
|
{
|
||||||
gfxObjIndex = i;
|
gfxObjIndex = i;
|
||||||
break;
|
break;
|
||||||
@ -518,9 +518,9 @@ void GLInstancingRenderer::writeSingleInstanceSpecularColorToCPU(const double* s
|
|||||||
m_graphicsInstances[gfxObjIndex]->m_materialSpecularColor[2] = specular[2];
|
m_graphicsInstances[gfxObjIndex]->m_materialSpecularColor[2] = specular[2];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void GLInstancingRenderer::writeSingleInstanceSpecularColorToCPU(const float* specular, int bodyUniqueId)
|
void GLInstancingRenderer::writeSingleInstanceSpecularColorToCPU(const float* specular, int srcIndex2)
|
||||||
{
|
{
|
||||||
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(srcIndex2);
|
||||||
b3Assert(pg);
|
b3Assert(pg);
|
||||||
int srcIndex = pg->m_internalInstanceIndex;
|
int srcIndex = pg->m_internalInstanceIndex;
|
||||||
|
|
||||||
@ -531,7 +531,7 @@ void GLInstancingRenderer::writeSingleInstanceSpecularColorToCPU(const float* sp
|
|||||||
for (int i=0;i<m_graphicsInstances.size();i++)
|
for (int i=0;i<m_graphicsInstances.size();i++)
|
||||||
{
|
{
|
||||||
totalNumInstances+=m_graphicsInstances[i]->m_numGraphicsInstances;
|
totalNumInstances+=m_graphicsInstances[i]->m_numGraphicsInstances;
|
||||||
if (srcIndex<totalNumInstances)
|
if (srcIndex2<totalNumInstances)
|
||||||
{
|
{
|
||||||
gfxObjIndex = i;
|
gfxObjIndex = i;
|
||||||
break;
|
break;
|
||||||
@ -546,9 +546,9 @@ void GLInstancingRenderer::writeSingleInstanceSpecularColorToCPU(const float* sp
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void GLInstancingRenderer::writeSingleInstanceScaleToCPU(const double* scale, int bodyUniqueId)
|
void GLInstancingRenderer::writeSingleInstanceScaleToCPU(const double* scale, int srcIndex2)
|
||||||
{
|
{
|
||||||
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(srcIndex2);
|
||||||
b3Assert(pg);
|
b3Assert(pg);
|
||||||
int srcIndex = pg->m_internalInstanceIndex;
|
int srcIndex = pg->m_internalInstanceIndex;
|
||||||
|
|
||||||
@ -765,8 +765,8 @@ void GLInstancingRenderer::rebuildGraphicsInstances()
|
|||||||
|
|
||||||
for (int i=0;i<usedObjects.size();i++)
|
for (int i=0;i<usedObjects.size();i++)
|
||||||
{
|
{
|
||||||
int bodyUniqueId = usedObjects[i];
|
int srcIndex2 = usedObjects[i];
|
||||||
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(srcIndex2);
|
||||||
b3Assert(pg);
|
b3Assert(pg);
|
||||||
int srcIndex = pg->m_internalInstanceIndex;
|
int srcIndex = pg->m_internalInstanceIndex;
|
||||||
|
|
||||||
@ -793,9 +793,9 @@ void GLInstancingRenderer::rebuildGraphicsInstances()
|
|||||||
}
|
}
|
||||||
for (int i=0;i<usedObjects.size();i++)
|
for (int i=0;i<usedObjects.size();i++)
|
||||||
{
|
{
|
||||||
int bodyUniqueId = usedObjects[i];
|
int srcIndex2 = usedObjects[i];
|
||||||
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(srcIndex2);
|
||||||
m_graphicsInstances[pg->m_shapeIndex]->m_tempObjectUids.push_back(bodyUniqueId);
|
m_graphicsInstances[pg->m_shapeIndex]->m_tempObjectUids.push_back(srcIndex2);
|
||||||
}
|
}
|
||||||
|
|
||||||
int curOffset = 0;
|
int curOffset = 0;
|
||||||
|
@ -103,8 +103,8 @@ public:
|
|||||||
virtual void writeSingleInstanceColorToCPU(const float* color, int srcIndex);
|
virtual void writeSingleInstanceColorToCPU(const float* color, int srcIndex);
|
||||||
virtual void writeSingleInstanceColorToCPU(const double* color, int srcIndex);
|
virtual void writeSingleInstanceColorToCPU(const double* color, int srcIndex);
|
||||||
|
|
||||||
virtual void writeSingleInstanceSpecularColorToCPU(const double* specular, int srcIndex);
|
virtual void writeSingleInstanceSpecularColorToCPU(const double* specular, int srcIndex2);
|
||||||
virtual void writeSingleInstanceSpecularColorToCPU(const float* specular, int srcIndex);
|
virtual void writeSingleInstanceSpecularColorToCPU(const float* specular, int srcIndex2);
|
||||||
|
|
||||||
virtual void writeSingleInstanceScaleToCPU(const float* scale, int srcIndex);
|
virtual void writeSingleInstanceScaleToCPU(const float* scale, int srcIndex);
|
||||||
virtual void writeSingleInstanceScaleToCPU(const double* scale, int srcIndex);
|
virtual void writeSingleInstanceScaleToCPU(const double* scale, int srcIndex);
|
||||||
|
@ -94,7 +94,7 @@ public:
|
|||||||
void logObjectStates(btScalar timeStep);
|
void logObjectStates(btScalar timeStep);
|
||||||
void processCollisionForces(btScalar timeStep);
|
void processCollisionForces(btScalar timeStep);
|
||||||
|
|
||||||
virtual void stepSimulationRealTime(double dtInSec, const struct b3VRControllerEvent* vrEvents, int numVREvents, const struct b3KeyboardEvent* keyEvents, int numKeyEvents);
|
virtual void stepSimulationRealTime(double dtInSec, const struct b3VRControllerEvent* vrControllerEvents, int numVRControllerEvents, const struct b3KeyboardEvent* keyEvents, int numKeyEvents);
|
||||||
virtual void enableRealTimeSimulation(bool enableRealTimeSim);
|
virtual void enableRealTimeSimulation(bool enableRealTimeSim);
|
||||||
virtual bool isRealTimeSimulationEnabled() const;
|
virtual bool isRealTimeSimulationEnabled() const;
|
||||||
|
|
||||||
@ -103,10 +103,10 @@ public:
|
|||||||
virtual void setTimeOut(double timeOutInSeconds);
|
virtual void setTimeOut(double timeOutInSeconds);
|
||||||
|
|
||||||
virtual const btVector3& getVRTeleportPosition() const;
|
virtual const btVector3& getVRTeleportPosition() const;
|
||||||
virtual void setVRTeleportPosition(const btVector3& vrReleportPos);
|
virtual void setVRTeleportPosition(const btVector3& vrTeleportPos);
|
||||||
|
|
||||||
virtual const btQuaternion& getVRTeleportOrientation() const;
|
virtual const btQuaternion& getVRTeleportOrientation() const;
|
||||||
virtual void setVRTeleportOrientation(const btQuaternion& vrReleportOrn);
|
virtual void setVRTeleportOrientation(const btQuaternion& vrTeleportOrn);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif //PHYSICS_SERVER_COMMAND_PROCESSOR_H
|
#endif //PHYSICS_SERVER_COMMAND_PROCESSOR_H
|
||||||
|
@ -41,10 +41,10 @@ public:
|
|||||||
virtual void removePickingConstraint();
|
virtual void removePickingConstraint();
|
||||||
|
|
||||||
virtual const btVector3& getVRTeleportPosition() const;
|
virtual const btVector3& getVRTeleportPosition() const;
|
||||||
virtual void setVRTeleportPosition(const btVector3& vrReleportPos);
|
virtual void setVRTeleportPosition(const btVector3& vrTeleportPos);
|
||||||
|
|
||||||
virtual const btQuaternion& getVRTeleportOrientation() const;
|
virtual const btQuaternion& getVRTeleportOrientation() const;
|
||||||
virtual void setVRTeleportOrientation(const btQuaternion& vrReleportOrn);
|
virtual void setVRTeleportOrientation(const btQuaternion& vrTeleportOrn);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user