From f062847038510b636aa140ff76ccd4b15b6a818d Mon Sep 17 00:00:00 2001 From: yunfeibai Date: Wed, 29 Mar 2017 15:37:33 -0700 Subject: [PATCH] Replace spaces with tabs. --- .../Importers/ImportMJCFDemo/BulletMJCFImporter.cpp | 2 +- examples/Importers/ImportMJCFDemo/BulletMJCFImporter.h | 2 +- .../Importers/ImportURDFDemo/BulletUrdfImporter.cpp | 2 +- examples/Importers/ImportURDFDemo/BulletUrdfImporter.h | 2 +- .../Importers/ImportURDFDemo/URDFImporterInterface.h | 2 +- examples/SharedMemory/PhysicsClientSharedMemory.cpp | 8 ++++---- examples/SharedMemory/PhysicsDirect.cpp | 6 +++--- .../SharedMemory/PhysicsServerCommandProcessor.cpp | 10 +++++----- examples/SharedMemory/SharedMemoryCommands.h | 2 +- examples/SharedMemory/SharedMemoryPublic.h | 2 +- examples/pybullet/pybullet.c | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp b/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp index 59f33a398..40a3616b7 100644 --- a/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp +++ b/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp @@ -1325,7 +1325,7 @@ int BulletMJCFImporter::getRootLinkIndex() const std::string BulletMJCFImporter::getBodyName() const { - return m_data->m_fileModelName; + return m_data->m_fileModelName; } bool BulletMJCFImporter::getLinkColor(int linkIndex, btVector4& colorRGBA) const diff --git a/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.h b/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.h index f1061dd57..306d311ca 100644 --- a/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.h +++ b/examples/Importers/ImportMJCFDemo/BulletMJCFImporter.h @@ -42,7 +42,7 @@ public: ///pure virtual interfaces, precondition is a valid linkIndex (you can assert/terminate if the linkIndex is out of range) virtual std::string getLinkName(int linkIndex) const; - virtual std::string getBodyName() const; + virtual std::string getBodyName() const; /// optional method to provide the link color. return true if the color is available and copied into colorRGBA, return false otherwise virtual bool getLinkColor(int linkIndex, btVector4& colorRGBA) const; diff --git a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp index 4ade85564..37a040985 100644 --- a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp +++ b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp @@ -272,7 +272,7 @@ std::string BulletURDFImporter::getLinkName(int linkIndex) const std::string BulletURDFImporter::getBodyName() const { - return m_data->m_urdfParser.getModel().m_name; + return m_data->m_urdfParser.getModel().m_name; } std::string BulletURDFImporter::getJointName(int linkIndex) const diff --git a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h index 20d414f8d..76d34c7c7 100644 --- a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h +++ b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h @@ -35,7 +35,7 @@ public: virtual void getLinkChildIndices(int linkIndex, btAlignedObjectArray& childLinkIndices) const; - virtual std::string getBodyName() const; + virtual std::string getBodyName() const; virtual std::string getLinkName(int linkIndex) const; diff --git a/examples/Importers/ImportURDFDemo/URDFImporterInterface.h b/examples/Importers/ImportURDFDemo/URDFImporterInterface.h index 655eded88..7cfa62323 100644 --- a/examples/Importers/ImportURDFDemo/URDFImporterInterface.h +++ b/examples/Importers/ImportURDFDemo/URDFImporterInterface.h @@ -28,7 +28,7 @@ public: ///pure virtual interfaces, precondition is a valid linkIndex (you can assert/terminate if the linkIndex is out of range) virtual std::string getLinkName(int linkIndex) const =0; - virtual std::string getBodyName() const = 0; + virtual std::string getBodyName() const = 0; /// optional method to provide the link color. return true if the color is available and copied into colorRGBA, return false otherwise virtual bool getLinkColor(int linkIndex, btVector4& colorRGBA) const { return false;} diff --git a/examples/SharedMemory/PhysicsClientSharedMemory.cpp b/examples/SharedMemory/PhysicsClientSharedMemory.cpp index 3ead5fcee..fba7ab366 100644 --- a/examples/SharedMemory/PhysicsClientSharedMemory.cpp +++ b/examples/SharedMemory/PhysicsClientSharedMemory.cpp @@ -20,7 +20,7 @@ struct BodyJointInfoCache { std::string m_baseName; btAlignedObjectArray m_jointInfo; - std::string m_bodyName; + std::string m_bodyName; }; struct PhysicsClientSharedMemoryInternalData { @@ -107,7 +107,7 @@ bool PhysicsClientSharedMemory::getBodyInfo(int bodyUniqueId, struct b3BodyInfo& { BodyJointInfoCache* bodyJoints = *bodyJointsPtr; info.m_baseName = bodyJoints->m_baseName.c_str(); - info.m_bodyName = bodyJoints->m_bodyName.c_str(); + info.m_bodyName = bodyJoints->m_bodyName.c_str(); return true; } @@ -308,7 +308,7 @@ void PhysicsClientSharedMemory::processBodyJointInfo(int bodyUniqueId, const Sha BodyJointInfoCache* bodyJoints = new BodyJointInfoCache; m_data->m_bodyJointMap.insert(bodyUniqueId,bodyJoints); - bodyJoints->m_bodyName = serverCmd.m_dataStreamArguments.m_bodyName; + bodyJoints->m_bodyName = serverCmd.m_dataStreamArguments.m_bodyName; for (int i = 0; i < bf.m_multiBodies.size(); i++) { @@ -421,7 +421,7 @@ const SharedMemoryStatus* PhysicsClientSharedMemory::processServerStatus() { BodyJointInfoCache* bodyJoints = new BodyJointInfoCache; m_data->m_bodyJointMap.insert(bodyUniqueId,bodyJoints); - bodyJoints->m_bodyName = serverCmd.m_dataStreamArguments.m_bodyName; + bodyJoints->m_bodyName = serverCmd.m_dataStreamArguments.m_bodyName; for (int i = 0; i < bf.m_multiBodies.size(); i++) { diff --git a/examples/SharedMemory/PhysicsDirect.cpp b/examples/SharedMemory/PhysicsDirect.cpp index 40be6dbcb..cb2c62e68 100644 --- a/examples/SharedMemory/PhysicsDirect.cpp +++ b/examples/SharedMemory/PhysicsDirect.cpp @@ -17,7 +17,7 @@ struct BodyJointInfoCache2 { std::string m_baseName; btAlignedObjectArray m_jointInfo; - std::string m_bodyName; + std::string m_bodyName; }; @@ -606,7 +606,7 @@ void PhysicsDirect::processBodyJointInfo(int bodyUniqueId, const SharedMemorySta BodyJointInfoCache2* bodyJoints = new BodyJointInfoCache2; m_data->m_bodyJointMap.insert(bodyUniqueId,bodyJoints); - bodyJoints->m_bodyName = serverCmd.m_dataStreamArguments.m_bodyName; + bodyJoints->m_bodyName = serverCmd.m_dataStreamArguments.m_bodyName; for (int i = 0; i < bf.m_multiBodies.size(); i++) { @@ -933,7 +933,7 @@ bool PhysicsDirect::getBodyInfo(int bodyUniqueId, struct b3BodyInfo& info) const { BodyJointInfoCache2* bodyJoints = *bodyJointsPtr; info.m_baseName = bodyJoints->m_baseName.c_str(); - info.m_bodyName = bodyJoints->m_bodyName.c_str(); + info.m_bodyName = bodyJoints->m_bodyName.c_str(); return true; } diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index e47be7f85..be39dbf59 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -120,7 +120,7 @@ struct InteralBodyData btMultiBody* m_multiBody; btRigidBody* m_rigidBody; int m_testData; - std::string m_bodyName; + std::string m_bodyName; btTransform m_rootLocalInertialFrame; btAlignedObjectArray m_linkLocalInertialFrames; @@ -1608,8 +1608,8 @@ bool PhysicsServerCommandProcessor::loadUrdf(const char* fileName, const btVecto btMultiBody* mb = creation.getBulletMultiBody(); btRigidBody* rb = creation.getRigidBody(); - - bodyHandle->m_bodyName = u2b.getBodyName(); + + bodyHandle->m_bodyName = u2b.getBodyName(); if (useMultiBody) { @@ -2653,8 +2653,8 @@ bool PhysicsServerCommandProcessor::processCommand(const struct SharedMemoryComm serverStatusOut.m_numDataStreamBytes = m_data->m_urdfLinkNameMapper.at(m_data->m_urdfLinkNameMapper.size()-1)->m_memSerializer->getCurrentBufferSize(); } serverStatusOut.m_dataStreamArguments.m_bodyUniqueId = bodyUniqueId; - InteralBodyData* body = m_data->getHandle(bodyUniqueId); - strcpy(serverStatusOut.m_dataStreamArguments.m_bodyName, body->m_bodyName.c_str()); + InteralBodyData* body = m_data->getHandle(bodyUniqueId); + strcpy(serverStatusOut.m_dataStreamArguments.m_bodyName, body->m_bodyName.c_str()); hasStatus = true; } else diff --git a/examples/SharedMemory/SharedMemoryCommands.h b/examples/SharedMemory/SharedMemoryCommands.h index 4a7bbb0af..f5038c6a4 100644 --- a/examples/SharedMemory/SharedMemoryCommands.h +++ b/examples/SharedMemory/SharedMemoryCommands.h @@ -103,7 +103,7 @@ struct BulletDataStreamArgs { char m_bulletFileName[MAX_FILENAME_LENGTH]; int m_bodyUniqueId; - char m_bodyName[MAX_FILENAME_LENGTH]; + char m_bodyName[MAX_FILENAME_LENGTH]; }; struct SetJointFeedbackArgs diff --git a/examples/SharedMemory/SharedMemoryPublic.h b/examples/SharedMemory/SharedMemoryPublic.h index bd3280ca8..7a201aee9 100644 --- a/examples/SharedMemory/SharedMemoryPublic.h +++ b/examples/SharedMemory/SharedMemoryPublic.h @@ -201,7 +201,7 @@ struct b3UserConstraint struct b3BodyInfo { const char* m_baseName; - const char* m_bodyName; // for btRigidBody, it does not have a base, but can still have a body name from urdf + const char* m_bodyName; // for btRigidBody, it does not have a base, but can still have a body name from urdf }; diff --git a/examples/pybullet/pybullet.c b/examples/pybullet/pybullet.c index a46c401f3..7c6d22861 100644 --- a/examples/pybullet/pybullet.c +++ b/examples/pybullet/pybullet.c @@ -1716,7 +1716,7 @@ static PyObject* pybullet_getBodyInfo(PyObject* self, PyObject* args, PyObject* { PyObject* pyListJointInfo = PyTuple_New(2); PyTuple_SetItem(pyListJointInfo, 0, PyString_FromString(info.m_baseName)); - PyTuple_SetItem(pyListJointInfo, 1, PyString_FromString(info.m_bodyName)); + PyTuple_SetItem(pyListJointInfo, 1, PyString_FromString(info.m_bodyName)); return pyListJointInfo; } } @@ -5146,8 +5146,8 @@ static PyMethodDef SpamMethods[] = { {"getJointState", (PyCFunction)pybullet_getJointState, METH_VARARGS | METH_KEYWORDS, "Get the state (position, velocity etc) for a joint on a body."}, - - {"getLinkState", (PyCFunction)pybullet_getLinkState, METH_VARARGS | METH_KEYWORDS, + + {"getLinkState", (PyCFunction)pybullet_getLinkState, METH_VARARGS | METH_KEYWORDS, "Provides extra information such as the Cartesian world coordinates" " center of mass (COM) of the link, relative to the world reference" " frame."},