format commit

This commit is contained in:
Chuyuan Kelly Fu
2022-02-18 16:59:07 -08:00
parent bdba9fa2e0
commit 807cf3d387
2 changed files with 22 additions and 21 deletions

View File

@@ -5512,24 +5512,26 @@ bool PhysicsServerCommandProcessor::processResetMeshDataCommand(const struct Sha
int numVertices = psb->m_nodes.size();
if (clientCmd.m_resetMeshDataArgs.m_numVertices == numVertices)
{
if(clientCmd.m_updateFlags & B3_MESH_DATA_SIMULATION_MESH_VELOCITY){
for (int i = 0; i < numVertices; ++i)
if (clientCmd.m_updateFlags & B3_MESH_DATA_SIMULATION_MESH_VELOCITY)
{
btSoftBody::Node& n = psb->m_nodes[i];
n.m_v.setValue(vertexUpload[i*3+0], vertexUpload[i*3+1],vertexUpload[i*3+2]);
n.m_vn.setValue(vertexUpload[i*3+0], vertexUpload[i*3+1],vertexUpload[i*3+2]);
for (int i = 0; i < numVertices; ++i)
{
btSoftBody::Node& n = psb->m_nodes[i];
n.m_v.setValue(vertexUpload[i * 3 + 0], vertexUpload[i * 3 + 1], vertexUpload[i * 3 + 2]);
n.m_vn.setValue(vertexUpload[i * 3 + 0], vertexUpload[i * 3 + 1], vertexUpload[i * 3 + 2]);
}
}
}
else{
for (int i = 0; i < numVertices; ++i)
{
btSoftBody::Node& n = psb->m_nodes[i];
n.m_x.setValue(vertexUpload[i*3+0], vertexUpload[i*3+1],vertexUpload[i*3+2]);
n.m_q.setValue(vertexUpload[i*3+0], vertexUpload[i*3+1],vertexUpload[i*3+2]);
}
}
serverStatusOut.m_type = CMD_RESET_MESH_DATA_COMPLETED;
}
else
{
for (int i = 0; i < numVertices; ++i)
{
btSoftBody::Node& n = psb->m_nodes[i];
n.m_x.setValue(vertexUpload[i * 3 + 0], vertexUpload[i * 3 + 1], vertexUpload[i * 3 + 2]);
n.m_q.setValue(vertexUpload[i * 3 + 0], vertexUpload[i * 3 + 1], vertexUpload[i * 3 + 2]);
}
}
serverStatusOut.m_type = CMD_RESET_MESH_DATA_COMPLETED;
}
}
#endif //SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD
}

View File

@@ -461,13 +461,12 @@ struct b3MeshVertex
double x, y, z, w;
};
enum eMeshDataFlags
{
B3_MESH_DATA_SIMULATION_MESH=1,
B3_MESH_DATA_SIMULATION_INDICES=2,
B3_MESH_DATA_GRAPHICS_INDICES=4,
B3_MESH_DATA_SIMULATION_MESH_VELOCITY=8,
B3_MESH_DATA_SIMULATION_MESH = 1,
B3_MESH_DATA_SIMULATION_INDICES = 2,
B3_MESH_DATA_GRAPHICS_INDICES = 4,
B3_MESH_DATA_SIMULATION_MESH_VELOCITY = 8,
};
enum eMeshDataEnum