From 078fc33309d274da0c6261dfd3ac8558c74bfe4a Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 2 Oct 2017 16:20:11 +0200 Subject: [PATCH] [LICENCE] change ZLib to MPL-2 with athoriqzation of author: Email exchange: On 29.09.2017 14:35 Edouard DUPIN wrote: Hello, I have fork your physic engine and update it to fit better with my 3d game engine and my framework. I do many change: - on assert policy (I do not like it) - the back-end use of the vector3D and quaternion, that I have already an other implementation... - Log management - Other build system (lutin) - organisation of doxygen (all in the header) - remove dependency of the STL (in progress) - some bugs ... - ... And I have a problem with the licence. You use BSD-3 that is a good point, but this licence does not force the user to send your their modification. Then I ask you to permit me to change the licence of the FORK in MPL-2 that have the benefit to force developer to publish the modification and permit to use the software in a proprietary application without contamination. Best regards Edouard DUPIN https://github.com/HeeroYui https://github.com/atria-soft https://github.com/musicdsp answers from chappuis.daniel@XXXXXXX.yyy Hello, I am glad that you have found the ReactPhysics3D library to be useful. You said that you have found bugs. Maybe I have already found and fixed some of them but do not hesitate to report them here (https://github.com/DanielChappuis/reactphysics3d/issues) if not done yet. Concerning the license. The library is not under the BSD-3 license but under the zlib license (https://opensource.org/licenses/Zlib). With this license, it is allowed to use the software in a proprietary application without contamination. Regarding your request to change the license to the MPL-2, you can do it with the following condition : You need to add the following text in all the source files of ReactPhysics3D where the license will change. It must always be clear where the original code is coming from. --------------- TEXT TO ADD TO THE LICENSE IN EACH FILE ------------------------- Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. --------------------------------------------------------------------------------- For example, you can see here how the flow/react library (java port of ReactPhysics3D) has been re-licensed from ReactPhysics3D (https://github.com/flow/react/blob/develop/src/main/java/com/flowpowered/react/constraint/ContactPoint.java) I hope it fits your needs. Best Regards, Daniel Chappuis --- LICENSE | 389 +++++++++++++++++- README.md | 28 +- ephysics/body/Body.cpp | 9 +- ephysics/body/Body.hpp | 9 +- ephysics/body/CollisionBody.cpp | 11 +- ephysics/body/CollisionBody.hpp | 12 +- ephysics/body/RigidBody.cpp | 11 +- ephysics/body/RigidBody.hpp | 9 +- ephysics/collision/CollisionDetection.cpp | 11 +- ephysics/collision/CollisionDetection.hpp | 9 +- ephysics/collision/CollisionShapeInfo.hpp | 9 +- ephysics/collision/ContactManifold.cpp | 12 +- ephysics/collision/ContactManifold.hpp | 9 +- ephysics/collision/ContactManifoldSet.cpp | 10 +- ephysics/collision/ContactManifoldSet.hpp | 9 +- ephysics/collision/ProxyShape.cpp | 11 +- ephysics/collision/ProxyShape.hpp | 9 +- ephysics/collision/RaycastInfo.cpp | 12 +- ephysics/collision/RaycastInfo.hpp | 9 +- ephysics/collision/TriangleMesh.cpp | 10 +- ephysics/collision/TriangleMesh.hpp | 9 +- ephysics/collision/TriangleVertexArray.cpp | 11 +- ephysics/collision/TriangleVertexArray.hpp | 9 +- .../broadphase/BroadPhaseAlgorithm.cpp | 11 +- .../broadphase/BroadPhaseAlgorithm.hpp | 9 +- .../collision/broadphase/DynamicAABBTree.cpp | 10 +- .../collision/broadphase/DynamicAABBTree.hpp | 9 +- .../narrowphase/CollisionDispatch.hpp | 9 +- .../narrowphase/ConcaveVsConvexAlgorithm.cpp | 10 +- .../narrowphase/ConcaveVsConvexAlgorithm.hpp | 9 +- .../narrowphase/DefaultCollisionDispatch.cpp | 10 +- .../narrowphase/DefaultCollisionDispatch.hpp | 9 +- .../narrowphase/EPA/EPAAlgorithm.cpp | 9 +- .../narrowphase/EPA/EPAAlgorithm.hpp | 9 +- .../collision/narrowphase/EPA/EdgeEPA.cpp | 9 +- .../collision/narrowphase/EPA/EdgeEPA.hpp | 9 +- .../collision/narrowphase/EPA/TriangleEPA.cpp | 10 +- .../collision/narrowphase/EPA/TriangleEPA.hpp | 9 +- .../narrowphase/EPA/TrianglesStore.cpp | 10 +- .../narrowphase/EPA/TrianglesStore.hpp | 9 +- .../narrowphase/GJK/GJKAlgorithm.cpp | 9 +- .../narrowphase/GJK/GJKAlgorithm.hpp | 9 +- .../collision/narrowphase/GJK/Simplex.cpp | 18 +- .../collision/narrowphase/GJK/Simplex.hpp | 12 +- .../narrowphase/NarrowPhaseAlgorithm.cpp | 10 +- .../narrowphase/NarrowPhaseAlgorithm.hpp | 9 +- .../narrowphase/SphereVsSphereAlgorithm.cpp | 10 +- .../narrowphase/SphereVsSphereAlgorithm.hpp | 9 +- ephysics/collision/shapes/AABB.cpp | 10 +- ephysics/collision/shapes/AABB.hpp | 9 +- ephysics/collision/shapes/BoxShape.cpp | 10 +- ephysics/collision/shapes/BoxShape.hpp | 9 +- ephysics/collision/shapes/CapsuleShape.cpp | 11 +- ephysics/collision/shapes/CapsuleShape.hpp | 9 +- ephysics/collision/shapes/CollisionShape.cpp | 11 +- ephysics/collision/shapes/CollisionShape.hpp | 9 +- .../collision/shapes/ConcaveMeshShape.cpp | 10 +- .../collision/shapes/ConcaveMeshShape.hpp | 9 +- ephysics/collision/shapes/ConcaveShape.cpp | 11 +- ephysics/collision/shapes/ConcaveShape.hpp | 9 +- ephysics/collision/shapes/ConeShape.cpp | 11 +- ephysics/collision/shapes/ConeShape.hpp | 9 +- ephysics/collision/shapes/ConvexMeshShape.cpp | 10 +- ephysics/collision/shapes/ConvexMeshShape.hpp | 9 +- ephysics/collision/shapes/ConvexShape.cpp | 10 +- ephysics/collision/shapes/ConvexShape.hpp | 9 +- ephysics/collision/shapes/CylinderShape.cpp | 10 +- ephysics/collision/shapes/CylinderShape.hpp | 9 +- .../collision/shapes/HeightFieldShape.cpp | 12 +- .../collision/shapes/HeightFieldShape.hpp | 9 +- ephysics/collision/shapes/SphereShape.cpp | 11 +- ephysics/collision/shapes/SphereShape.hpp | 9 +- ephysics/collision/shapes/TriangleShape.cpp | 11 +- ephysics/collision/shapes/TriangleShape.hpp | 9 +- ephysics/configuration.hpp | 9 +- ephysics/constraint/BallAndSocketJoint.cpp | 10 +- ephysics/constraint/BallAndSocketJoint.hpp | 9 +- ephysics/constraint/ContactPoint.cpp | 11 +- ephysics/constraint/ContactPoint.hpp | 9 +- ephysics/constraint/FixedJoint.cpp | 10 +- ephysics/constraint/FixedJoint.hpp | 9 +- ephysics/constraint/HingeJoint.cpp | 11 +- ephysics/constraint/HingeJoint.hpp | 9 +- ephysics/constraint/Joint.cpp | 9 +- ephysics/constraint/Joint.hpp | 9 +- ephysics/constraint/SliderJoint.cpp | 11 +- ephysics/constraint/SliderJoint.hpp | 9 +- ephysics/engine/CollisionWorld.cpp | 10 +- ephysics/engine/CollisionWorld.hpp | 9 +- ephysics/engine/ConstraintSolver.cpp | 10 +- ephysics/engine/ConstraintSolver.hpp | 9 +- ephysics/engine/ContactSolver.cpp | 11 +- ephysics/engine/ContactSolver.hpp | 9 +- ephysics/engine/DynamicsWorld.cpp | 10 +- ephysics/engine/DynamicsWorld.hpp | 9 +- ephysics/engine/EventListener.hpp | 9 +- ephysics/engine/Impulse.hpp | 9 +- ephysics/engine/Island.cpp | 10 +- ephysics/engine/Island.hpp | 9 +- ephysics/engine/Material.cpp | 11 +- ephysics/engine/Material.hpp | 9 +- ephysics/engine/OverlappingPair.cpp | 11 +- ephysics/engine/OverlappingPair.hpp | 9 +- ephysics/engine/Profiler.cpp | 10 +- ephysics/engine/Profiler.hpp | 9 +- ephysics/engine/Timer.cpp | 11 +- ephysics/engine/Timer.hpp | 12 +- ephysics/ephysics.hpp | 9 +- ephysics/mathematics/Ray.hpp | 9 +- ephysics/mathematics/mathematics.hpp | 9 +- .../mathematics/mathematics_functions.cpp | 11 +- .../mathematics/mathematics_functions.hpp | 12 +- ephysics/memory/Stack.hpp | 9 +- 113 files changed, 1048 insertions(+), 460 deletions(-) diff --git a/LICENSE b/LICENSE index 2fb5b4b..30cda51 100644 --- a/LICENSE +++ b/LICENSE @@ -1,20 +1,379 @@ -ReactPhysics3D physics library, http://code.google.com/p/reactphysics3d/ -Copyright (c) 2010-2016 Daniel Chappuis +Original Licence +================ -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. +Original ReactPhysics3D C++ library by Daniel Chappuis +This code is re-licensed with permission from ReactPhysics3D author. -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: +Mozilla Public License Version 2.0 +================================== -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. +1. Definitions +-------------- -2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. -3. This notice may not be removed or altered from any source distribution. +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/README.md b/README.md index 10f2c20..196f01f 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,19 @@ -[![Travis Build Status](https://travis-ci.org/DanielChappuis/ephysics.svg?branch=master)](https://travis-ci.org/DanielChappuis/ephysics) +[![Travis Build Status](https://travis-ci.org/atria-soft/ephysics.svg?branch=master)](https://travis-ci.org/atria-soft/ephysics) -## ReactPhysics3D +## ephysics -ReactPhysics3D is an open source C++ physics engine library that can be used in 3D simulations and games. +ephysics is an open source C++ physics engine library that can be used in 3D simulations and games. -Website : [http://www.ephysics.com](http://www.ephysics.com) +Website: [http://www.ephysics.com](http://www.ephysics.com) -Author : Daniel Chappuis +Author: Daniel CHAPPUIS (original project ReactPhysics3D) +Author: Edouard DUPIN (forker) Drawing ## Features -ReactPhysics3D has the following features : +ephysics has the following features: - Rigid body dynamics - Discrete collision detection @@ -34,18 +35,5 @@ ReactPhysics3D has the following features : ## License -The ReactPhysics3D library is released under the open-source BSD 3 clauses license. +The ephysics library is released under the MPL-2 license. -## Documentation - -You can find the User Manual and the Doxygen API Documentation [here](http://www.ephysics.com/documentation.html) - -## Branches - -The "master" branch always contains the last released version of the library and some possible bug fixes. This is the most stable version. On the other side, -the "develop" branch is used for development. This branch is frequently updated and can be quite unstable. Therefore, if you want to use the library in -your application, it is recommended to checkout the "master" branch. - -## Issues - -If you find any issue with the library, you can report it on the issue tracker [here](https://github.com/DanielChappuis/ephysics/issues). diff --git a/ephysics/body/Body.cpp b/ephysics/body/Body.cpp index 8104478..375be15 100644 --- a/ephysics/body/Body.cpp +++ b/ephysics/body/Body.cpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #include diff --git a/ephysics/body/Body.hpp b/ephysics/body/Body.hpp index b344920..b441809 100644 --- a/ephysics/body/Body.hpp +++ b/ephysics/body/Body.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/body/CollisionBody.cpp b/ephysics/body/CollisionBody.cpp index 5b58ef8..05a72fb 100644 --- a/ephysics/body/CollisionBody.cpp +++ b/ephysics/body/CollisionBody.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - - // Libraries #include #include #include diff --git a/ephysics/body/CollisionBody.hpp b/ephysics/body/CollisionBody.hpp index 4fe7370..17e15c4 100644 --- a/ephysics/body/CollisionBody.hpp +++ b/ephysics/body/CollisionBody.hpp @@ -1,11 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ -#pragma once - -// Libraries #include #include #include diff --git a/ephysics/body/RigidBody.cpp b/ephysics/body/RigidBody.cpp index 6f223de..84b79a7 100644 --- a/ephysics/body/RigidBody.cpp +++ b/ephysics/body/RigidBody.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include #include diff --git a/ephysics/body/RigidBody.hpp b/ephysics/body/RigidBody.hpp index 792cb7a..f4f27fd 100644 --- a/ephysics/body/RigidBody.hpp +++ b/ephysics/body/RigidBody.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/CollisionDetection.cpp b/ephysics/collision/CollisionDetection.cpp index c09be17..472e15e 100644 --- a/ephysics/collision/CollisionDetection.cpp +++ b/ephysics/collision/CollisionDetection.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include #include diff --git a/ephysics/collision/CollisionDetection.hpp b/ephysics/collision/CollisionDetection.hpp index a47d782..fba2307 100644 --- a/ephysics/collision/CollisionDetection.hpp +++ b/ephysics/collision/CollisionDetection.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/CollisionShapeInfo.hpp b/ephysics/collision/CollisionShapeInfo.hpp index 45b92ca..f199749 100644 --- a/ephysics/collision/CollisionShapeInfo.hpp +++ b/ephysics/collision/CollisionShapeInfo.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/ContactManifold.cpp b/ephysics/collision/ContactManifold.cpp index 3156ff7..ae3989b 100644 --- a/ephysics/collision/ContactManifold.cpp +++ b/ephysics/collision/ContactManifold.cpp @@ -1,11 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - - -// Libraries #include using namespace ephysics; diff --git a/ephysics/collision/ContactManifold.hpp b/ephysics/collision/ContactManifold.hpp index 4468e2a..6da6757 100644 --- a/ephysics/collision/ContactManifold.hpp +++ b/ephysics/collision/ContactManifold.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/ContactManifoldSet.cpp b/ephysics/collision/ContactManifoldSet.cpp index 48b2778..2291acb 100644 --- a/ephysics/collision/ContactManifoldSet.cpp +++ b/ephysics/collision/ContactManifoldSet.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include using namespace ephysics; diff --git a/ephysics/collision/ContactManifoldSet.hpp b/ephysics/collision/ContactManifoldSet.hpp index f37ba51..0123224 100644 --- a/ephysics/collision/ContactManifoldSet.hpp +++ b/ephysics/collision/ContactManifoldSet.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/ProxyShape.cpp b/ephysics/collision/ProxyShape.cpp index 0065c11..74736ea 100644 --- a/ephysics/collision/ProxyShape.cpp +++ b/ephysics/collision/ProxyShape.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include using namespace ephysics; diff --git a/ephysics/collision/ProxyShape.hpp b/ephysics/collision/ProxyShape.hpp index bf78503..e4e45ed 100644 --- a/ephysics/collision/ProxyShape.hpp +++ b/ephysics/collision/ProxyShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/RaycastInfo.cpp b/ephysics/collision/RaycastInfo.cpp index dea6753..ff5aa72 100644 --- a/ephysics/collision/RaycastInfo.cpp +++ b/ephysics/collision/RaycastInfo.cpp @@ -1,11 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries - #include #include diff --git a/ephysics/collision/RaycastInfo.hpp b/ephysics/collision/RaycastInfo.hpp index afc9a61..9717e68 100644 --- a/ephysics/collision/RaycastInfo.hpp +++ b/ephysics/collision/RaycastInfo.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/TriangleMesh.cpp b/ephysics/collision/TriangleMesh.cpp index 2448865..60cada0 100644 --- a/ephysics/collision/TriangleMesh.cpp +++ b/ephysics/collision/TriangleMesh.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include ephysics::TriangleMesh::TriangleMesh() { diff --git a/ephysics/collision/TriangleMesh.hpp b/ephysics/collision/TriangleMesh.hpp index 4ed1c84..f8a2782 100644 --- a/ephysics/collision/TriangleMesh.hpp +++ b/ephysics/collision/TriangleMesh.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once #include diff --git a/ephysics/collision/TriangleVertexArray.cpp b/ephysics/collision/TriangleVertexArray.cpp index 32ea667..675e1ef 100644 --- a/ephysics/collision/TriangleVertexArray.cpp +++ b/ephysics/collision/TriangleVertexArray.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include diff --git a/ephysics/collision/TriangleVertexArray.hpp b/ephysics/collision/TriangleVertexArray.hpp index 9568dd0..5e6b181 100644 --- a/ephysics/collision/TriangleVertexArray.hpp +++ b/ephysics/collision/TriangleVertexArray.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/broadphase/BroadPhaseAlgorithm.cpp b/ephysics/collision/broadphase/BroadPhaseAlgorithm.cpp index 7f8a852..d3af59c 100644 --- a/ephysics/collision/broadphase/BroadPhaseAlgorithm.cpp +++ b/ephysics/collision/broadphase/BroadPhaseAlgorithm.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include #include diff --git a/ephysics/collision/broadphase/BroadPhaseAlgorithm.hpp b/ephysics/collision/broadphase/BroadPhaseAlgorithm.hpp index 782ad12..50e631e 100644 --- a/ephysics/collision/broadphase/BroadPhaseAlgorithm.hpp +++ b/ephysics/collision/broadphase/BroadPhaseAlgorithm.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/broadphase/DynamicAABBTree.cpp b/ephysics/collision/broadphase/DynamicAABBTree.cpp index 6c09899..8159c3f 100644 --- a/ephysics/collision/broadphase/DynamicAABBTree.cpp +++ b/ephysics/collision/broadphase/DynamicAABBTree.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include #include diff --git a/ephysics/collision/broadphase/DynamicAABBTree.hpp b/ephysics/collision/broadphase/DynamicAABBTree.hpp index b59ee77..62631b0 100644 --- a/ephysics/collision/broadphase/DynamicAABBTree.hpp +++ b/ephysics/collision/broadphase/DynamicAABBTree.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/narrowphase/CollisionDispatch.hpp b/ephysics/collision/narrowphase/CollisionDispatch.hpp index 3e6771e..076c770 100644 --- a/ephysics/collision/narrowphase/CollisionDispatch.hpp +++ b/ephysics/collision/narrowphase/CollisionDispatch.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/narrowphase/ConcaveVsConvexAlgorithm.cpp b/ephysics/collision/narrowphase/ConcaveVsConvexAlgorithm.cpp index 74e4207..d1f3c9b 100644 --- a/ephysics/collision/narrowphase/ConcaveVsConvexAlgorithm.cpp +++ b/ephysics/collision/narrowphase/ConcaveVsConvexAlgorithm.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include #include diff --git a/ephysics/collision/narrowphase/ConcaveVsConvexAlgorithm.hpp b/ephysics/collision/narrowphase/ConcaveVsConvexAlgorithm.hpp index 4cc7a67..9119e09 100644 --- a/ephysics/collision/narrowphase/ConcaveVsConvexAlgorithm.hpp +++ b/ephysics/collision/narrowphase/ConcaveVsConvexAlgorithm.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/narrowphase/DefaultCollisionDispatch.cpp b/ephysics/collision/narrowphase/DefaultCollisionDispatch.cpp index 7ece7b3..d7f5f7d 100644 --- a/ephysics/collision/narrowphase/DefaultCollisionDispatch.cpp +++ b/ephysics/collision/narrowphase/DefaultCollisionDispatch.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - // Libraries #include #include diff --git a/ephysics/collision/narrowphase/DefaultCollisionDispatch.hpp b/ephysics/collision/narrowphase/DefaultCollisionDispatch.hpp index b0efdf2..a6bbc5e 100644 --- a/ephysics/collision/narrowphase/DefaultCollisionDispatch.hpp +++ b/ephysics/collision/narrowphase/DefaultCollisionDispatch.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/narrowphase/EPA/EPAAlgorithm.cpp b/ephysics/collision/narrowphase/EPA/EPAAlgorithm.cpp index 6169e47..afa3068 100644 --- a/ephysics/collision/narrowphase/EPA/EPAAlgorithm.cpp +++ b/ephysics/collision/narrowphase/EPA/EPAAlgorithm.cpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #include #include diff --git a/ephysics/collision/narrowphase/EPA/EPAAlgorithm.hpp b/ephysics/collision/narrowphase/EPA/EPAAlgorithm.hpp index 7d77b18..c6a8fbe 100644 --- a/ephysics/collision/narrowphase/EPA/EPAAlgorithm.hpp +++ b/ephysics/collision/narrowphase/EPA/EPAAlgorithm.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once #include diff --git a/ephysics/collision/narrowphase/EPA/EdgeEPA.cpp b/ephysics/collision/narrowphase/EPA/EdgeEPA.cpp index 73cf2fa..a3d8841 100644 --- a/ephysics/collision/narrowphase/EPA/EdgeEPA.cpp +++ b/ephysics/collision/narrowphase/EPA/EdgeEPA.cpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #include #include diff --git a/ephysics/collision/narrowphase/EPA/EdgeEPA.hpp b/ephysics/collision/narrowphase/EPA/EdgeEPA.hpp index c09e157..79dddeb 100644 --- a/ephysics/collision/narrowphase/EPA/EdgeEPA.hpp +++ b/ephysics/collision/narrowphase/EPA/EdgeEPA.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once #include diff --git a/ephysics/collision/narrowphase/EPA/TriangleEPA.cpp b/ephysics/collision/narrowphase/EPA/TriangleEPA.cpp index 632038d..d499288 100644 --- a/ephysics/collision/narrowphase/EPA/TriangleEPA.cpp +++ b/ephysics/collision/narrowphase/EPA/TriangleEPA.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include #include diff --git a/ephysics/collision/narrowphase/EPA/TriangleEPA.hpp b/ephysics/collision/narrowphase/EPA/TriangleEPA.hpp index 7344c62..f30e516 100644 --- a/ephysics/collision/narrowphase/EPA/TriangleEPA.hpp +++ b/ephysics/collision/narrowphase/EPA/TriangleEPA.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once #include diff --git a/ephysics/collision/narrowphase/EPA/TrianglesStore.cpp b/ephysics/collision/narrowphase/EPA/TrianglesStore.cpp index 92ea806..6abfd36 100644 --- a/ephysics/collision/narrowphase/EPA/TrianglesStore.cpp +++ b/ephysics/collision/narrowphase/EPA/TrianglesStore.cpp @@ -1,8 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include diff --git a/ephysics/collision/narrowphase/EPA/TrianglesStore.hpp b/ephysics/collision/narrowphase/EPA/TrianglesStore.hpp index 9c85491..ddc85b7 100644 --- a/ephysics/collision/narrowphase/EPA/TrianglesStore.hpp +++ b/ephysics/collision/narrowphase/EPA/TrianglesStore.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once #include diff --git a/ephysics/collision/narrowphase/GJK/GJKAlgorithm.cpp b/ephysics/collision/narrowphase/GJK/GJKAlgorithm.cpp index fd4f771..9cce26d 100644 --- a/ephysics/collision/narrowphase/GJK/GJKAlgorithm.cpp +++ b/ephysics/collision/narrowphase/GJK/GJKAlgorithm.cpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #include #include diff --git a/ephysics/collision/narrowphase/GJK/GJKAlgorithm.hpp b/ephysics/collision/narrowphase/GJK/GJKAlgorithm.hpp index 5d28884..fb1327b 100644 --- a/ephysics/collision/narrowphase/GJK/GJKAlgorithm.hpp +++ b/ephysics/collision/narrowphase/GJK/GJKAlgorithm.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/narrowphase/GJK/Simplex.cpp b/ephysics/collision/narrowphase/GJK/Simplex.cpp index 0003769..a70edd5 100644 --- a/ephysics/collision/narrowphase/GJK/Simplex.cpp +++ b/ephysics/collision/narrowphase/GJK/Simplex.cpp @@ -1,25 +1,19 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include -// We want to use the ReactPhysics3D namespace using namespace ephysics; -// Constructor Simplex::Simplex() : mBitsCurrentSimplex(0x0), mAllBits(0x0) { } -// Destructor -Simplex::~Simplex() { - -} - // Add a new support point of (A-B) int32_to the simplex /// suppPointA : support point of object A in a direction -v /// suppPointB : support point of object B in a direction v diff --git a/ephysics/collision/narrowphase/GJK/Simplex.hpp b/ephysics/collision/narrowphase/GJK/Simplex.hpp index 0368882..6c353ca 100644 --- a/ephysics/collision/narrowphase/GJK/Simplex.hpp +++ b/ephysics/collision/narrowphase/GJK/Simplex.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once @@ -103,9 +106,6 @@ class Simplex { /// Constructor Simplex(); - /// Destructor - ~Simplex(); - /// Return true if the simplex contains 4 points bool isFull() const; diff --git a/ephysics/collision/narrowphase/NarrowPhaseAlgorithm.cpp b/ephysics/collision/narrowphase/NarrowPhaseAlgorithm.cpp index f423a05..d1d97f3 100644 --- a/ephysics/collision/narrowphase/NarrowPhaseAlgorithm.cpp +++ b/ephysics/collision/narrowphase/NarrowPhaseAlgorithm.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include using namespace ephysics; diff --git a/ephysics/collision/narrowphase/NarrowPhaseAlgorithm.hpp b/ephysics/collision/narrowphase/NarrowPhaseAlgorithm.hpp index bc75891..a75ed0b 100644 --- a/ephysics/collision/narrowphase/NarrowPhaseAlgorithm.hpp +++ b/ephysics/collision/narrowphase/NarrowPhaseAlgorithm.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/narrowphase/SphereVsSphereAlgorithm.cpp b/ephysics/collision/narrowphase/SphereVsSphereAlgorithm.cpp index 6ca3e6d..9ce4657 100644 --- a/ephysics/collision/narrowphase/SphereVsSphereAlgorithm.cpp +++ b/ephysics/collision/narrowphase/SphereVsSphereAlgorithm.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include diff --git a/ephysics/collision/narrowphase/SphereVsSphereAlgorithm.hpp b/ephysics/collision/narrowphase/SphereVsSphereAlgorithm.hpp index 9b3a049..3e2d1d5 100644 --- a/ephysics/collision/narrowphase/SphereVsSphereAlgorithm.hpp +++ b/ephysics/collision/narrowphase/SphereVsSphereAlgorithm.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/AABB.cpp b/ephysics/collision/shapes/AABB.cpp index d3d5107..aee1ebc 100644 --- a/ephysics/collision/shapes/AABB.cpp +++ b/ephysics/collision/shapes/AABB.cpp @@ -1,10 +1,12 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - // Libraries #include #include diff --git a/ephysics/collision/shapes/AABB.hpp b/ephysics/collision/shapes/AABB.hpp index a072831..7d3ebb6 100644 --- a/ephysics/collision/shapes/AABB.hpp +++ b/ephysics/collision/shapes/AABB.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once #include diff --git a/ephysics/collision/shapes/BoxShape.cpp b/ephysics/collision/shapes/BoxShape.cpp index 2a1c130..b7736b2 100644 --- a/ephysics/collision/shapes/BoxShape.cpp +++ b/ephysics/collision/shapes/BoxShape.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - // Libraries #include #include diff --git a/ephysics/collision/shapes/BoxShape.hpp b/ephysics/collision/shapes/BoxShape.hpp index 585a1a9..2920e2e 100644 --- a/ephysics/collision/shapes/BoxShape.hpp +++ b/ephysics/collision/shapes/BoxShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/CapsuleShape.cpp b/ephysics/collision/shapes/CapsuleShape.cpp index f258fe1..aa355ed 100644 --- a/ephysics/collision/shapes/CapsuleShape.cpp +++ b/ephysics/collision/shapes/CapsuleShape.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include #include diff --git a/ephysics/collision/shapes/CapsuleShape.hpp b/ephysics/collision/shapes/CapsuleShape.hpp index 8ae0c27..6f7c86e 100644 --- a/ephysics/collision/shapes/CapsuleShape.hpp +++ b/ephysics/collision/shapes/CapsuleShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/CollisionShape.cpp b/ephysics/collision/shapes/CollisionShape.cpp index ed3f82c..1b4f8c1 100644 --- a/ephysics/collision/shapes/CollisionShape.cpp +++ b/ephysics/collision/shapes/CollisionShape.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include #include diff --git a/ephysics/collision/shapes/CollisionShape.hpp b/ephysics/collision/shapes/CollisionShape.hpp index 04aece4..d3df785 100644 --- a/ephysics/collision/shapes/CollisionShape.hpp +++ b/ephysics/collision/shapes/CollisionShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/ConcaveMeshShape.cpp b/ephysics/collision/shapes/ConcaveMeshShape.cpp index aaaffb8..986439e 100644 --- a/ephysics/collision/shapes/ConcaveMeshShape.cpp +++ b/ephysics/collision/shapes/ConcaveMeshShape.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include diff --git a/ephysics/collision/shapes/ConcaveMeshShape.hpp b/ephysics/collision/shapes/ConcaveMeshShape.hpp index 93342e4..ed28e04 100644 --- a/ephysics/collision/shapes/ConcaveMeshShape.hpp +++ b/ephysics/collision/shapes/ConcaveMeshShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/ConcaveShape.cpp b/ephysics/collision/shapes/ConcaveShape.cpp index da76acc..df91b6d 100644 --- a/ephysics/collision/shapes/ConcaveShape.cpp +++ b/ephysics/collision/shapes/ConcaveShape.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include diff --git a/ephysics/collision/shapes/ConcaveShape.hpp b/ephysics/collision/shapes/ConcaveShape.hpp index e843ed4..4e05040 100644 --- a/ephysics/collision/shapes/ConcaveShape.hpp +++ b/ephysics/collision/shapes/ConcaveShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/ConeShape.cpp b/ephysics/collision/shapes/ConeShape.cpp index 11f436a..5b18477 100644 --- a/ephysics/collision/shapes/ConeShape.cpp +++ b/ephysics/collision/shapes/ConeShape.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include #include diff --git a/ephysics/collision/shapes/ConeShape.hpp b/ephysics/collision/shapes/ConeShape.hpp index be35267..e800d1a 100644 --- a/ephysics/collision/shapes/ConeShape.hpp +++ b/ephysics/collision/shapes/ConeShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/ConvexMeshShape.cpp b/ephysics/collision/shapes/ConvexMeshShape.cpp index 7896178..8cae2e0 100644 --- a/ephysics/collision/shapes/ConvexMeshShape.cpp +++ b/ephysics/collision/shapes/ConvexMeshShape.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include diff --git a/ephysics/collision/shapes/ConvexMeshShape.hpp b/ephysics/collision/shapes/ConvexMeshShape.hpp index d8e927a..fa99b2e 100644 --- a/ephysics/collision/shapes/ConvexMeshShape.hpp +++ b/ephysics/collision/shapes/ConvexMeshShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/ConvexShape.cpp b/ephysics/collision/shapes/ConvexShape.cpp index d0afc51..8060918 100644 --- a/ephysics/collision/shapes/ConvexShape.cpp +++ b/ephysics/collision/shapes/ConvexShape.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include ephysics::ConvexShape::ConvexShape(ephysics::CollisionShapeType _type, float _margin): diff --git a/ephysics/collision/shapes/ConvexShape.hpp b/ephysics/collision/shapes/ConvexShape.hpp index 24a2e41..bf4cf43 100644 --- a/ephysics/collision/shapes/ConvexShape.hpp +++ b/ephysics/collision/shapes/ConvexShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/CylinderShape.cpp b/ephysics/collision/shapes/CylinderShape.cpp index 94b8e34..fc54f7a 100644 --- a/ephysics/collision/shapes/CylinderShape.cpp +++ b/ephysics/collision/shapes/CylinderShape.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include #include diff --git a/ephysics/collision/shapes/CylinderShape.hpp b/ephysics/collision/shapes/CylinderShape.hpp index 7a236e4..f08637d 100644 --- a/ephysics/collision/shapes/CylinderShape.hpp +++ b/ephysics/collision/shapes/CylinderShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/HeightFieldShape.cpp b/ephysics/collision/shapes/HeightFieldShape.cpp index 2b2570d..10e5819 100644 --- a/ephysics/collision/shapes/HeightFieldShape.cpp +++ b/ephysics/collision/shapes/HeightFieldShape.cpp @@ -1,15 +1,15 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include using namespace ephysics; -// Constructor /** * @param nbGridColumns Number of columns in the grid of the height field * @param nbGridRows Number of rows in the grid of the height field diff --git a/ephysics/collision/shapes/HeightFieldShape.hpp b/ephysics/collision/shapes/HeightFieldShape.hpp index 95ee8fd..340486d 100644 --- a/ephysics/collision/shapes/HeightFieldShape.hpp +++ b/ephysics/collision/shapes/HeightFieldShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/SphereShape.cpp b/ephysics/collision/shapes/SphereShape.cpp index 0c699c0..f3ba7c2 100644 --- a/ephysics/collision/shapes/SphereShape.cpp +++ b/ephysics/collision/shapes/SphereShape.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include #include diff --git a/ephysics/collision/shapes/SphereShape.hpp b/ephysics/collision/shapes/SphereShape.hpp index 12a8707..b29a615 100644 --- a/ephysics/collision/shapes/SphereShape.hpp +++ b/ephysics/collision/shapes/SphereShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/collision/shapes/TriangleShape.cpp b/ephysics/collision/shapes/TriangleShape.cpp index 035040c..da278ad 100644 --- a/ephysics/collision/shapes/TriangleShape.cpp +++ b/ephysics/collision/shapes/TriangleShape.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include #include diff --git a/ephysics/collision/shapes/TriangleShape.hpp b/ephysics/collision/shapes/TriangleShape.hpp index 5a942c2..8043ff0 100644 --- a/ephysics/collision/shapes/TriangleShape.hpp +++ b/ephysics/collision/shapes/TriangleShape.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/configuration.hpp b/ephysics/configuration.hpp index b38f9cf..fb09d68 100644 --- a/ephysics/configuration.hpp +++ b/ephysics/configuration.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/constraint/BallAndSocketJoint.cpp b/ephysics/constraint/BallAndSocketJoint.cpp index 36d8963..1674d66 100644 --- a/ephysics/constraint/BallAndSocketJoint.cpp +++ b/ephysics/constraint/BallAndSocketJoint.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - // Libraries #include #include diff --git a/ephysics/constraint/BallAndSocketJoint.hpp b/ephysics/constraint/BallAndSocketJoint.hpp index a490c8c..3a2d594 100644 --- a/ephysics/constraint/BallAndSocketJoint.hpp +++ b/ephysics/constraint/BallAndSocketJoint.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/constraint/ContactPoint.cpp b/ephysics/constraint/ContactPoint.cpp index 631cd69..b24c3d5 100644 --- a/ephysics/constraint/ContactPoint.cpp +++ b/ephysics/constraint/ContactPoint.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include diff --git a/ephysics/constraint/ContactPoint.hpp b/ephysics/constraint/ContactPoint.hpp index aba90a2..26fc3da 100644 --- a/ephysics/constraint/ContactPoint.hpp +++ b/ephysics/constraint/ContactPoint.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/constraint/FixedJoint.cpp b/ephysics/constraint/FixedJoint.cpp index dbb26af..e956fbe 100644 --- a/ephysics/constraint/FixedJoint.cpp +++ b/ephysics/constraint/FixedJoint.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include diff --git a/ephysics/constraint/FixedJoint.hpp b/ephysics/constraint/FixedJoint.hpp index 94a0453..b26ac95 100644 --- a/ephysics/constraint/FixedJoint.hpp +++ b/ephysics/constraint/FixedJoint.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/constraint/HingeJoint.cpp b/ephysics/constraint/HingeJoint.cpp index d0f9f8b..da356b3 100644 --- a/ephysics/constraint/HingeJoint.cpp +++ b/ephysics/constraint/HingeJoint.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include diff --git a/ephysics/constraint/HingeJoint.hpp b/ephysics/constraint/HingeJoint.hpp index 129ffeb..71a006c 100644 --- a/ephysics/constraint/HingeJoint.hpp +++ b/ephysics/constraint/HingeJoint.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/constraint/Joint.cpp b/ephysics/constraint/Joint.cpp index c3a948f..19b5884 100644 --- a/ephysics/constraint/Joint.cpp +++ b/ephysics/constraint/Joint.cpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #include diff --git a/ephysics/constraint/Joint.hpp b/ephysics/constraint/Joint.hpp index 801017c..cd08b61 100644 --- a/ephysics/constraint/Joint.hpp +++ b/ephysics/constraint/Joint.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/constraint/SliderJoint.cpp b/ephysics/constraint/SliderJoint.cpp index 10ddcda..586f39a 100644 --- a/ephysics/constraint/SliderJoint.cpp +++ b/ephysics/constraint/SliderJoint.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include using namespace ephysics; diff --git a/ephysics/constraint/SliderJoint.hpp b/ephysics/constraint/SliderJoint.hpp index 073c36d..9a1e4d5 100644 --- a/ephysics/constraint/SliderJoint.hpp +++ b/ephysics/constraint/SliderJoint.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/engine/CollisionWorld.cpp b/ephysics/engine/CollisionWorld.cpp index 16eb4b2..81e85c4 100644 --- a/ephysics/engine/CollisionWorld.cpp +++ b/ephysics/engine/CollisionWorld.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include diff --git a/ephysics/engine/CollisionWorld.hpp b/ephysics/engine/CollisionWorld.hpp index 9d00023..759276a 100644 --- a/ephysics/engine/CollisionWorld.hpp +++ b/ephysics/engine/CollisionWorld.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/engine/ConstraintSolver.cpp b/ephysics/engine/ConstraintSolver.cpp index ad49460..a017e2d 100644 --- a/ephysics/engine/ConstraintSolver.cpp +++ b/ephysics/engine/ConstraintSolver.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include diff --git a/ephysics/engine/ConstraintSolver.hpp b/ephysics/engine/ConstraintSolver.hpp index 14de776..9144ffa 100644 --- a/ephysics/engine/ConstraintSolver.hpp +++ b/ephysics/engine/ConstraintSolver.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/engine/ContactSolver.cpp b/ephysics/engine/ContactSolver.cpp index 783e687..8a1df55 100644 --- a/ephysics/engine/ContactSolver.cpp +++ b/ephysics/engine/ContactSolver.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include #include diff --git a/ephysics/engine/ContactSolver.hpp b/ephysics/engine/ContactSolver.hpp index a833c75..6ebe889 100644 --- a/ephysics/engine/ContactSolver.hpp +++ b/ephysics/engine/ContactSolver.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/engine/DynamicsWorld.cpp b/ephysics/engine/DynamicsWorld.cpp index d441061..4bd523e 100644 --- a/ephysics/engine/DynamicsWorld.cpp +++ b/ephysics/engine/DynamicsWorld.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include #include #include diff --git a/ephysics/engine/DynamicsWorld.hpp b/ephysics/engine/DynamicsWorld.hpp index 76215db..0ea6cf1 100644 --- a/ephysics/engine/DynamicsWorld.hpp +++ b/ephysics/engine/DynamicsWorld.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/engine/EventListener.hpp b/ephysics/engine/EventListener.hpp index 35e0c0d..4bd092a 100644 --- a/ephysics/engine/EventListener.hpp +++ b/ephysics/engine/EventListener.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/engine/Impulse.hpp b/ephysics/engine/Impulse.hpp index 21fe24a..86febdb 100644 --- a/ephysics/engine/Impulse.hpp +++ b/ephysics/engine/Impulse.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/engine/Island.cpp b/ephysics/engine/Island.cpp index 82d632c..48211e2 100644 --- a/ephysics/engine/Island.cpp +++ b/ephysics/engine/Island.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #include using namespace ephysics; diff --git a/ephysics/engine/Island.hpp b/ephysics/engine/Island.hpp index b1b7d68..0e144d5 100644 --- a/ephysics/engine/Island.hpp +++ b/ephysics/engine/Island.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/engine/Material.cpp b/ephysics/engine/Material.cpp index 56ba5c4..fdcdcf9 100644 --- a/ephysics/engine/Material.cpp +++ b/ephysics/engine/Material.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include using namespace ephysics; diff --git a/ephysics/engine/Material.hpp b/ephysics/engine/Material.hpp index 5566bd0..45d398b 100644 --- a/ephysics/engine/Material.hpp +++ b/ephysics/engine/Material.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once extern "C" { diff --git a/ephysics/engine/OverlappingPair.cpp b/ephysics/engine/OverlappingPair.cpp index 4fe9d27..3a24859 100644 --- a/ephysics/engine/OverlappingPair.cpp +++ b/ephysics/engine/OverlappingPair.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include using namespace ephysics; diff --git a/ephysics/engine/OverlappingPair.hpp b/ephysics/engine/OverlappingPair.hpp index 144544c..7808463 100644 --- a/ephysics/engine/OverlappingPair.hpp +++ b/ephysics/engine/OverlappingPair.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once #include diff --git a/ephysics/engine/Profiler.cpp b/ephysics/engine/Profiler.cpp index 5e0ac18..a1aae4d 100644 --- a/ephysics/engine/Profiler.cpp +++ b/ephysics/engine/Profiler.cpp @@ -1,9 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - #ifdef IS_PROFILING_ACTIVE // Libraries diff --git a/ephysics/engine/Profiler.hpp b/ephysics/engine/Profiler.hpp index 63a8a3f..c0c87dc 100644 --- a/ephysics/engine/Profiler.hpp +++ b/ephysics/engine/Profiler.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/engine/Timer.cpp b/ephysics/engine/Timer.cpp index 5acb77e..aa6b3bc 100644 --- a/ephysics/engine/Timer.cpp +++ b/ephysics/engine/Timer.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include diff --git a/ephysics/engine/Timer.hpp b/ephysics/engine/Timer.hpp index aac182f..866b0b1 100644 --- a/ephysics/engine/Timer.hpp +++ b/ephysics/engine/Timer.hpp @@ -1,11 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ -#pragma once - -// Libraries #include #include diff --git a/ephysics/ephysics.hpp b/ephysics/ephysics.hpp index e2e9192..cb703be 100644 --- a/ephysics/ephysics.hpp +++ b/ephysics/ephysics.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/mathematics/Ray.hpp b/ephysics/mathematics/Ray.hpp index 35ba2da..39bf638 100644 --- a/ephysics/mathematics/Ray.hpp +++ b/ephysics/mathematics/Ray.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/mathematics/mathematics.hpp b/ephysics/mathematics/mathematics.hpp index 366db0b..b9618b8 100644 --- a/ephysics/mathematics/mathematics.hpp +++ b/ephysics/mathematics/mathematics.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/ephysics/mathematics/mathematics_functions.cpp b/ephysics/mathematics/mathematics_functions.cpp index d36c342..e04e548 100644 --- a/ephysics/mathematics/mathematics_functions.cpp +++ b/ephysics/mathematics/mathematics_functions.cpp @@ -1,10 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ - -// Libraries #include #include diff --git a/ephysics/mathematics/mathematics_functions.hpp b/ephysics/mathematics/mathematics_functions.hpp index 33029c6..a119743 100644 --- a/ephysics/mathematics/mathematics_functions.hpp +++ b/ephysics/mathematics/mathematics_functions.hpp @@ -1,11 +1,11 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ -#pragma once - -// Libraries #include #include diff --git a/ephysics/memory/Stack.hpp b/ephysics/memory/Stack.hpp index 29f37d3..22fdfd2 100644 --- a/ephysics/memory/Stack.hpp +++ b/ephysics/memory/Stack.hpp @@ -1,7 +1,10 @@ /** @file - * @author Daniel Chappuis - * @copyright 2010-2016 Daniel Chappuis - * @license BSD 3 clauses (see license file) + * Original ReactPhysics3D C++ library by Daniel Chappuis This code is re-licensed with permission from ReactPhysics3D author. + * @author Daniel CHAPPUIS + * @author Edouard DUPIN + * @copyright 2010-2016, Daniel Chappuis + * @copyright 2017, Edouard DUPIN + * @license MPL v2.0 (see license file) */ #pragma once