diff --git a/.classpath b/.classpath index 269d628..1350d80 100644 --- a/.classpath +++ b/.classpath @@ -3,7 +3,6 @@ - @@ -13,13 +12,16 @@ - - - + + + + + + diff --git a/OpenAL32.dll b/OpenAL32.dll index 8dc9fa5..22eb15f 100644 Binary files a/OpenAL32.dll and b/OpenAL32.dll differ diff --git a/jinput-dx8.dll b/jinput-dx8.dll index 0ad824b..038401b 100644 Binary files a/jinput-dx8.dll and b/jinput-dx8.dll differ diff --git a/jinput-raw.dll b/jinput-raw.dll index 2a014f6..043783a 100644 Binary files a/jinput-raw.dll and b/jinput-raw.dll differ diff --git a/lib/jinput.jar b/lib/jinput.jar index e12e523..26b589f 100644 Binary files a/lib/jinput.jar and b/lib/jinput.jar differ diff --git a/lib/jme-audio.jar b/lib/jme-audio.jar index b1e1984..d32c6ec 100644 Binary files a/lib/jme-audio.jar and b/lib/jme-audio.jar differ diff --git a/lib/jme-awt.jar b/lib/jme-awt.jar index 181f1f9..f5f4a7b 100644 Binary files a/lib/jme-awt.jar and b/lib/jme-awt.jar differ diff --git a/lib/jme-collada.jar b/lib/jme-collada.jar index e485505..01b5ad6 100644 Binary files a/lib/jme-collada.jar and b/lib/jme-collada.jar differ diff --git a/lib/jme-editors.jar b/lib/jme-editors.jar index 58fe559..671d33c 100644 Binary files a/lib/jme-editors.jar and b/lib/jme-editors.jar differ diff --git a/lib/jme-effects.jar b/lib/jme-effects.jar index badc3dc..06f1834 100644 Binary files a/lib/jme-effects.jar and b/lib/jme-effects.jar differ diff --git a/lib/jme-font.jar b/lib/jme-font.jar index a2c394a..d8b84ca 100644 Binary files a/lib/jme-font.jar and b/lib/jme-font.jar differ diff --git a/lib/jme-gamestates.jar b/lib/jme-gamestates.jar index b3528be..19939f7 100644 Binary files a/lib/jme-gamestates.jar and b/lib/jme-gamestates.jar differ diff --git a/lib/jme-model.jar b/lib/jme-model.jar index d2dc683..4042eeb 100644 Binary files a/lib/jme-model.jar and b/lib/jme-model.jar differ diff --git a/lib/jme-physics.jar b/lib/jme-physics.jar new file mode 100644 index 0000000..f5e7885 Binary files /dev/null and b/lib/jme-physics.jar differ diff --git a/lib/jme-scene.jar b/lib/jme-scene.jar index 4d33c4b..62e1795 100644 Binary files a/lib/jme-scene.jar and b/lib/jme-scene.jar differ diff --git a/lib/jme-swt.jar b/lib/jme-swt.jar deleted file mode 100644 index 1b6abb1..0000000 Binary files a/lib/jme-swt.jar and /dev/null differ diff --git a/lib/jme-terrain.jar b/lib/jme-terrain.jar index e9b1ada..13137f4 100644 Binary files a/lib/jme-terrain.jar and b/lib/jme-terrain.jar differ diff --git a/lib/jme-test.jar b/lib/jme-test.jar deleted file mode 100644 index 35f43ed..0000000 Binary files a/lib/jme-test.jar and /dev/null differ diff --git a/lib/jme-xml.jar b/lib/jme-xml.jar index 0689a5c..9bf3120 100644 Binary files a/lib/jme-xml.jar and b/lib/jme-xml.jar differ diff --git a/lib/jme.jar b/lib/jme.jar index 8d87d22..5f5e39e 100644 Binary files a/lib/jme.jar and b/lib/jme.jar differ diff --git a/lib/jmetest.jar b/lib/jmetest.jar new file mode 100644 index 0000000..c6a1915 Binary files /dev/null and b/lib/jmetest.jar differ diff --git a/lib/jogg-0.0.7.jar b/lib/jogg-0.0.7.jar new file mode 100644 index 0000000..1cbd1ad Binary files /dev/null and b/lib/jogg-0.0.7.jar differ diff --git a/lib/jorbis-0.0.15.jar b/lib/jorbis-0.0.15.jar new file mode 100644 index 0000000..4cf51f9 Binary files /dev/null and b/lib/jorbis-0.0.15.jar differ diff --git a/lib/junit-4.1.jar b/lib/junit-4.1.jar new file mode 100644 index 0000000..2c46d67 Binary files /dev/null and b/lib/junit-4.1.jar differ diff --git a/lib/lwjgl.jar b/lib/lwjgl.jar index 68ab8ee..9243a17 100644 Binary files a/lib/lwjgl.jar and b/lib/lwjgl.jar differ diff --git a/lib/lwjgl_test.jar b/lib/lwjgl_test.jar deleted file mode 100644 index 505bbf6..0000000 Binary files a/lib/lwjgl_test.jar and /dev/null differ diff --git a/lib/lwjgl_util.jar b/lib/lwjgl_util.jar deleted file mode 100644 index d5226e8..0000000 Binary files a/lib/lwjgl_util.jar and /dev/null differ diff --git a/lib/lwjgl_util_applet.jar b/lib/lwjgl_util_applet.jar index 10fad1a..c32b440 100644 Binary files a/lib/lwjgl_util_applet.jar and b/lib/lwjgl_util_applet.jar differ diff --git a/lib/native/linux/libjinput-linux.so b/lib/native/linux/libjinput-linux.so new file mode 100644 index 0000000..e4a983f Binary files /dev/null and b/lib/native/linux/libjinput-linux.so differ diff --git a/lib/native/linux/liblwjgl.so b/lib/native/linux/liblwjgl.so new file mode 100644 index 0000000..3c218b3 Binary files /dev/null and b/lib/native/linux/liblwjgl.so differ diff --git a/lib/native/linux/liblwjgl64.so b/lib/native/linux/liblwjgl64.so new file mode 100644 index 0000000..c4528f7 Binary files /dev/null and b/lib/native/linux/liblwjgl64.so differ diff --git a/lib/native/linux/libodejava.so b/lib/native/linux/libodejava.so new file mode 100644 index 0000000..e2e0452 Binary files /dev/null and b/lib/native/linux/libodejava.so differ diff --git a/lib/native/linux/libodejava64.so b/lib/native/linux/libodejava64.so new file mode 100644 index 0000000..c3f4d11 Binary files /dev/null and b/lib/native/linux/libodejava64.so differ diff --git a/lib/native/linux/libopenal.so b/lib/native/linux/libopenal.so new file mode 100644 index 0000000..31d24ed Binary files /dev/null and b/lib/native/linux/libopenal.so differ diff --git a/lib/native/mac/libjinput-osx.jnilib b/lib/native/mac/libjinput-osx.jnilib new file mode 100644 index 0000000..a2610ad Binary files /dev/null and b/lib/native/mac/libjinput-osx.jnilib differ diff --git a/lib/native/mac/liblwjgl.jnilib b/lib/native/mac/liblwjgl.jnilib new file mode 100644 index 0000000..731f8e5 Binary files /dev/null and b/lib/native/mac/liblwjgl.jnilib differ diff --git a/lib/native/mac/libodejava.jnilib b/lib/native/mac/libodejava.jnilib new file mode 100644 index 0000000..2d5701f Binary files /dev/null and b/lib/native/mac/libodejava.jnilib differ diff --git a/lib/native/mac/openal.dylib b/lib/native/mac/openal.dylib new file mode 100644 index 0000000..cb8e458 Binary files /dev/null and b/lib/native/mac/openal.dylib differ diff --git a/lib/native/windows/OpenAL32.dll b/lib/native/windows/OpenAL32.dll new file mode 100644 index 0000000..22eb15f Binary files /dev/null and b/lib/native/windows/OpenAL32.dll differ diff --git a/lib/native/windows/jinput-dx8.dll b/lib/native/windows/jinput-dx8.dll new file mode 100644 index 0000000..038401b Binary files /dev/null and b/lib/native/windows/jinput-dx8.dll differ diff --git a/lib/native/windows/jinput-raw.dll b/lib/native/windows/jinput-raw.dll new file mode 100644 index 0000000..043783a Binary files /dev/null and b/lib/native/windows/jinput-raw.dll differ diff --git a/lib/native/windows/lwjgl.dll b/lib/native/windows/lwjgl.dll new file mode 100644 index 0000000..a868714 Binary files /dev/null and b/lib/native/windows/lwjgl.dll differ diff --git a/lib/native/windows/odejava.dll b/lib/native/windows/odejava.dll new file mode 100644 index 0000000..b4701cd Binary files /dev/null and b/lib/native/windows/odejava.dll differ diff --git a/lib/odejava-jni.jar b/lib/odejava-jni.jar new file mode 100644 index 0000000..3c3579c Binary files /dev/null and b/lib/odejava-jni.jar differ diff --git a/lwjgl.dll b/lwjgl.dll index 387c60d..a868714 100644 Binary files a/lwjgl.dll and b/lwjgl.dll differ diff --git a/odejava.dll b/odejava.dll new file mode 100644 index 0000000..b4701cd Binary files /dev/null and b/odejava.dll differ diff --git a/src/sg/test/TestDomino.java b/src/sg/test/TestDomino.java deleted file mode 100644 index 1988018..0000000 --- a/src/sg/test/TestDomino.java +++ /dev/null @@ -1,191 +0,0 @@ -/* - * Copyright (c) 2005-2007 jME Physics 2 - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'jME Physics 2' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package sg.test; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import com.jme.bounding.BoundingBox; -import com.jme.bounding.BoundingSphere; -import com.jme.image.Texture.MagnificationFilter; -import com.jme.image.Texture.MinificationFilter; -import com.jme.image.Texture.WrapMode; -import com.jme.input.MouseInput; -import com.jme.math.Vector3f; -import com.jme.renderer.ColorRGBA; -import com.jme.scene.Line; -import com.jme.scene.SharedMesh; -import com.jme.scene.Spatial; -import com.jme.scene.Text; -import com.jme.scene.TriMesh; -import com.jme.scene.shape.Box; -import com.jme.scene.shape.Extrusion; -import com.jme.scene.shape.Sphere; -import com.jme.scene.state.TextureState; -import com.jme.util.TextureManager; -import com.jme.util.geom.BufferUtils; -import com.jmetest.physics.Utils; -import com.jmex.physics.DynamicPhysicsNode; -import com.jmex.physics.StaticPhysicsNode; -import com.jmex.physics.util.PhysicsPicker; -import com.jmex.physics.util.SimplePhysicsGame; - - -public class TestDomino extends SimplePhysicsGame { - protected void simpleInitGame() { - getPhysicsSpace().setAutoRestThreshold( 0.2f ); - setPhysicsSpeed( 4 ); - - Spatial floorVisual = new Box( "floor", new Vector3f(), 1000, 0.1f, 1000 ); - floorVisual.setModelBound( new BoundingBox() ); - floorVisual.updateModelBound(); - StaticPhysicsNode floor = getPhysicsSpace().createStaticNode(); - floor.attachChild( floorVisual ); - floor.generatePhysicsGeometry(); - floor.setLocalTranslation( new Vector3f( 0, -0.1f, 0 ) ); - rootNode.attachChild( floor ); - - final TextureState wallTextureState = display.getRenderer().createTextureState(); - wallTextureState.setTexture( TextureManager.loadTexture( jmetest.TestChooser.class.getResource( "data/texture/wall.jpg" ), - MinificationFilter.Trilinear, MagnificationFilter.Bilinear) ); - wallTextureState.getTexture().setScale( new Vector3f( 30, 30, 1 ) ); - wallTextureState.getTexture().setWrap( WrapMode.Repeat ); - floorVisual.setRenderState( wallTextureState ); - - TriMesh dominoBrickVisual[] = new TriMesh[4]; - for ( int i = 0; i < dominoBrickVisual.length; i++ ) { - dominoBrickVisual[i] = new Box( "brick", new Vector3f(), 1f, 2, 0.2f ); - dominoBrickVisual[i].setModelBound( new BoundingBox() ); - dominoBrickVisual[i].updateModelBound(); - dominoBrickVisual[i].lockMeshes(); - //color them blue, red, green, yellow, ... - Utils.color( dominoBrickVisual[i], new ColorRGBA( i&1, ( i & 2 ) >> 1, i==0?1:0, 1 ), 128 ); - dominoBrickVisual[i].updateRenderState(); - } - - List points = new ArrayList(); - points.add( new Vector3f( 0, 0, 0 ) ); - points.add( new Vector3f( 0, 0, 50 ) ); - points.add( new Vector3f( 50, 0, 100 ) ); - points.add( new Vector3f( 50, 0, 150 ) ); - points.add( new Vector3f( 0, 0, 175 ) ); - points.add( new Vector3f( -50, 0, 200 ) ); - points.add( new Vector3f( -30, 0, 250 ) ); - points.add( new Vector3f( 0, 0, 300 ) ); - points.add( new Vector3f( 0, 0, 300 ) ); - Line dot = new Line(); - dot.appendCircle( 0.3f, 0, 0, 1, false ); - Extrusion track = new Extrusion( "track" ); - Vector3f up = new Vector3f( 0, 1, 0 ); - track.updateGeometry( dot, points, 25, up ); - - Vector3f[] trackpoints = BufferUtils.getVector3Array( track.getVertexBuffer() ); - Vector3f last = null; - Vector3f dir = new Vector3f(); - // iterate over the extrusion points, taking every second vertice - for ( int i = 0; i < trackpoints.length; i += 2 ) { - Vector3f trackpoint = trackpoints[i]; - DynamicPhysicsNode dominoBrick = getPhysicsSpace().createDynamicNode(); - SharedMesh sharedMesh = new SharedMesh( "shared brick", dominoBrickVisual[i/2%dominoBrickVisual.length] ); - dominoBrick.attachChild( sharedMesh ); - dominoBrick.generatePhysicsGeometry(); - dominoBrick.getLocalTranslation().set( trackpoint ).addLocal( 0, 2, 0 ); - if ( last != null ) { - dir.set( last ).subtractLocal( trackpoint ); - dominoBrick.getLocalRotation().lookAt( dir, up ); - } - rootNode.attachChild( dominoBrick ); - dominoBrick.rest(); - last = trackpoint; - } - System.out.println( trackpoints.length / 2 + " domino bricks created" ); - - Sphere ballVisual = new Sphere( "ball", new Vector3f(), 10, 10, 2 ); - ballVisual.setModelBound( new BoundingSphere() ); - ballVisual.updateModelBound(); - DynamicPhysicsNode ball = getPhysicsSpace().createDynamicNode(); - ball.attachChild( ballVisual ); - ball.generatePhysicsGeometry(); - ball.setLocalTranslation( new Vector3f( 0, 3, -1.5f ) ); - rootNode.attachChild( ball ); - - MouseInput.get().setCursorVisible( true ); - new PhysicsPicker( input, rootNode, getPhysicsSpace() ); - - cam.setLocation( new Vector3f( 100, 100, -50 ) ); - cam.lookAt( new Vector3f( 0, 0, 50 ), new Vector3f( 0, 1, 0 ) ); - - Text label = Text.createDefaultTextLabel( "instructions", "Left mouse button to hold/drag stuff, " + - "right mouse button+WASD to move the camera." ); - label.setLocalTranslation( 0, 20, 0 ); - statNode.attachChild( label ); - } - - @Override - protected void simpleUpdate() { - cameraInputHandler.setEnabled( MouseInput.get().isButtonDown( 1 ) ); - } - - public static void main( String[] args ) { - Logger.getLogger( "" ).setLevel( Level.WARNING ); // to see the important stuff - // create a new thread to benefit from -Xss setting to increase stack size - new Thread() { - @Override - public void run() { - new TestDomino().start(); - } - }.start(); - } -} - -/* - * $Log: TestDomino.java,v $ - * Revision 1.5 2007/09/22 14:28:36 irrisor - * spongy contacts, improved material handling, center of mass correctly handled now, breakable joints, use odejava 0.3.1 - * - * Revision 1.4 2007/09/02 20:44:09 irrisor - * node picking, timer fix - * - * Revision 1.3 2007/08/28 12:19:37 irrisor - * renamed autodisable to autorest, added unrest method, set root logger to warning level instead of physics logger only - * - * Revision 1.2 2007/08/03 11:26:46 irrisor - * adapted to new logging (JUL) - * - * Revision 1.1 2007/06/16 14:17:01 irrisor - * Contacts got an 'applied' flag to avoid application but still generate events -> GHOST material working; - * New test with dominos, some optimizations concerning enabled nodes; physics speed can be adjusted in SimplePhysicsGame - * - */ -