diff --git a/engine/lib/niftygui/nifty-1.3-SNAPSHOT.jar b/engine/lib/niftygui/nifty-1.3-SNAPSHOT.jar index eb628a872..59c2fb117 100644 Binary files a/engine/lib/niftygui/nifty-1.3-SNAPSHOT.jar and b/engine/lib/niftygui/nifty-1.3-SNAPSHOT.jar differ diff --git a/engine/lib/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar b/engine/lib/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar index 391f581a7..f80b995b4 100644 Binary files a/engine/lib/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar and b/engine/lib/niftygui/nifty-default-controls-1.3-SNAPSHOT.jar differ diff --git a/engine/lib/niftygui/nifty-examples-1.3-SNAPSHOT.jar b/engine/lib/niftygui/nifty-examples-1.3-SNAPSHOT.jar index b510bac5b..a75bdcf2e 100644 Binary files a/engine/lib/niftygui/nifty-examples-1.3-SNAPSHOT.jar and b/engine/lib/niftygui/nifty-examples-1.3-SNAPSHOT.jar differ diff --git a/engine/lib/niftygui/nifty-style-black-1.3-SNAPSHOT.jar b/engine/lib/niftygui/nifty-style-black-1.3-SNAPSHOT.jar index 47e3598ba..25a035757 100644 Binary files a/engine/lib/niftygui/nifty-style-black-1.3-SNAPSHOT.jar and b/engine/lib/niftygui/nifty-style-black-1.3-SNAPSHOT.jar differ diff --git a/engine/src/test-data/Textures/Terrain/Rocky/Rocky.j3m b/engine/src/test-data/Textures/Terrain/Rocky/Rocky.j3m index cc80d3af7..0d228f9c7 100644 --- a/engine/src/test-data/Textures/Terrain/Rocky/Rocky.j3m +++ b/engine/src/test-data/Textures/Terrain/Rocky/Rocky.j3m @@ -1,7 +1,7 @@ Material Rock : Common/MatDefs/Light/Lighting.j3md { MaterialParameters { - Shininess: 100000.0 - DiffuseMap : Textures/Terrain/Rocky/RockyTexture.png - NormalMap : Textures/Terrain/Rocky/RockyNormals.png + Shininess: 32.0 + DiffuseMap : Textures/Terrain/Rocky/RockyTexture.jpg + NormalMap : Textures/Terrain/Rocky/RockyNormals.jpg } } \ No newline at end of file diff --git a/engine/src/test-data/Textures/Terrain/Rocky/RockyNormals.jpg b/engine/src/test-data/Textures/Terrain/Rocky/RockyNormals.jpg new file mode 100644 index 000000000..8351262de Binary files /dev/null and b/engine/src/test-data/Textures/Terrain/Rocky/RockyNormals.jpg differ diff --git a/engine/src/test-data/Textures/Terrain/Rocky/RockyTexture.jpg b/engine/src/test-data/Textures/Terrain/Rocky/RockyTexture.jpg new file mode 100644 index 000000000..d8e5a4efb Binary files /dev/null and b/engine/src/test-data/Textures/Terrain/Rocky/RockyTexture.jpg differ diff --git a/engine/src/test-data/Textures/Terrain/splat/grass_normal.jpg b/engine/src/test-data/Textures/Terrain/splat/grass_normal.jpg new file mode 100644 index 000000000..12de38085 Binary files /dev/null and b/engine/src/test-data/Textures/Terrain/splat/grass_normal.jpg differ diff --git a/engine/src/test-data/Textures/Terrain/splat/grass_normal.png b/engine/src/test-data/Textures/Terrain/splat/grass_normal.png deleted file mode 100644 index 9bde934c8..000000000 Binary files a/engine/src/test-data/Textures/Terrain/splat/grass_normal.png and /dev/null differ diff --git a/engine/src/test/jme3test/audio/TestMusicPlayer.java b/engine/src/test/jme3test/audio/TestMusicPlayer.java index d183874c4..a957e0095 100644 --- a/engine/src/test/jme3test/audio/TestMusicPlayer.java +++ b/engine/src/test/jme3test/audio/TestMusicPlayer.java @@ -180,7 +180,7 @@ public class TestMusicPlayer extends javax.swing.JFrame { final File selected = chooser.getSelectedFile(); OGGLoader loader = new OGGLoader(); - AudioKey key = new AudioKey(selected.getName(), true); + AudioKey key = new AudioKey(selected.getName(), true, true); try{ musicData = (AudioData) loader.load(new AssetInfo(null, key) { @Override diff --git a/engine/src/test/jme3test/awt/TestSafeCanvas.java b/engine/src/test/jme3test/awt/TestSafeCanvas.java index caba888c7..bfb95ee6d 100644 --- a/engine/src/test/jme3test/awt/TestSafeCanvas.java +++ b/engine/src/test/jme3test/awt/TestSafeCanvas.java @@ -23,12 +23,13 @@ public class TestSafeCanvas extends SimpleApplication { app.setPauseOnLostFocus(false); app.setSettings(settings); app.createCanvas(); + app.startCanvas(true); JmeCanvasContext context = (JmeCanvasContext) app.getContext(); Canvas canvas = context.getCanvas(); canvas.setSize(settings.getWidth(), settings.getHeight()); - app.startCanvas(true); + Thread.sleep(3000); diff --git a/engine/src/test/jme3test/network/TestSerialization.java b/engine/src/test/jme3test/network/TestSerialization.java index 36e0076f4..b4b061bda 100644 --- a/engine/src/test/jme3test/network/TestSerialization.java +++ b/engine/src/test/jme3test/network/TestSerialization.java @@ -32,10 +32,13 @@ package jme3test.network; -import com.jme3.network.connection.Client; -import com.jme3.network.connection.Server; -import com.jme3.network.events.MessageAdapter; -import com.jme3.network.message.Message; +import com.jme3.network.AbstractMessage; +import com.jme3.network.Client; +import com.jme3.network.HostedConnection; +import com.jme3.network.Message; +import com.jme3.network.MessageListener; +import com.jme3.network.Network; +import com.jme3.network.Server; import com.jme3.network.serializing.Serializable; import com.jme3.network.serializing.Serializer; import java.io.IOException; @@ -46,7 +49,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class TestSerialization extends MessageAdapter { +public class TestSerialization implements MessageListener { @Serializable public static class SomeObject { @@ -64,6 +67,7 @@ public class TestSerialization extends MessageAdapter { return val; } + @Override public String toString(){ return "SomeObject[val="+val+"]"; } @@ -76,7 +80,7 @@ public class TestSerialization extends MessageAdapter { } @Serializable - public static class TestSerializationMessage extends Message { + public static class TestSerializationMessage extends AbstractMessage { boolean z; byte b; @@ -128,9 +132,8 @@ public class TestSerialization extends MessageAdapter { } } - @Override - public void messageReceived(Message msg){ - TestSerializationMessage cm = (TestSerializationMessage) msg; + public void messageReceived(HostedConnection source, Message m) { + TestSerializationMessage cm = (TestSerializationMessage) m; System.out.println(cm.z); System.out.println(cm.b); System.out.println(cm.c); @@ -151,16 +154,16 @@ public class TestSerialization extends MessageAdapter { Serializer.registerClass(SomeObject.class); Serializer.registerClass(TestSerializationMessage.class); - Server server = new Server(5110, 5110); + Server server = Network.createServer( 5110 ); server.start(); - Client client = new Client("localhost", 5110, 5110); + Client client = Network.connectToServer( "localhost", 5110 ); client.start(); - Thread.sleep(100); - server.addMessageListener(new TestSerialization(), TestSerializationMessage.class); client.send(new TestSerializationMessage(true)); + + Thread.sleep(10000); } }