Moved skybox textures into data folder

Added data jar generation to build.xml
Added texturesplatting demos(and data for it)

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@3710 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

diff --git a/build.xml b/build.xml
index 0d5b1d3..59609aa 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -181,6 +181,7 @@
                <jar jarfile="${jars}/jmetest-data-cursor.jar" basedir="${class}" compress="true" includes="**/jmetest/data/cursor/**" />
                <jar jarfile="${jars}/jmetest-data-images.jar" basedir="${class}" compress="true" includes="**/jmetest/data/images/**" />
                <jar jarfile="${jars}/jmetest-data-model.jar" basedir="${class}" compress="true" includes="**/jmetest/data/model/**" />
+               <jar jarfile="${jars}/jmetest-data-skybox1.jar" basedir="${class}" compress="true" includes="**/jmetest/data/skybox1/**" />
                <jar jarfile="${jars}/jmetest-data-sound.jar" basedir="${class}" compress="true" includes="**/jmetest/data/sound/**" />
                <jar jarfile="${jars}/jmetest-data-texture.jar" basedir="${class}" compress="true" includes="**/jmetest/data/texture/**" />
        </target>
@@ -190,6 +191,7 @@
                <signjar jar="${jars}/jmetest-data-cursor.jar" alias="jme" keystore="${webstart}/${keyStore}" storepass="${storepass}" />
                <signjar jar="${jars}/jmetest-data-images.jar" alias="jme" keystore="${webstart}/${keyStore}" storepass="${storepass}" />
                <signjar jar="${jars}/jmetest-data-model.jar" alias="jme" keystore="${webstart}/${keyStore}" storepass="${storepass}" />
+               <signjar jar="${jars}/jmetest-data-skybox1.jar" alias="jme" keystore="${webstart}/${keyStore}" storepass="${storepass}" />
                <signjar jar="${jars}/jmetest-data-sound.jar" alias="jme" keystore="${webstart}/${keyStore}" storepass="${storepass}" />
                <signjar jar="${jars}/jmetest-data-texture.jar" alias="jme" keystore="${webstart}/${keyStore}" storepass="${storepass}" />
        </target>

diff --git a/src/jmetest/effects/water/data/1.jpg b/src/jmetest/data/skybox1/1.jpg
similarity index 100%
rename from src/jmetest/effects/water/data/1.jpg
rename to src/jmetest/data/skybox1/1.jpg

diff --git a/src/jmetest/effects/water/data/2.jpg b/src/jmetest/data/skybox1/2.jpg
similarity index 100%
rename from src/jmetest/effects/water/data/2.jpg
rename to src/jmetest/data/skybox1/2.jpg

diff --git a/src/jmetest/effects/water/data/3.jpg b/src/jmetest/data/skybox1/3.jpg
similarity index 100%
rename from src/jmetest/effects/water/data/3.jpg
rename to src/jmetest/data/skybox1/3.jpg

diff --git a/src/jmetest/effects/water/data/4.jpg b/src/jmetest/data/skybox1/4.jpg
similarity index 100%
rename from src/jmetest/effects/water/data/4.jpg
rename to src/jmetest/data/skybox1/4.jpg

diff --git a/src/jmetest/effects/water/data/5.jpg b/src/jmetest/data/skybox1/5.jpg
similarity index 100%
rename from src/jmetest/effects/water/data/5.jpg
rename to src/jmetest/data/skybox1/5.jpg

diff --git a/src/jmetest/effects/water/data/6.jpg b/src/jmetest/data/skybox1/6.jpg
similarity index 100%
rename from src/jmetest/effects/water/data/6.jpg
rename to src/jmetest/data/skybox1/6.jpg

diff --git a/src/jmetest/data/texture/terrain/baserock.jpg b/src/jmetest/data/texture/terrain/baserock.jpg
new file mode 100755 (executable)
index 0000000..117de80
Binary files /dev/null and b/src/jmetest/data/texture/terrain/baserock.jpg differ

diff --git a/src/jmetest/data/texture/terrain/darkrock.jpg b/src/jmetest/data/texture/terrain/darkrock.jpg
new file mode 100755 (executable)
index 0000000..9ff2ac2
Binary files /dev/null and b/src/jmetest/data/texture/terrain/darkrock.jpg differ

diff --git a/src/jmetest/data/texture/terrain/darkrockalpha.png b/src/jmetest/data/texture/terrain/darkrockalpha.png
new file mode 100755 (executable)
index 0000000..a10d60f
Binary files /dev/null and b/src/jmetest/data/texture/terrain/darkrockalpha.png differ

diff --git a/src/jmetest/data/texture/terrain/deadalpha.png b/src/jmetest/data/texture/terrain/deadalpha.png
new file mode 100755 (executable)
index 0000000..4664844
Binary files /dev/null and b/src/jmetest/data/texture/terrain/deadalpha.png differ

diff --git a/src/jmetest/data/texture/terrain/deadgrass.jpg b/src/jmetest/data/texture/terrain/deadgrass.jpg
new file mode 100755 (executable)
index 0000000..7dbaabf
Binary files /dev/null and b/src/jmetest/data/texture/terrain/deadgrass.jpg differ

diff --git a/src/jmetest/data/texture/terrain/grassalpha.png b/src/jmetest/data/texture/terrain/grassalpha.png
new file mode 100755 (executable)
index 0000000..87a3b18
Binary files /dev/null and b/src/jmetest/data/texture/terrain/grassalpha.png differ

diff --git a/src/jmetest/data/texture/terrain/heights.raw b/src/jmetest/data/texture/terrain/heights.raw
new file mode 100755 (executable)
index 0000000..89a3be7
Binary files /dev/null and b/src/jmetest/data/texture/terrain/heights.raw differ

diff --git a/src/jmetest/data/texture/terrain/lightmap.jpg b/src/jmetest/data/texture/terrain/lightmap.jpg
new file mode 100755 (executable)
index 0000000..caf3625
Binary files /dev/null and b/src/jmetest/data/texture/terrain/lightmap.jpg differ

diff --git a/src/jmetest/data/texture/terrain/nicegrass.jpg b/src/jmetest/data/texture/terrain/nicegrass.jpg
new file mode 100755 (executable)
index 0000000..57d0318
Binary files /dev/null and b/src/jmetest/data/texture/terrain/nicegrass.jpg differ

diff --git a/src/jmetest/data/texture/terrain/road.jpg b/src/jmetest/data/texture/terrain/road.jpg
new file mode 100755 (executable)
index 0000000..21195e6
Binary files /dev/null and b/src/jmetest/data/texture/terrain/road.jpg differ

diff --git a/src/jmetest/data/texture/terrain/roadalpha.png b/src/jmetest/data/texture/terrain/roadalpha.png
new file mode 100755 (executable)
index 0000000..e1dacb5
Binary files /dev/null and b/src/jmetest/data/texture/terrain/roadalpha.png differ

diff --git a/src/jmetest/data/texture/terrain/terrainlod.jpg b/src/jmetest/data/texture/terrain/terrainlod.jpg
new file mode 100755 (executable)
index 0000000..dadab4c
Binary files /dev/null and b/src/jmetest/data/texture/terrain/terrainlod.jpg differ

diff --git a/src/jmetest/effects/water/TestProjectedWater.java b/src/jmetest/effects/water/TestProjectedWater.java
index c2d237a..13f9fbc 100755 (executable)
--- a/src/jmetest/effects/water/TestProjectedWater.java
+++ b/src/jmetest/effects/water/TestProjectedWater.java
@@ -172,7 +172,7 @@ public class TestProjectedWater extends SimplePassGame {
        private void buildSkyBox() {
                skybox = new Skybox( "skybox", 10, 10, 10 );
 
-               String dir = "jmetest/effects/water/data/";
+               String dir = "jmetest/data/skybox1/";
                Texture north = TextureManager.loadTexture(
                                TestProjectedWater.class.getClassLoader().getResource(
                                                dir + "1.jpg" ),

diff --git a/src/jmetest/effects/water/TestQuadWater.java b/src/jmetest/effects/water/TestQuadWater.java
index 9354624..6057320 100755 (executable)
--- a/src/jmetest/effects/water/TestQuadWater.java
+++ b/src/jmetest/effects/water/TestQuadWater.java
@@ -221,7 +221,7 @@ public class TestQuadWater extends SimplePassGame {
        private void buildSkyBox() {
                skybox = new Skybox( "skybox", 10, 10, 10 );
 
-               String dir = "jmetest/effects/water/data/";
+               String dir = "jmetest/data/skybox1/";
                Texture north = TextureManager.loadTexture(
                                TestQuadWater.class.getClassLoader().getResource(
                                                dir + "1.jpg" ),

diff --git a/src/jmetest/effects/water/TestSimpleQuadWater.java b/src/jmetest/effects/water/TestSimpleQuadWater.java
index e1413b3..189fdd1 100755 (executable)
--- a/src/jmetest/effects/water/TestSimpleQuadWater.java
+++ b/src/jmetest/effects/water/TestSimpleQuadWater.java
@@ -180,7 +180,7 @@ public class TestSimpleQuadWater extends SimplePassGame {
        private void buildSkyBox() {
                skybox = new Skybox( "skybox", 10, 10, 10 );
 
-               String dir = "jmetest/effects/water/data/";
+               String dir = "jmetest/data/skybox1/";
                Texture north = TextureManager.loadTexture(
                                TestSimpleQuadWater.class.getClassLoader().getResource(
                                                dir + "1.jpg" ),