Skip to content

Commit e479ca7

Browse files
lukespragglukespragg
committed
Change namespace to com.flowpowered.react
- Also update headers to straight MIT license
1 parent 956963d commit e479ca7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1795
-346
lines changed

src/main/java/org/spout/physics/ReactDefaults.java renamed to src/main/java/com/flowpowered/react/ReactDefaults.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/*
2+
* This file is part of Flow React, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
124
/*
225
* This file is part of React.
326
*
@@ -24,7 +47,7 @@
2447
* License and see <http://spout.in/licensev1> for the full license, including
2548
* the MIT license.
2649
*/
27-
package org.spout.physics;
50+
package com.flowpowered.react;
2851

2952
/**
3053
* Physics engine constants

src/main/java/org/spout/physics/Utilities.java renamed to src/main/java/com/flowpowered/react/Utilities.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/*
2+
* This file is part of Flow React, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
124
/*
225
* This file is part of React.
326
*
@@ -24,7 +47,7 @@
2447
* License and see <http://spout.in/licensev1> for the full license, including
2548
* the MIT license.
2649
*/
27-
package org.spout.physics;
50+
package com.flowpowered.react;
2851

2952
/**
3053
* This class contains static utilities. It was added for the port to implement some C++ code in Java.

src/main/java/org/spout/physics/body/Body.java renamed to src/main/java/com/flowpowered/react/body/Body.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/*
2+
* This file is part of Flow React, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
124
/*
225
* This file is part of React.
326
*
@@ -24,7 +47,7 @@
2447
* License and see <http://spout.in/licensev1> for the full license, including
2548
* the MIT license.
2649
*/
27-
package org.spout.physics.body;
50+
package com.flowpowered.react.body;
2851

2952
/**
3053
* This is the base class for a body in the physics engine.

src/main/java/org/spout/physics/body/CollisionBody.java renamed to src/main/java/com/flowpowered/react/body/CollisionBody.java

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/*
2+
* This file is part of Flow React, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
124
/*
225
* This file is part of React.
326
*
@@ -24,12 +47,12 @@
2447
* License and see <http://spout.in/licensev1> for the full license, including
2548
* the MIT license.
2649
*/
27-
package org.spout.physics.body;
50+
package com.flowpowered.react.body;
2851

29-
import org.spout.physics.collision.shape.AABB;
30-
import org.spout.physics.collision.shape.CollisionShape;
31-
import org.spout.physics.engine.ContactManifold.ContactManifoldListElement;
32-
import org.spout.physics.math.Transform;
52+
import com.flowpowered.react.collision.shape.AABB;
53+
import com.flowpowered.react.collision.shape.CollisionShape;
54+
import com.flowpowered.react.engine.ContactManifold.ContactManifoldListElement;
55+
import com.flowpowered.react.math.Transform;
3356

3457
/**
3558
* Represents a body that is able to collide with others bodies. This class inherits from the Body class.

src/main/java/org/spout/physics/body/RigidBody.java renamed to src/main/java/com/flowpowered/react/body/RigidBody.java

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/*
2+
* This file is part of Flow React, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
124
/*
225
* This file is part of React.
326
*
@@ -24,15 +47,15 @@
2447
* License and see <http://spout.in/licensev1> for the full license, including
2548
* the MIT license.
2649
*/
27-
package org.spout.physics.body;
50+
package com.flowpowered.react.body;
2851

29-
import org.spout.physics.collision.shape.CollisionShape;
30-
import org.spout.physics.constraint.Joint;
31-
import org.spout.physics.constraint.Joint.JointListElement;
32-
import org.spout.physics.engine.Material;
33-
import org.spout.physics.math.Matrix3x3;
34-
import org.spout.physics.math.Transform;
35-
import org.spout.physics.math.Vector3;
52+
import com.flowpowered.react.collision.shape.CollisionShape;
53+
import com.flowpowered.react.constraint.Joint;
54+
import com.flowpowered.react.constraint.Joint.JointListElement;
55+
import com.flowpowered.react.engine.Material;
56+
import com.flowpowered.react.math.Matrix3x3;
57+
import com.flowpowered.react.math.Transform;
58+
import com.flowpowered.react.math.Vector3;
3659

3760
/**
3861
* Represents a rigid body for the physics engine. A rigid body is a non-deformable body that has a constant mass. This class inherits from the CollisionBody class.
@@ -325,7 +348,7 @@ public void setIsSleeping(boolean isSleeping) {
325348

326349
/**
327350
* Applies an external force to the body at its gravity center. If the body is sleeping, calling this method will wake it up. Note that the force will be added to the sum of the applied forces and
328-
* that this sum will be reset to zero at the end of each call of the {@link org.spout.physics.engine.DynamicsWorld#update()} method.
351+
* that this sum will be reset to zero at the end of each call of the {@link com.flowpowered.react.engine.DynamicsWorld#update()} method.
329352
*
330353
* @param force The force to apply
331354
*/
@@ -342,7 +365,7 @@ public void applyForceToCenter(Vector3 force) {
342365
/**
343366
* Applies an external force to the body at a given point (in world-space coordinates). If the point is not at the center of gravity of the body, it will also generate some torque and therefore, change
344367
* the angular velocity of the body. If the body is sleeping, calling this method will wake it up. Note that the force will be added to the sum of the applied forces and that this sum will be
345-
* reset to zero at the end of each call of the {@link org.spout.physics.engine.DynamicsWorld#update()} method.
368+
* reset to zero at the end of each call of the {@link com.flowpowered.react.engine.DynamicsWorld#update()} method.
346369
*
347370
* @param force The force to apply
348371
* @param point The point to apply the force to
@@ -360,7 +383,7 @@ public void applyForce(Vector3 force, Vector3 point) {
360383

361384
/**
362385
* Applies an external torque to the body. If the body is sleeping, calling this method will wake it up. Note that the force will be added to the sum of the applied torques and that this sum will
363-
* be reset to zero at the end of each call of the {@link org.spout.physics.engine.DynamicsWorld#update()} method.
386+
* be reset to zero at the end of each call of the {@link com.flowpowered.react.engine.DynamicsWorld#update()} method.
364387
*
365388
* @param torque The torque to apply
366389
*/

src/main/java/org/spout/physics/collision/BroadPhasePair.java renamed to src/main/java/com/flowpowered/react/collision/BroadPhasePair.java

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/*
2+
* This file is part of Flow React, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
124
/*
225
* This file is part of React.
326
*
@@ -24,11 +47,11 @@
2447
* License and see <http://spout.in/licensev1> for the full license, including
2548
* the MIT license.
2649
*/
27-
package org.spout.physics.collision;
50+
package com.flowpowered.react.collision;
2851

29-
import org.spout.physics.Utilities.IntPair;
30-
import org.spout.physics.body.CollisionBody;
31-
import org.spout.physics.math.Vector3;
52+
import com.flowpowered.react.Utilities.IntPair;
53+
import com.flowpowered.react.body.CollisionBody;
54+
import com.flowpowered.react.math.Vector3;
3255

3356
/**
3457
* Represents a pair of bodies during the broad-phase collision detection.

src/main/java/org/spout/physics/collision/CollisionDetection.java renamed to src/main/java/com/flowpowered/react/collision/CollisionDetection.java

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/*
2+
* This file is part of Flow React, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) 2013 Flow Powered <https://flowpowered.com/>
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
124
/*
225
* This file is part of React.
326
*
@@ -24,7 +47,7 @@
2447
* License and see <http://spout.in/licensev1> for the full license, including
2548
* the MIT license.
2649
*/
27-
package org.spout.physics.collision;
50+
package com.flowpowered.react.collision;
2851

2952
import java.util.ArrayList;
3053
import java.util.HashMap;
@@ -34,21 +57,21 @@
3457
import java.util.Map.Entry;
3558
import java.util.Set;
3659

37-
import org.spout.physics.Utilities.IntPair;
38-
import org.spout.physics.body.CollisionBody;
39-
import org.spout.physics.body.RigidBody;
40-
import org.spout.physics.collision.broadphase.BroadPhaseAlgorithm;
41-
import org.spout.physics.collision.broadphase.PairManager.BodyPair;
42-
import org.spout.physics.collision.broadphase.SweepAndPruneAlgorithm;
43-
import org.spout.physics.collision.linkedphase.LinkedPhase;
44-
import org.spout.physics.collision.narrowphase.GJK.GJKAlgorithm;
45-
import org.spout.physics.collision.narrowphase.NarrowPhaseAlgorithm;
46-
import org.spout.physics.collision.narrowphase.SphereVsSphereAlgorithm;
47-
import org.spout.physics.collision.shape.CollisionShape;
48-
import org.spout.physics.collision.shape.CollisionShape.CollisionShapeType;
49-
import org.spout.physics.constraint.ContactPoint.ContactPointInfo;
50-
import org.spout.physics.engine.CollisionWorld;
51-
import org.spout.physics.engine.linked.LinkedDynamicsWorld;
60+
import com.flowpowered.react.Utilities.IntPair;
61+
import com.flowpowered.react.body.CollisionBody;
62+
import com.flowpowered.react.body.RigidBody;
63+
import com.flowpowered.react.collision.broadphase.BroadPhaseAlgorithm;
64+
import com.flowpowered.react.collision.broadphase.PairManager.BodyPair;
65+
import com.flowpowered.react.collision.broadphase.SweepAndPruneAlgorithm;
66+
import com.flowpowered.react.collision.linkedphase.LinkedPhase;
67+
import com.flowpowered.react.collision.narrowphase.GJK.GJKAlgorithm;
68+
import com.flowpowered.react.collision.narrowphase.NarrowPhaseAlgorithm;
69+
import com.flowpowered.react.collision.narrowphase.SphereVsSphereAlgorithm;
70+
import com.flowpowered.react.collision.shape.CollisionShape;
71+
import com.flowpowered.react.collision.shape.CollisionShape.CollisionShapeType;
72+
import com.flowpowered.react.constraint.ContactPoint.ContactPointInfo;
73+
import com.flowpowered.react.engine.CollisionWorld;
74+
import com.flowpowered.react.engine.linked.LinkedDynamicsWorld;
5275

5376
/**
5477
* This class computes the collision detection algorithms. We first perform a broad-phase algorithm to know which pairs of bodies can collide and then we run a narrow-phase algorithm to compute the

0 commit comments

Comments
 (0)