From 27492887bf8da79cad876e1dd4f425f6a21d092b Mon Sep 17 00:00:00 2001 From: Xuchen Han Date: Thu, 8 Aug 2019 17:56:19 -0700 Subject: [PATCH] move files and update license --- .../GraspDeformable.cpp | 24 +++++++++---------- examples/DeformableDemo/GraspDeformable.h | 19 +++++++++++++++ examples/ExampleBrowser/ExampleEntries.cpp | 1 + examples/GraspDeformable/GraspDeformable.h | 20 ---------------- 4 files changed, 31 insertions(+), 33 deletions(-) rename examples/{GraspDeformable => DeformableDemo}/GraspDeformable.cpp (95%) create mode 100644 examples/DeformableDemo/GraspDeformable.h delete mode 100644 examples/GraspDeformable/GraspDeformable.h diff --git a/examples/GraspDeformable/GraspDeformable.cpp b/examples/DeformableDemo/GraspDeformable.cpp similarity index 95% rename from examples/GraspDeformable/GraspDeformable.cpp rename to examples/DeformableDemo/GraspDeformable.cpp index 68a52be7e..dc7de0057 100644 --- a/examples/GraspDeformable/GraspDeformable.cpp +++ b/examples/DeformableDemo/GraspDeformable.cpp @@ -1,17 +1,15 @@ /* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ + Bullet Continuous Collision Detection and Physics Library + Copyright (c) 2019 Google Inc. http://bulletphysics.org + This software is provided 'as-is', without any express or implied warranty. + In no event will the authors be held liable for any damages arising from the use of this software. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it freely, + subject to the following restrictions: + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + */ #include "GraspDeformable.h" ///btBulletDynamicsCommon.h is the main Bullet include file, contains most common include files. diff --git a/examples/DeformableDemo/GraspDeformable.h b/examples/DeformableDemo/GraspDeformable.h new file mode 100644 index 000000000..1ce2230df --- /dev/null +++ b/examples/DeformableDemo/GraspDeformable.h @@ -0,0 +1,19 @@ +/* + Bullet Continuous Collision Detection and Physics Library + Copyright (c) 2019 Google Inc. http://bulletphysics.org + This software is provided 'as-is', without any express or implied warranty. + In no event will the authors be held liable for any damages arising from the use of this software. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it freely, + subject to the following restrictions: + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + */ + +#ifndef _GRASP_DEFORMABLE_H +#define _GRASP_DEFORMABLE_H + +class CommonExampleInterface* GraspDeformableCreateFunc(struct CommonExampleOptions& options); + +#endif //_GRASP_DEFORMABLE_H diff --git a/examples/ExampleBrowser/ExampleEntries.cpp b/examples/ExampleBrowser/ExampleEntries.cpp index ae40afec9..2beef333c 100644 --- a/examples/ExampleBrowser/ExampleEntries.cpp +++ b/examples/ExampleBrowser/ExampleEntries.cpp @@ -51,6 +51,7 @@ #include "../DeformableDemo/Pinch.h" #include "../DeformableDemo/DeformableMultibody.h" #include "../DeformableDemo/VolumetricDeformable.h" +#include "../DeformableDemo/GraspDeformable.h" #include "../SharedMemory/PhysicsServerExampleBullet2.h" #include "../SharedMemory/PhysicsServerExample.h" #include "../SharedMemory/PhysicsClientExample.h" diff --git a/examples/GraspDeformable/GraspDeformable.h b/examples/GraspDeformable/GraspDeformable.h deleted file mode 100644 index fed8cb03e..000000000 --- a/examples/GraspDeformable/GraspDeformable.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ -#ifndef _GRASP_DEFORMABLE_H -#define _GRASP_DEFORMABLE_H - -class CommonExampleInterface* GraspDeformableCreateFunc(struct CommonExampleOptions& options); - -#endif //_GRASP_DEFORMABLE_H