aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authortaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-07-27 22:06:11 +0000
committertaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-07-27 22:06:11 +0000
commit1575bd1eac75e0967c8a6b2373bad975a8d1e1c6 (patch)
treece8bd58e01ed4c509164700dcde037f910d3bf15 /data
parentccb81a6c223072473e98552eda4f5cc2987aa918 (diff)
Modelling stuff
git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@183 84d2e878-0bd5-11dd-ad15-13eda11d74c5
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am2
-rw-r--r--data/models/pipe88
-rw-r--r--data/rooms/00-02-041
3 files changed, 90 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 9ea8369..4f5f4f7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
modelsdir = $(datadir)/thrust3d/models
models_DATA = models/floor models/lander models/randombox models/walle models/walln models/wallw models/walls \
- models/platform models/ceiling models/tiledfloor
+ models/platform models/ceiling models/tiledfloor models/pipe
shadersdir = $(datadir)/thrust3d/shaders
shaders_DATA = shaders/lighting.vert shaders/lighting.frag shaders/swirlytron.vert shaders/swirlytron.frag
diff --git a/data/models/pipe b/data/models/pipe
new file mode 100644
index 0000000..d3a6b69
--- /dev/null
+++ b/data/models/pipe
@@ -0,0 +1,88 @@
+# pipe.obj
+
+QUADS
+ +0.100 -0.000 +0.000
+ +0.092 +0.038 +0.000
+ +0.092 +0.038 +0.601
+ +0.100 -0.000 +0.601
+#
+ +0.100 -0.000 +0.000
+ +0.092 -0.038 +0.000
+ +0.092 -0.038 +0.601
+ +0.100 -0.000 +0.601
+#
+ +0.071 -0.071 +0.000
+ +0.092 -0.038 +0.000
+ +0.092 -0.038 +0.601
+ +0.071 -0.071 +0.601
+#
+ +0.038 -0.092 +0.000
+ +0.071 -0.071 +0.000
+ +0.071 -0.071 +0.601
+ +0.038 -0.092 +0.601
+#
+ +0.000 -0.100 +0.000
+ +0.038 -0.092 +0.000
+ +0.038 -0.092 +0.601
+ +0.000 -0.100 +0.601
+#
+ +0.000 -0.100 +0.000
+ -0.038 -0.092 +0.000
+ -0.038 -0.092 +0.601
+ +0.000 -0.100 +0.601
+#
+ -0.071 -0.071 +0.000
+ -0.038 -0.092 +0.000
+ -0.038 -0.092 +0.601
+ -0.071 -0.071 +0.601
+#
+ -0.092 -0.038 +0.000
+ -0.071 -0.071 +0.000
+ -0.071 -0.071 +0.601
+ -0.092 -0.038 +0.601
+#
+ -0.100 +0.000 +0.000
+ -0.092 -0.038 +0.000
+ -0.092 -0.038 +0.601
+ -0.100 +0.000 +0.601
+#
+ -0.100 +0.000 +0.000
+ -0.092 +0.038 +0.000
+ -0.092 +0.038 +0.601
+ -0.100 +0.000 +0.601
+#
+ -0.071 +0.071 +0.000
+ -0.092 +0.038 +0.000
+ -0.092 +0.038 +0.601
+ -0.071 +0.071 +0.601
+#
+ -0.071 +0.071 +0.000
+ -0.038 +0.092 +0.000
+ -0.038 +0.092 +0.601
+ -0.071 +0.071 +0.601
+#
+ +0.000 +0.100 +0.000
+ -0.038 +0.092 +0.000
+ -0.038 +0.092 +0.601
+ +0.000 +0.100 +0.601
+#
+ +0.038 +0.092 +0.000
+ +0.000 +0.100 +0.000
+ +0.000 +0.100 +0.601
+ +0.038 +0.092 +0.601
+#
+ +0.071 +0.071 +0.601
+ +0.038 +0.092 +0.000
+ +0.038 +0.092 +0.601
+ +0.000 +0.000 +0.000
+#
+ +0.071 +0.071 +0.601
+ +0.092 +0.038 +0.000
+ +0.092 +0.038 +0.601
+ +0.000 +0.000 +0.000
+#
+ +0.071 +0.071 +0.601
+ +0.092 +0.038 +0.000
+ +0.092 +0.038 +0.601
+ +0.000 +0.000 +0.000
+
diff --git a/data/rooms/00-02-04 b/data/rooms/00-02-04
index 23f74dd..3db5768 100644
--- a/data/rooms/00-02-04
+++ b/data/rooms/00-02-04
@@ -9,6 +9,7 @@ wallw -5.0 0.0 0.0
walle 5.0 0.0 0.0
ceiling 0.0 0.0 5.0
tiledfloor 0.0 0.0 -5.0
+pipe 1.0 1.0 -4.0
comment Ventilation shaft