diff --git 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 index 67c34c667..09ec8e2e1 100644 --- 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; diff --git 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 index 1300fed18..13d04139e 100644 --- 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; diff --git a/engine/src/core/com/jme3/effect/ParticleEmitter.java b/engine/src/core/com/jme3/effect/ParticleEmitter.java index 122894601..af884965e 100644 --- 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; diff --git a/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java b/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java index a666629dc..5538bb110 100644 --- 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; diff --git a/engine/src/core/com/jme3/effect/influencers/EmptyParticleInfluencer.java b/engine/src/core/com/jme3/effect/influencers/EmptyParticleInfluencer.java index 4d9c6964f..a05322c2d 100644 --- 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; diff --git a/engine/src/core/com/jme3/effect/influencers/NewtonianParticleInfluencer.java b/engine/src/core/com/jme3/effect/influencers/NewtonianParticleInfluencer.java index f7498b0bd..0fcfdba3f 100644 --- 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; diff --git a/engine/src/core/com/jme3/effect/influencers/ParticleInfluencer.java b/engine/src/core/com/jme3/effect/influencers/ParticleInfluencer.java index 948c959d3..1d3bd4788 100644 --- 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; diff --git a/engine/src/core/com/jme3/effect/EmitterBoxShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterBoxShape.java similarity index 99% rename from engine/src/core/com/jme3/effect/EmitterBoxShape.java rename to engine/src/core/com/jme3/effect/shapes/EmitterBoxShape.java index 6385623a9..bb8ee54dc 100644 --- a/engine/src/core/com/jme3/effect/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; diff --git a/engine/src/core/com/jme3/effect/EmitterMeshConvexHullShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterMeshConvexHullShape.java similarity index 98% rename from engine/src/core/com/jme3/effect/EmitterMeshConvexHullShape.java rename to engine/src/core/com/jme3/effect/shapes/EmitterMeshConvexHullShape.java index 7a428a51c..4b7089a07 100644 --- a/engine/src/core/com/jme3/effect/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; diff --git a/engine/src/core/com/jme3/effect/EmitterMeshFaceShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterMeshFaceShape.java similarity index 99% rename from engine/src/core/com/jme3/effect/EmitterMeshFaceShape.java rename to engine/src/core/com/jme3/effect/shapes/EmitterMeshFaceShape.java index a84322261..8c87072da 100644 --- a/engine/src/core/com/jme3/effect/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; diff --git a/engine/src/core/com/jme3/effect/EmitterMeshVertexShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterMeshVertexShape.java similarity index 99% rename from engine/src/core/com/jme3/effect/EmitterMeshVertexShape.java rename to engine/src/core/com/jme3/effect/shapes/EmitterMeshVertexShape.java index 393781bcd..d50fddb58 100644 --- a/engine/src/core/com/jme3/effect/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; diff --git a/engine/src/core/com/jme3/effect/EmitterPointShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterPointShape.java similarity index 98% rename from engine/src/core/com/jme3/effect/EmitterPointShape.java rename to engine/src/core/com/jme3/effect/shapes/EmitterPointShape.java index 16cb78809..d791efedc 100644 --- a/engine/src/core/com/jme3/effect/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; diff --git a/engine/src/core/com/jme3/effect/EmitterShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterShape.java similarity index 98% rename from engine/src/core/com/jme3/effect/EmitterShape.java rename to engine/src/core/com/jme3/effect/shapes/EmitterShape.java index c51eac2d2..f6c9dadc5 100644 --- a/engine/src/core/com/jme3/effect/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; diff --git a/engine/src/core/com/jme3/effect/EmitterSphereShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterSphereShape.java similarity index 99% rename from engine/src/core/com/jme3/effect/EmitterSphereShape.java rename to engine/src/core/com/jme3/effect/shapes/EmitterSphereShape.java index 2f857f0ab..3605111fb 100644 --- a/engine/src/core/com/jme3/effect/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; diff --git a/engine/src/test/jme3test/bullet/BombControl.java b/engine/src/test/jme3test/bullet/BombControl.java index f20446397..4bad9f03a 100644 --- 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; diff --git a/engine/src/test/jme3test/bullet/TestWalkingChar.java b/engine/src/test/jme3test/bullet/TestWalkingChar.java index b309fbcc6..af1a554d0 100644 --- 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; diff --git a/engine/src/test/jme3test/effect/TestExplosionEffect.java b/engine/src/test/jme3test/effect/TestExplosionEffect.java index 28c82c4df..31c8c0907 100644 --- 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; diff --git a/engine/src/test/jme3test/effect/TestMovingParticle.java b/engine/src/test/jme3test/effect/TestMovingParticle.java index ec2d5837e..27a4334ed 100644 --- 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; diff --git a/engine/src/test/jme3test/effect/TestParticleEmitter.java b/engine/src/test/jme3test/effect/TestParticleEmitter.java index 91e4463eb..226417efe 100644 --- 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; diff --git a/engine/src/test/jme3test/effect/TestPointSprite.java b/engine/src/test/jme3test/effect/TestPointSprite.java index e423b694b..4577fb9f9 100644 --- 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; diff --git a/engine/src/test/jme3test/network/sync/TestSync.java b/engine/src/test/jme3test/network/sync/TestSync.java index e1f9396df..626d862c0 100644 --- 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;