diff options
author | Sven Gothel <[email protected]> | 2012-02-28 01:03:13 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-02-28 01:03:13 +0100 |
commit | f1571df02103fb48bcd4b72acc3fa44066fe7d1a (patch) | |
tree | 8c637b33c2cbcf858a1b955902a080dd92868f01 /src | |
parent | 57f79783da6668d88b89a1479ddf42013aa5cc2e (diff) |
Extract demos 'dualDepthPeeling' and 'tennis' w/ code and data. Skip www/*.7z from archive.
Extracting the demos reduces the footprint
of general demo data (especially for dualDepthPeeling's dragon.obj)
and also allows to run the demo as standalone (tennis).
Diffstat (limited to 'src')
-rw-r--r-- | src/demos/data/tennis/Stars.png (renamed from src/demos/data/images/Stars.png) | bin | 28532 -> 28532 bytes | |||
-rw-r--r-- | src/demos/data/tennis/TennisBottom.png (renamed from src/demos/data/images/TennisBottom.png) | bin | 9166 -> 9166 bytes | |||
-rw-r--r-- | src/demos/data/tennis/TennisEnDesk.png (renamed from src/demos/data/images/TennisEnDesk.png) | bin | 166 -> 166 bytes | |||
-rw-r--r-- | src/demos/data/tennis/TennisMyDesk.png (renamed from src/demos/data/images/TennisMyDesk.png) | bin | 166 -> 166 bytes | |||
-rw-r--r-- | src/demos/data/tennis/TennisTop.png (renamed from src/demos/data/images/TennisTop.png) | bin | 8660 -> 8660 bytes | |||
-rw-r--r-- | src/demos/tennis/Tennis.java | 10 |
6 files changed, 5 insertions, 5 deletions
diff --git a/src/demos/data/images/Stars.png b/src/demos/data/tennis/Stars.png Binary files differindex 49cec37..49cec37 100644 --- a/src/demos/data/images/Stars.png +++ b/src/demos/data/tennis/Stars.png diff --git a/src/demos/data/images/TennisBottom.png b/src/demos/data/tennis/TennisBottom.png Binary files differindex d712dd6..d712dd6 100644 --- a/src/demos/data/images/TennisBottom.png +++ b/src/demos/data/tennis/TennisBottom.png diff --git a/src/demos/data/images/TennisEnDesk.png b/src/demos/data/tennis/TennisEnDesk.png Binary files differindex d9c4306..d9c4306 100644 --- a/src/demos/data/images/TennisEnDesk.png +++ b/src/demos/data/tennis/TennisEnDesk.png diff --git a/src/demos/data/images/TennisMyDesk.png b/src/demos/data/tennis/TennisMyDesk.png Binary files differindex d4a3514..d4a3514 100644 --- a/src/demos/data/images/TennisMyDesk.png +++ b/src/demos/data/tennis/TennisMyDesk.png diff --git a/src/demos/data/images/TennisTop.png b/src/demos/data/tennis/TennisTop.png Binary files differindex c014744..c014744 100644 --- a/src/demos/data/images/TennisTop.png +++ b/src/demos/data/tennis/TennisTop.png diff --git a/src/demos/tennis/Tennis.java b/src/demos/tennis/Tennis.java index 2460f90..1eb1b6a 100644 --- a/src/demos/tennis/Tennis.java +++ b/src/demos/tennis/Tennis.java @@ -159,19 +159,19 @@ public class Tennis implements GLEventListener { //Load textures
try {
System.err.println("Loading texture...");
- texture[0] = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream("demos/data/images/TennisTop.png"),
+ texture[0] = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream("demos/data/tennis/TennisTop.png"),
false,
TextureIO.PNG);
- texture[1] = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream("demos/data/images/TennisBottom.png"),
+ texture[1] = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream("demos/data/tennis/TennisBottom.png"),
false,
TextureIO.PNG);
- texture[2] = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream("demos/data/images/TennisMyDesk.png"),
+ texture[2] = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream("demos/data/tennis/TennisMyDesk.png"),
false,
TextureIO.PNG);
- texture[3] = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream("demos/data/images/TennisEnDesk.png"),
+ texture[3] = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream("demos/data/tennis/TennisEnDesk.png"),
false,
TextureIO.PNG);
- texture[4] = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream("demos/data/images/Stars.png"),
+ texture[4] = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream("demos/data/tennis/Stars.png"),
false,
TextureIO.PNG);
System.err.println("Texture0 estimated memory size = " + texture[0].getEstimatedMemorySize());
|