From 06e71f8fbff04c6af829cf3e7da9a11b07d47ac4 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Wed, 13 Jun 2007 05:21:34 +0000 Subject: [PATCH] put proper ZLib license on top of the files --- .../SpuContactResult.cpp | 19 ++++++++++++++----- .../SpuContactResult.h | 15 +++++++++++++++ .../SpuConvexPenetrationDepthSolver.h | 5 ----- .../SpuGatheringCollisionTask.h | 14 ++++++++++++++ .../SpuGjkPairDetector.h | 5 ----- .../SpuLocalSupport.h | 19 ++++++++++++++----- .../SpuMinkowskiPenetrationDepthSolver.h | 5 ----- .../SpuVoronoiSimplexSolver.h | 5 ----- 8 files changed, 57 insertions(+), 30 deletions(-) diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp index c00cca066..b06c7dccb 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp @@ -1,8 +1,17 @@ -/* [SCE CONFIDENTIAL DOCUMENT] - * PLAYSTATION(R)3 SPU Optimized Bullet Physics Library (http://bulletphysics.com) - * Copyright (C) 2007 Sony Computer Entertainment Inc. - * All Rights Reserved. - */ +/* +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. +*/ #include "SpuContactResult.h" diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h index 5746a02e5..be8a8eef4 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h @@ -1,3 +1,18 @@ +/* +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 SPU_CONTACT_RESULT2_H #define SPU_CONTACT_RESULT2_H diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h index 9d8c7ff87..60e617f39 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h @@ -1,8 +1,3 @@ -/* [SCE CONFIDENTIAL DOCUMENT] - * PLAYSTATION(R)3 SPU Optimized Bullet Physics Library (http://bulletphysics.com) - * Copyright (C) 2007 Sony Computer Entertainment Inc. - * All Rights Reserved. - */ /* Bullet Continuous Collision Detection and Physics Library diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h index f96270097..45c99baea 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h @@ -1,3 +1,17 @@ +/* +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 SPU_GATHERING_COLLISION_TASK_H #define SPU_GATHERING_COLLISION_TASK_H diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.h b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.h index 359de295e..ed3cd5814 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.h +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGjkPairDetector.h @@ -1,8 +1,3 @@ -/* [SCE CONFIDENTIAL DOCUMENT] - * PLAYSTATION(R)3 SPU Optimized Bullet Physics Library (http://bulletphysics.com) - * Copyright (C) 2007 Sony Computer Entertainment Inc. - * All Rights Reserved. - */ /* Bullet Continuous Collision Detection and Physics Library diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h index 669ec768f..aa38ce1e1 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h @@ -1,8 +1,17 @@ -/* [SCE CONFIDENTIAL DOCUMENT] - * PLAYSTATION(R)3 SPU Optimized Bullet Physics Library (http://bulletphysics.com) - * Copyright (C) 2007 Sony Computer Entertainment Inc. - * All Rights Reserved. - */ +/* +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. +*/ diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h index ffad53b87..d5e66bb55 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h @@ -1,8 +1,3 @@ -/* [SCE CONFIDENTIAL DOCUMENT] - * PLAYSTATION(R)3 SPU Optimized Bullet Physics Library (http://bulletphysics.com) - * Copyright (C) 2007 Sony Computer Entertainment Inc. - * All Rights Reserved. - */ /* Bullet Continuous Collision Detection and Physics Library diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.h b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.h index cdd3ae6e5..b2d2677bb 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.h +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuVoronoiSimplexSolver.h @@ -1,8 +1,3 @@ -/* [SCE CONFIDENTIAL DOCUMENT] - * PLAYSTATION(R)3 SPU Optimized Bullet Physics Library (http://bulletphysics.com) - * Copyright (C) 2007 Sony Computer Entertainment Inc. - * All Rights Reserved. - */ /* Bullet Continuous Collision Detection and Physics Library