From 05a5525ea60ebd76e444828f9d840d8d1a24d7ef Mon Sep 17 00:00:00 2001 From: taw27 Date: Thu, 7 Aug 2008 00:07:35 +0000 Subject: Tidy up loose ends git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@228 84d2e878-0bd5-11dd-ad15-13eda11d74c5 --- data/Makefile.am | 2 +- data/models/ceiling | 1 + data/models/floor | 10 ---------- data/models/tiledfloor | 1 + 4 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 data/models/floor diff --git a/data/Makefile.am b/data/Makefile.am index fa68b83..31ffa94 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,5 @@ modelsdir = $(datadir)/thrust3d/models -models_DATA = models/floor models/lander models/randombox models/walle models/walln models/wallw models/walls \ +models_DATA = models/lander models/randombox models/walle models/walln models/wallw models/walls \ models/platform models/ceiling models/tiledfloor models/pipe models/lander-coll models/walle-hole \ models/pipe-horiz diff --git a/data/models/ceiling b/data/models/ceiling index 339fd26..dfba7f7 100644 --- a/data/models/ceiling +++ b/data/models/ceiling @@ -6,4 +6,5 @@ texture tiledwall 5.0 -5.0 0.0 0.0 1.0 -5.0 -5.0 0.0 0.0 0.0 -5.0 5.0 0.0 1.0 0.0 +shiny 80.0 diff --git a/data/models/floor b/data/models/floor deleted file mode 100644 index 0a89d37..0000000 --- a/data/models/floor +++ /dev/null @@ -1,10 +0,0 @@ -# Floor - -QUADS -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 --5.0 5.0 0.0 0.0 1.0 -subdivide 10 10 - diff --git a/data/models/tiledfloor b/data/models/tiledfloor index 4887a83..ba48c22 100644 --- a/data/models/tiledfloor +++ b/data/models/tiledfloor @@ -7,4 +7,5 @@ texture tiledwall 5.0 5.0 0.0 1.0 1.0 -5.0 5.0 0.0 0.0 1.0 subdivide 10 10 +shiny 80.0 -- cgit v1.2.3