Moving emitter shapes to a separate package.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7568 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
14 years ago · 19ad025877
parent c95c656a55
commit 19ad025877
21 changed files with 25 additions and 23 deletions
--- a/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ModifierHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ModifierHelper.java
@ -48,9 +48,9 @@ import com.jme3.animation.SkeletonControl;
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingSphere;
 import com.jme3.bounding.BoundingVolume;
-import com.jme3.effect.EmitterMeshVertexShape;
-import com.jme3.effect.EmitterShape;
 import com.jme3.effect.ParticleEmitter;
+import com.jme3.effect.shapes.EmitterMeshVertexShape;
+import com.jme3.effect.shapes.EmitterShape;
 import com.jme3.material.Material;
 import com.jme3.math.Matrix4f;
 import com.jme3.math.Quaternion;
--- a/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ParticlesHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ParticlesHelper.java
@ -2,14 +2,14 @@ package com.jme3.scene.plugins.blender.helpers.v249;

 import java.util.logging.Logger;

-import com.jme3.effect.EmitterMeshConvexHullShape;
-import com.jme3.effect.EmitterMeshFaceShape;
-import com.jme3.effect.EmitterMeshVertexShape;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
 import com.jme3.effect.influencers.EmptyParticleInfluencer;
 import com.jme3.effect.influencers.ParticleInfluencer;
 import com.jme3.effect.influencers.NewtonianParticleInfluencer;
+import com.jme3.effect.shapes.EmitterMeshConvexHullShape;
+import com.jme3.effect.shapes.EmitterMeshFaceShape;
+import com.jme3.effect.shapes.EmitterMeshVertexShape;
 import com.jme3.math.ColorRGBA;
 import com.jme3.scene.plugins.blender.data.Structure;
 import com.jme3.scene.plugins.blender.exception.BlenderFileException;
--- a/engine/src/core/com/jme3/effect/ParticleEmitter.java
+++ b/engine/src/core/com/jme3/effect/ParticleEmitter.java
@ -36,6 +36,8 @@ import com.jme3.bounding.BoundingBox;
 import com.jme3.effect.ParticleMesh.Type;
 import com.jme3.effect.influencers.DefaultParticleInfluencer;
 import com.jme3.effect.influencers.ParticleInfluencer;
+import com.jme3.effect.shapes.EmitterPointShape;
+import com.jme3.effect.shapes.EmitterShape;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.InputCapsule;
--- a/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java
+++ b/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java
@ -2,8 +2,8 @@ package com.jme3.effect.influencers;

 import java.io.IOException;

-import com.jme3.effect.EmitterShape;
 import com.jme3.effect.Particle;
+import com.jme3.effect.shapes.EmitterShape;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
--- a/engine/src/core/com/jme3/effect/influencers/EmptyParticleInfluencer.java
+++ b/engine/src/core/com/jme3/effect/influencers/EmptyParticleInfluencer.java
@ -2,8 +2,8 @@ package com.jme3.effect.influencers;

 import java.io.IOException;

-import com.jme3.effect.EmitterShape;
 import com.jme3.effect.Particle;
+import com.jme3.effect.shapes.EmitterShape;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.math.Vector3f;
--- a/engine/src/core/com/jme3/effect/influencers/NewtonianParticleInfluencer.java
+++ b/engine/src/core/com/jme3/effect/influencers/NewtonianParticleInfluencer.java
@ -2,8 +2,8 @@ package com.jme3.effect.influencers;

 import java.io.IOException;

-import com.jme3.effect.EmitterShape;
 import com.jme3.effect.Particle;
+import com.jme3.effect.shapes.EmitterShape;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
--- a/engine/src/core/com/jme3/effect/influencers/ParticleInfluencer.java
+++ b/engine/src/core/com/jme3/effect/influencers/ParticleInfluencer.java
@ -1,8 +1,8 @@
 package com.jme3.effect.influencers;

-import com.jme3.effect.EmitterShape;
 import com.jme3.effect.Particle;
 import com.jme3.effect.ParticleEmitter;
+import com.jme3.effect.shapes.EmitterShape;
 import com.jme3.export.Savable;
 import com.jme3.math.Vector3f;

--- a/engine/src/core/com/jme3/effect/shapes/EmitterBoxShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterBoxShape.java
@ -30,7 +30,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-package com.jme3.effect;
+package com.jme3.effect.shapes;

 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
--- a/engine/src/core/com/jme3/effect/shapes/EmitterMeshConvexHullShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterMeshConvexHullShape.java
@ -1,4 +1,4 @@
-package com.jme3.effect;
+package com.jme3.effect.shapes;

 import java.util.List;

--- a/engine/src/core/com/jme3/effect/shapes/EmitterMeshFaceShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterMeshFaceShape.java
@ -1,4 +1,4 @@
-package com.jme3.effect;
+package com.jme3.effect.shapes;

 import java.util.ArrayList;
 import java.util.List;
--- a/engine/src/core/com/jme3/effect/shapes/EmitterMeshVertexShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterMeshVertexShape.java
@ -1,4 +1,4 @@
-package com.jme3.effect;
+package com.jme3.effect.shapes;

 import java.io.IOException;
 import java.util.ArrayList;
--- a/engine/src/core/com/jme3/effect/shapes/EmitterPointShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterPointShape.java
@ -30,7 +30,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-package com.jme3.effect;
+package com.jme3.effect.shapes;

 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
--- a/engine/src/core/com/jme3/effect/shapes/EmitterShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterShape.java
@ -30,7 +30,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-package com.jme3.effect;
+package com.jme3.effect.shapes;

 import com.jme3.export.Savable;
 import com.jme3.math.Vector3f;
--- a/engine/src/core/com/jme3/effect/shapes/EmitterSphereShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterSphereShape.java
@ -30,7 +30,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-package com.jme3.effect;
+package com.jme3.effect.shapes;

 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
--- a/engine/src/test/jme3test/bullet/BombControl.java
+++ b/engine/src/test/jme3test/bullet/BombControl.java
@ -15,9 +15,9 @@ import com.jme3.bullet.collision.shapes.SphereCollisionShape;
 import com.jme3.bullet.control.RigidBodyControl;
 import com.jme3.bullet.objects.PhysicsGhostObject;
 import com.jme3.bullet.objects.PhysicsRigidBody;
-import com.jme3.effect.EmitterSphereShape;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
+import com.jme3.effect.shapes.EmitterSphereShape;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.material.Material;
--- a/engine/src/test/jme3test/bullet/TestWalkingChar.java
+++ b/engine/src/test/jme3test/bullet/TestWalkingChar.java
@ -46,9 +46,9 @@ import com.jme3.bullet.collision.shapes.SphereCollisionShape;
 import com.jme3.bullet.control.CharacterControl;
 import com.jme3.bullet.control.RigidBodyControl;
 import com.jme3.bullet.util.CollisionShapeFactory;
-import com.jme3.effect.EmitterSphereShape;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
+import com.jme3.effect.shapes.EmitterSphereShape;
 import com.jme3.input.ChaseCamera;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
--- a/engine/src/test/jme3test/effect/TestExplosionEffect.java
+++ b/engine/src/test/jme3test/effect/TestExplosionEffect.java
@ -33,9 +33,9 @@
 package jme3test.effect;

 import com.jme3.app.SimpleApplication;
-import com.jme3.effect.EmitterSphereShape;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
+import com.jme3.effect.shapes.EmitterSphereShape;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
--- a/engine/src/test/jme3test/effect/TestMovingParticle.java
+++ b/engine/src/test/jme3test/effect/TestMovingParticle.java
@ -33,9 +33,9 @@
 package jme3test.effect;

 import com.jme3.app.SimpleApplication;
-import com.jme3.effect.EmitterSphereShape;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
+import com.jme3.effect.shapes.EmitterSphereShape;
 import com.jme3.material.Material;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
--- a/engine/src/test/jme3test/effect/TestParticleEmitter.java
+++ b/engine/src/test/jme3test/effect/TestParticleEmitter.java
@ -33,9 +33,9 @@
 package jme3test.effect;

 import com.jme3.app.SimpleApplication;
-import com.jme3.effect.EmitterSphereShape;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
+import com.jme3.effect.shapes.EmitterSphereShape;
 import com.jme3.material.Material;
 import com.jme3.math.Vector3f;

--- a/engine/src/test/jme3test/effect/TestPointSprite.java
+++ b/engine/src/test/jme3test/effect/TestPointSprite.java
@ -33,9 +33,9 @@
 package jme3test.effect;

 import com.jme3.app.SimpleApplication;
-import com.jme3.effect.EmitterBoxShape;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
+import com.jme3.effect.shapes.EmitterBoxShape;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
--- a/engine/src/test/jme3test/network/sync/TestSync.java
+++ b/engine/src/test/jme3test/network/sync/TestSync.java
@ -1,7 +1,7 @@
 package jme3test.network.sync;

 import com.jme3.app.SimpleApplication;
-import com.jme3.effect.EmitterSphereShape;
+import com.jme3.effect.shapes.EmitterSphereShape;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.network.connection.Client;