sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moving emitter shapes to a separate package.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7568 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Kae..pl 2011-06-10 17:03:29 +00:00
parent c95c656a55
commit 19ad025877
21 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ModifierHelper.java
View File

@ -48,9 +48,9 @@ import com.jme3.animation.SkeletonControl;
import com.jme3.bounding.BoundingBox; import com.jme3.bounding.BoundingBox;
import com.jme3.bounding.BoundingSphere; import com.jme3.bounding.BoundingSphere;
import com.jme3.bounding.BoundingVolume; import com.jme3.bounding.BoundingVolume;
import com.jme3.effect.EmitterMeshVertexShape;
import com.jme3.effect.EmitterShape;
import com.jme3.effect.ParticleEmitter; 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.material.Material;
import com.jme3.math.Matrix4f; import com.jme3.math.Matrix4f;
import com.jme3.math.Quaternion; import com.jme3.math.Quaternion;

6
engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ParticlesHelper.java
View File

@ -2,14 +2,14 @@ package com.jme3.scene.plugins.blender.helpers.v249;
import java.util.logging.Logger; 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.ParticleEmitter;
import com.jme3.effect.ParticleMesh.Type; import com.jme3.effect.ParticleMesh.Type;
import com.jme3.effect.influencers.EmptyParticleInfluencer; import com.jme3.effect.influencers.EmptyParticleInfluencer;
import com.jme3.effect.influencers.ParticleInfluencer; import com.jme3.effect.influencers.ParticleInfluencer;
import com.jme3.effect.influencers.NewtonianParticleInfluencer; 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.math.ColorRGBA;
import com.jme3.scene.plugins.blender.data.Structure; import com.jme3.scene.plugins.blender.data.Structure;
import com.jme3.scene.plugins.blender.exception.BlenderFileException; import com.jme3.scene.plugins.blender.exception.BlenderFileException;

2
engine/src/core/com/jme3/effect/ParticleEmitter.java
View File

@ -36,6 +36,8 @@ import com.jme3.bounding.BoundingBox;
import com.jme3.effect.ParticleMesh.Type; import com.jme3.effect.ParticleMesh.Type;
import com.jme3.effect.influencers.DefaultParticleInfluencer; import com.jme3.effect.influencers.DefaultParticleInfluencer;
import com.jme3.effect.influencers.ParticleInfluencer; 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.JmeExporter;
import com.jme3.export.JmeImporter; import com.jme3.export.JmeImporter;
import com.jme3.export.InputCapsule; import com.jme3.export.InputCapsule;

2
engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java
View File

@ -2,8 +2,8 @@ package com.jme3.effect.influencers;
import java.io.IOException; import java.io.IOException;
import com.jme3.effect.EmitterShape;
import com.jme3.effect.Particle; import com.jme3.effect.Particle;
import com.jme3.effect.shapes.EmitterShape;
import com.jme3.export.InputCapsule; import com.jme3.export.InputCapsule;
import com.jme3.export.JmeExporter; import com.jme3.export.JmeExporter;
import com.jme3.export.JmeImporter; import com.jme3.export.JmeImporter;

2
engine/src/core/com/jme3/effect/influencers/EmptyParticleInfluencer.java
View File

@ -2,8 +2,8 @@ package com.jme3.effect.influencers;
import java.io.IOException; import java.io.IOException;
import com.jme3.effect.EmitterShape;
import com.jme3.effect.Particle; import com.jme3.effect.Particle;
import com.jme3.effect.shapes.EmitterShape;
import com.jme3.export.JmeExporter; import com.jme3.export.JmeExporter;
import com.jme3.export.JmeImporter; import com.jme3.export.JmeImporter;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;

2
engine/src/core/com/jme3/effect/influencers/NewtonianParticleInfluencer.java
View File

@ -2,8 +2,8 @@ package com.jme3.effect.influencers;
import java.io.IOException; import java.io.IOException;
import com.jme3.effect.EmitterShape;
import com.jme3.effect.Particle; import com.jme3.effect.Particle;
import com.jme3.effect.shapes.EmitterShape;
import com.jme3.export.InputCapsule; import com.jme3.export.InputCapsule;
import com.jme3.export.JmeExporter; import com.jme3.export.JmeExporter;
import com.jme3.export.JmeImporter; import com.jme3.export.JmeImporter;

2
engine/src/core/com/jme3/effect/influencers/ParticleInfluencer.java
View File

@ -1,8 +1,8 @@
package com.jme3.effect.influencers; package com.jme3.effect.influencers;
import com.jme3.effect.EmitterShape;
import com.jme3.effect.Particle; import com.jme3.effect.Particle;
import com.jme3.effect.ParticleEmitter; import com.jme3.effect.ParticleEmitter;
import com.jme3.effect.shapes.EmitterShape;
import com.jme3.export.Savable; import com.jme3.export.Savable;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;

2
engine/src/core/com/jme3/effect/EmitterBoxShape.java → engine/src/core/com/jme3/effect/shapes/EmitterBoxShape.java
View File

@ -30,7 +30,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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.JmeExporter;
import com.jme3.export.JmeImporter; import com.jme3.export.JmeImporter;

2
engine/src/core/com/jme3/effect/EmitterMeshConvexHullShape.java → engine/src/core/com/jme3/effect/shapes/EmitterMeshConvexHullShape.java
View File

@ -1,4 +1,4 @@
package com.jme3.effect; package com.jme3.effect.shapes;
import java.util.List; import java.util.List;

2
engine/src/core/com/jme3/effect/EmitterMeshFaceShape.java → engine/src/core/com/jme3/effect/shapes/EmitterMeshFaceShape.java
View File

@ -1,4 +1,4 @@
package com.jme3.effect; package com.jme3.effect.shapes;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
engine/src/core/com/jme3/effect/EmitterMeshVertexShape.java → engine/src/core/com/jme3/effect/shapes/EmitterMeshVertexShape.java
View File

@ -1,4 +1,4 @@
package com.jme3.effect; package com.jme3.effect.shapes;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

2
engine/src/core/com/jme3/effect/EmitterPointShape.java → engine/src/core/com/jme3/effect/shapes/EmitterPointShape.java
View File

@ -30,7 +30,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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.JmeExporter;
import com.jme3.export.JmeImporter; import com.jme3.export.JmeImporter;

2
engine/src/core/com/jme3/effect/EmitterShape.java → engine/src/core/com/jme3/effect/shapes/EmitterShape.java
View File

@ -30,7 +30,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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.export.Savable;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;

2
engine/src/core/com/jme3/effect/EmitterSphereShape.java → engine/src/core/com/jme3/effect/shapes/EmitterSphereShape.java
View File

@ -30,7 +30,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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.JmeExporter;
import com.jme3.export.JmeImporter; import com.jme3.export.JmeImporter;

2
engine/src/test/jme3test/bullet/BombControl.java
View File

@ -15,9 +15,9 @@ import com.jme3.bullet.collision.shapes.SphereCollisionShape;
import com.jme3.bullet.control.RigidBodyControl; import com.jme3.bullet.control.RigidBodyControl;
import com.jme3.bullet.objects.PhysicsGhostObject; import com.jme3.bullet.objects.PhysicsGhostObject;
import com.jme3.bullet.objects.PhysicsRigidBody; import com.jme3.bullet.objects.PhysicsRigidBody;
import com.jme3.effect.EmitterSphereShape;
import com.jme3.effect.ParticleEmitter; import com.jme3.effect.ParticleEmitter;
import com.jme3.effect.ParticleMesh.Type; import com.jme3.effect.ParticleMesh.Type;
import com.jme3.effect.shapes.EmitterSphereShape;
import com.jme3.export.JmeExporter; import com.jme3.export.JmeExporter;
import com.jme3.export.JmeImporter; import com.jme3.export.JmeImporter;
import com.jme3.material.Material; import com.jme3.material.Material;

2
engine/src/test/jme3test/bullet/TestWalkingChar.java
View File

@ -46,9 +46,9 @@ import com.jme3.bullet.collision.shapes.SphereCollisionShape;
import com.jme3.bullet.control.CharacterControl; import com.jme3.bullet.control.CharacterControl;
import com.jme3.bullet.control.RigidBodyControl; import com.jme3.bullet.control.RigidBodyControl;
import com.jme3.bullet.util.CollisionShapeFactory; import com.jme3.bullet.util.CollisionShapeFactory;
import com.jme3.effect.EmitterSphereShape;
import com.jme3.effect.ParticleEmitter; import com.jme3.effect.ParticleEmitter;
import com.jme3.effect.ParticleMesh.Type; import com.jme3.effect.ParticleMesh.Type;
import com.jme3.effect.shapes.EmitterSphereShape;
import com.jme3.input.ChaseCamera; import com.jme3.input.ChaseCamera;
import com.jme3.input.KeyInput; import com.jme3.input.KeyInput;
import com.jme3.input.controls.ActionListener; import com.jme3.input.controls.ActionListener;

2
engine/src/test/jme3test/effect/TestExplosionEffect.java
View File

@ -33,9 +33,9 @@
package jme3test.effect; package jme3test.effect;
import com.jme3.app.SimpleApplication; import com.jme3.app.SimpleApplication;
import com.jme3.effect.EmitterSphereShape;
import com.jme3.effect.ParticleEmitter; import com.jme3.effect.ParticleEmitter;
import com.jme3.effect.ParticleMesh.Type; import com.jme3.effect.ParticleMesh.Type;
import com.jme3.effect.shapes.EmitterSphereShape;
import com.jme3.material.Material; import com.jme3.material.Material;
import com.jme3.math.ColorRGBA; import com.jme3.math.ColorRGBA;
import com.jme3.math.FastMath; import com.jme3.math.FastMath;

2
engine/src/test/jme3test/effect/TestMovingParticle.java
View File

@ -33,9 +33,9 @@
package jme3test.effect; package jme3test.effect;
import com.jme3.app.SimpleApplication; import com.jme3.app.SimpleApplication;
import com.jme3.effect.EmitterSphereShape;
import com.jme3.effect.ParticleEmitter; import com.jme3.effect.ParticleEmitter;
import com.jme3.effect.ParticleMesh.Type; import com.jme3.effect.ParticleMesh.Type;
import com.jme3.effect.shapes.EmitterSphereShape;
import com.jme3.material.Material; import com.jme3.material.Material;
import com.jme3.math.FastMath; import com.jme3.math.FastMath;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;

2
engine/src/test/jme3test/effect/TestParticleEmitter.java
View File

@ -33,9 +33,9 @@
package jme3test.effect; package jme3test.effect;
import com.jme3.app.SimpleApplication; import com.jme3.app.SimpleApplication;
import com.jme3.effect.EmitterSphereShape;
import com.jme3.effect.ParticleEmitter; import com.jme3.effect.ParticleEmitter;
import com.jme3.effect.ParticleMesh.Type; import com.jme3.effect.ParticleMesh.Type;
import com.jme3.effect.shapes.EmitterSphereShape;
import com.jme3.material.Material; import com.jme3.material.Material;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;

2
engine/src/test/jme3test/effect/TestPointSprite.java
View File

@ -33,9 +33,9 @@
package jme3test.effect; package jme3test.effect;
import com.jme3.app.SimpleApplication; import com.jme3.app.SimpleApplication;
import com.jme3.effect.EmitterBoxShape;
import com.jme3.effect.ParticleEmitter; import com.jme3.effect.ParticleEmitter;
import com.jme3.effect.ParticleMesh.Type; import com.jme3.effect.ParticleMesh.Type;
import com.jme3.effect.shapes.EmitterBoxShape;
import com.jme3.material.Material; import com.jme3.material.Material;
import com.jme3.math.ColorRGBA; import com.jme3.math.ColorRGBA;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;

2
engine/src/test/jme3test/network/sync/TestSync.java
View File

@ -1,7 +1,7 @@
package jme3test.network.sync; package jme3test.network.sync;
import com.jme3.app.SimpleApplication; 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.ColorRGBA;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;
import com.jme3.network.connection.Client; import com.jme3.network.connection.Client;