diff options
| author | taw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5> | 2008-06-07 17:44:24 +0000 |
|---|---|---|
| committer | taw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5> | 2008-06-07 17:44:24 +0000 |
| commit | a8105e663793e0e9bab7aa5f8eb1d805e7d61077 (patch) | |
| tree | 3260281946524569ac893091713f1948278ce317 /data | |
| parent | a1e4e5d54995e580524c4c690487bb30fe7ed692 (diff) | |
Add concrete texture
git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@82 84d2e878-0bd5-11dd-ad15-13eda11d74c5
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/models/floor | 2 | ||||
| -rw-r--r-- | data/textures/concrete.png | bin | 0 -> 751260 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 019eba4..73a1d01 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,7 +6,7 @@ shadersdir = $(datadir)/thrust3d/shaders shaders_DATA = shaders/lighting.vert shaders/lighting.frag shaders/swirlytron.vert shaders/swirlytron.frag texturesdir = $(datadir)/thrust3d/textures -textures_DATA = textures/floor1.png textures/tiledwall.png textures/radioactive.png textures/fuel.png textures/font.png +textures_DATA = textures/floor1.png textures/tiledwall.png textures/radioactive.png textures/fuel.png textures/font.png textures/concrete.png roomsdir = $(datadir)/thrust3d/rooms rooms_DATA = rooms/00-00-00 rooms/00-00-01 rooms/00-00-02 rooms/00-00-03 rooms/00-00-04 rooms/00-01-04 rooms/00-02-04 diff --git a/data/models/floor b/data/models/floor index 3df1a6f..0a89d37 100644 --- a/data/models/floor +++ b/data/models/floor @@ -1,7 +1,7 @@ # Floor QUADS -texture floor1 +texture concrete -5.0 -5.0 0.0 0.0 0.0 5.0 -5.0 0.0 1.0 0.0 5.0 5.0 0.0 1.0 1.0 diff --git a/data/textures/concrete.png b/data/textures/concrete.png Binary files differnew file mode 100644 index 0000000..f67ec4f --- /dev/null +++ b/data/textures/concrete.png |
