Plumbing :)

git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@199 84d2e878-0bd5-11dd-ad15-13eda11d74c5

9 files changed, 159 insertions, 2 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 1c3afd6..f4ec188 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,7 @@
 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/pipe models/lander-coll
+		models/platform models/ceiling models/tiledfloor models/pipe models/lander-coll models/walle-hole \
+		models/pipe-horiz
 
 shadersdir = $(datadir)/thrust3d/shaders
 shaders_DATA = shaders/lighting.vert shaders/lighting.frag shaders/swirlytron.vert shaders/swirlytron.frag
diff --git a/data/models/pipe-horiz b/data/models/pipe-horiz
new file mode 100644
index 0000000..4e08368
--- /dev/null
+++ b/data/models/pipe-horiz
@@ -0,0 +1,72 @@
+# source-material/models/pipe-horiz.obj
+
+QUADS
+  +0.462   -5.000   -0.191         0.000    0.000       +0.924   +0.000   -0.383
+  +0.354   -5.000   -0.354         0.000    0.000       +0.707   +0.000   -0.707
+  +0.354   +5.000   -0.354         0.000    0.000       +0.707   +0.000   -0.707
+  +0.462   +5.000   -0.191         0.000    0.000       +0.924   +0.000   -0.383
+  +0.500   -5.000   +0.000         0.000    0.000       +1.000   +0.000   +0.000
+  +0.462   -5.000   -0.191         0.000    0.000       +0.924   +0.000   -0.383
+  +0.462   +5.000   -0.191         0.000    0.000       +0.924   +0.000   -0.383
+  +0.500   +5.000   -0.000         0.000    0.000       +1.000   +0.000   +0.000
+  +0.462   -5.000   +0.191         0.000    0.000       +0.924   +0.000   +0.383
+  +0.500   -5.000   +0.000         0.000    0.000       +1.000   +0.000   +0.000
+  +0.500   +5.000   -0.000         0.000    0.000       +1.000   +0.000   +0.000
+  +0.462   +5.000   +0.191         0.000    0.000       +0.924   +0.000   +0.383
+  +0.354   -5.000   +0.354         0.000    0.000       +0.707   +0.000   +0.707
+  +0.462   -5.000   +0.191         0.000    0.000       +0.924   +0.000   +0.383
+  +0.462   +5.000   +0.191         0.000    0.000       +0.924   +0.000   +0.383
+  +0.354   +5.000   +0.354         0.000    0.000       +0.707   +0.000   +0.707
+  +0.191   -5.000   +0.462         0.000    0.000       +0.383   +0.000   +0.924
+  +0.354   -5.000   +0.354         0.000    0.000       +0.707   +0.000   +0.707
+  +0.354   +5.000   +0.354         0.000    0.000       +0.707   +0.000   +0.707
+  +0.191   +5.000   +0.462         0.000    0.000       +0.383   +0.000   +0.924
+  +0.000   -5.000   +0.500         0.000    0.000       +0.000   +0.000   +1.000
+  +0.191   -5.000   +0.462         0.000    0.000       +0.383   +0.000   +0.924
+  +0.191   +5.000   +0.462         0.000    0.000       +0.383   +0.000   +0.924
+  +0.000   +5.000   +0.500         0.000    0.000       +0.000   +0.000   +1.000
+  -0.191   -5.000   +0.462         0.000    0.000       -0.383   +0.000   +0.924
+  +0.000   -5.000   +0.500         0.000    0.000       +0.000   +0.000   +1.000
+  +0.000   +5.000   +0.500         0.000    0.000       +0.000   +0.000   +1.000
+  -0.191   +5.000   +0.462         0.000    0.000       -0.383   +0.000   +0.924
+  -0.354   -5.000   +0.354         0.000    0.000       -0.707   +0.000   +0.707
+  -0.191   -5.000   +0.462         0.000    0.000       -0.383   +0.000   +0.924
+  -0.191   +5.000   +0.462         0.000    0.000       -0.383   +0.000   +0.924
+  -0.354   +5.000   +0.354         0.000    0.000       -0.707   +0.000   +0.707
+  -0.462   -5.000   +0.191         0.000    0.000       -0.924   +0.000   +0.383
+  -0.354   -5.000   +0.354         0.000    0.000       -0.707   +0.000   +0.707
+  -0.354   +5.000   +0.354         0.000    0.000       -0.707   +0.000   +0.707
+  -0.462   +5.000   +0.191         0.000    0.000       -0.924   +0.000   +0.383
+  -0.500   -5.000   -0.000         0.000    0.000       -1.000   +0.000   +0.000
+  -0.462   -5.000   +0.191         0.000    0.000       -0.924   +0.000   +0.383
+  -0.462   +5.000   +0.191         0.000    0.000       -0.924   +0.000   +0.383
+  -0.500   +5.000   -0.000         0.000    0.000       -1.000   +0.000   +0.000
+  -0.462   -5.000   -0.191         0.000    0.000       -0.924   +0.000   -0.383
+  -0.500   -5.000   -0.000         0.000    0.000       -1.000   +0.000   +0.000
+  -0.500   +5.000   -0.000         0.000    0.000       -1.000   +0.000   +0.000
+  -0.462   +5.000   -0.191         0.000    0.000       -0.924   +0.000   -0.383
+  -0.354   -5.000   -0.354         0.000    0.000       -0.707   +0.000   -0.707
+  -0.462   -5.000   -0.191         0.000    0.000       -0.924   +0.000   -0.383
+  -0.462   +5.000   -0.191         0.000    0.000       -0.924   +0.000   -0.383
+  -0.354   +5.000   -0.354         0.000    0.000       -0.707   +0.000   -0.707
+  -0.191   -5.000   -0.462         0.000    0.000       -0.383   +0.000   -0.924
+  -0.354   -5.000   -0.354         0.000    0.000       -0.707   +0.000   -0.707
+  -0.354   +5.000   -0.354         0.000    0.000       -0.707   +0.000   -0.707
+  -0.191   +5.000   -0.462         0.000    0.000       -0.383   +0.000   -0.924
+  +0.000   -5.000   -0.500         0.000    0.000       +0.000   +0.000   -1.000
+  -0.191   -5.000   -0.462         0.000    0.000       -0.383   +0.000   -0.924
+  -0.191   +5.000   -0.462         0.000    0.000       -0.383   +0.000   -0.924
+  +0.000   +5.000   -0.500         0.000    0.000       +0.000   +0.000   -1.000
+  +0.191   -5.000   -0.462         0.000    0.000       +0.383   +0.000   -0.924
+  +0.000   -5.000   -0.500         0.000    0.000       +0.000   +0.000   -1.000
+  +0.000   +5.000   -0.500         0.000    0.000       +0.000   +0.000   -1.000
+  +0.191   +5.000   -0.462         0.000    0.000       +0.383   +0.000   -0.924
+  +0.354   -5.000   -0.354         0.000    0.000       +0.707   +0.000   -0.707
+  +0.191   -5.000   -0.462         0.000    0.000       +0.383   +0.000   -0.924
+  +0.191   +5.000   -0.462         0.000    0.000       +0.383   +0.000   -0.924
+  +0.354   +5.000   -0.354         0.000    0.000       +0.707   +0.000   -0.707
+  +0.354   -5.000   -0.354         0.000    0.000       +0.707   +0.000   -0.707
+  +0.191   -5.000   -0.462         0.000    0.000       +0.383   +0.000   -0.924
+  +0.191   +5.000   -0.462         0.000    0.000       +0.383   +0.000   -0.924
+  +0.354   +5.000   -0.354         0.000    0.000       +0.707   +0.000   -0.707
+
diff --git a/data/models/walle-hole b/data/models/walle-hole
new file mode 100644
index 0000000..d8e0eae
--- /dev/null
+++ b/data/models/walle-hole
@@ -0,0 +1,69 @@
+# source-material/models/walle-hole.obj
+
+QUADS
+  -0.000   -2.500   +5.000         1.000    0.250       -1.000   -0.000   -0.000
+  -0.000   -2.500   +2.500         0.750    0.250       -1.000   -0.000   -0.000
+  +0.000   -5.000   +2.500         0.750    0.000       -1.000   -0.000   -0.000
+  -0.000   -5.000   +5.000         1.000    0.000       -1.000   -0.000   -0.000
+  -0.000   +0.000   +5.000         1.000    0.500       -1.000   -0.000   -0.000
+  -0.000   +0.000   +2.500         0.750    0.500       -1.000   -0.000   -0.000
+  -0.000   -2.500   +2.500         0.750    0.250       -1.000   -0.000   -0.000
+  -0.000   -2.500   +5.000         1.000    0.250       -1.000   -0.000   -0.000
+  -0.000   -2.500   +2.500         0.750    0.250       -1.000   -0.000   -0.000
+  -0.000   -2.500   +0.000         0.500    0.250       -1.000   -0.000   -0.000
+  -0.000   -5.000   +0.000         0.500    0.000       -1.000   -0.000   -0.000
+  +0.000   -5.000   +2.500         0.750    0.000       -1.000   -0.000   -0.000
+  -0.000   +0.000   +2.500         0.750    0.500       -1.000   -0.000   -0.000
+  -0.000   +0.000   +0.000         0.500    0.500       -1.000   -0.000   -0.000
+  -0.000   -2.500   +0.000         0.500    0.250       -1.000   -0.000   -0.000
+  -0.000   -2.500   +2.500         0.750    0.250       -1.000   -0.000   -0.000
+  -0.000   +2.500   +5.000         1.000    0.750       -1.000   -0.000   -0.000
+  -0.000   +2.500   +2.500         0.750    0.750       -1.000   -0.000   -0.000
+  -0.000   +0.000   +2.500         0.750    0.500       -1.000   -0.000   -0.000
+  -0.000   +0.000   +5.000         1.000    0.500       -1.000   -0.000   -0.000
+  -0.000   +5.000   +5.000         1.000    1.000       -1.000   -0.000   -0.000
+  -0.000   +5.000   +2.500         0.750    1.000       -1.000   -0.000   -0.000
+  -0.000   +2.500   +2.500         0.750    0.750       -1.000   -0.000   -0.000
+  -0.000   +2.500   +5.000         1.000    0.750       -1.000   -0.000   -0.000
+  -0.000   +5.000   +2.500         0.750    1.000       -1.000   -0.000   -0.000
+  -0.000   +5.000   -0.000         0.500    1.000       -1.000   -0.000   -0.000
+  -0.000   +2.500   -0.000         0.500    0.750       -1.000   -0.000   -0.000
+  -0.000   +2.500   +2.500         0.750    0.750       -1.000   -0.000   -0.000
+  -0.000   -2.500   +0.000         0.500    0.250       -1.000   -0.000   -0.000
+  +0.000   -2.500   -2.500         0.250    0.250       -1.000   -0.000   -0.000
+  +0.000   -5.000   -2.500         0.250    0.000       -1.000   -0.000   -0.000
+  -0.000   -5.000   +0.000         0.500    0.000       -1.000   -0.000   -0.000
+  -0.000   +0.000   +0.000         0.500    0.500       -1.000   -0.000   -0.000
+  +0.000   -0.000   -2.500         0.250    0.500       -1.000   -0.000   -0.000
+  +0.000   -2.500   -2.500         0.250    0.250       -1.000   -0.000   -0.000
+  -0.000   -2.500   +0.000         0.500    0.250       -1.000   -0.000   -0.000
+  +0.000   -2.500   -2.500         0.250    0.250       -1.000   -0.000   -0.000
+  +0.000   -2.500   -5.000         0.000    0.250       -1.000   -0.000   -0.000
+  +0.000   -5.000   -5.000         0.000    0.000       -1.000   -0.000   -0.000
+  +0.000   -5.000   -2.500         0.250    0.000       -1.000   -0.000   -0.000
+  +0.000   -0.000   -2.500         0.250    0.500       -1.000   -0.000   -0.000
+  +0.000   -0.000   -5.000         0.000    0.500       -1.000   -0.000   -0.000
+  +0.000   -2.500   -5.000         0.000    0.250       -1.000   -0.000   -0.000
+  +0.000   -2.500   -2.500         0.250    0.250       -1.000   -0.000   -0.000
+  -0.000   +2.500   -0.000         0.500    0.750       -1.000   -0.000   -0.000
+  +0.000   +2.500   -2.500         0.250    0.750       -1.000   -0.000   -0.000
+  +0.000   -0.000   -2.500         0.250    0.500       -1.000   -0.000   -0.000
+  -0.000   +0.000   +0.000         0.500    0.500       -1.000   -0.000   -0.000
+  -0.000   +5.000   -0.000         0.500    1.000       -1.000   -0.000   -0.000
+  -0.000   +5.000   -2.500         0.250    1.000       -1.000   -0.000   -0.000
+  +0.000   +2.500   -2.500         0.250    0.750       -1.000   -0.000   -0.000
+  -0.000   +2.500   -0.000         0.500    0.750       -1.000   -0.000   -0.000
+  +0.000   +2.500   -2.500         0.250    0.750       -1.000   -0.000   -0.000
+  +0.000   +2.500   -5.000         0.000    0.750       -1.000   -0.000   -0.000
+  +0.000   -0.000   -5.000         0.000    0.500       -1.000   -0.000   -0.000
+  +0.000   -0.000   -2.500         0.250    0.500       -1.000   -0.000   -0.000
+  -0.000   +5.000   -2.500         0.250    1.000       -1.000   -0.000   -0.000
+  +0.000   +5.000   -5.000         0.000    1.000       -1.000   -0.000   -0.000
+  +0.000   +2.500   -5.000         0.000    0.750       -1.000   -0.000   -0.000
+  +0.000   +2.500   -2.500         0.250    0.750       -1.000   -0.000   -0.000
+  -0.000   +5.000   -2.500         0.250    1.000       -1.000   -0.000   -0.000
+  +0.000   +5.000   -5.000         0.000    1.000       -1.000   -0.000   -0.000
+  +0.000   +2.500   -5.000         0.000    0.750       -1.000   -0.000   -0.000
+  +0.000   +2.500   -2.500         0.250    0.750       -1.000   -0.000   -0.000
+texture tiledwall
+
diff --git a/data/rooms/00-00-01 b/data/rooms/00-00-01
index 359e16a..b3b8c9c 100644
--- a/data/rooms/00-00-01
+++ b/data/rooms/00-00-01
@@ -8,5 +8,7 @@ walle      5.0   0.0    0.0
 walln      0.0   5.0    0.0
 walls      0.0  -5.0    0.0
 
+pipe-horiz -3.5  0.0    0.0
+
 comment Ventilation shaft
 
diff --git a/data/rooms/00-00-02 b/data/rooms/00-00-02
index df1b45e..97a6b51 100644
--- a/data/rooms/00-00-02
+++ b/data/rooms/00-00-02
@@ -8,5 +8,7 @@ walle      5.0   0.0    0.0
 walln      0.0   5.0    0.0
 walls      0.0  -5.0    0.0
 
+pipe-horiz  3.5  0.0    0.0
+
 comment Ventilation shaft
 
diff --git a/data/rooms/00-00-03 b/data/rooms/00-00-03
index 845b22d..af2f925 100644
--- a/data/rooms/00-00-03
+++ b/data/rooms/00-00-03
@@ -4,9 +4,11 @@ connected 00 00 02
 connected 00 00 04
 
 wallw     -5.0   0.0    0.0
-walle      5.0   0.0    0.0
+walle-hole 5.0   0.0    0.0
 walln      0.0   5.0    0.0
 walls      0.0  -5.0    0.0
 
+pipe-horiz 0.5   0.0    0.0
+
 comment Ventilation shaft
 
diff --git a/data/rooms/00-00-04 b/data/rooms/00-00-04
index d733b3b..431ff82 100644
--- a/data/rooms/00-00-04
+++ b/data/rooms/00-00-04
@@ -8,5 +8,8 @@ walle      5.0   0.0    0.0
 walls      0.0  -5.0    0.0
 ceiling    0.0   0.0    5.0
 
+pipe-horiz -3.5  0.0    4.2
+pipe-horiz  3.5  0.0    0.0
+
 comment Top of ventilation shaft
 
diff --git a/data/rooms/00-01-04 b/data/rooms/00-01-04
index 39a06f7..54455f0 100644
--- a/data/rooms/00-01-04
+++ b/data/rooms/00-01-04
@@ -8,5 +8,8 @@ walle      5.0   0.0    0.0
 ceiling    0.0   0.0    5.0
 tiledfloor 0.0   0.0   -5.0
 
+pipe-horiz -3.5  0.0    4.2
+pipe-horiz  3.5  0.0    0.0
+
 comment Ventilation shaft
 
diff --git a/data/rooms/00-02-04 b/data/rooms/00-02-04
index ccfa00a..34884bf 100644
--- a/data/rooms/00-02-04
+++ b/data/rooms/00-02-04
@@ -14,5 +14,8 @@ pipe      -4.5  -1.0   -5.0
 pipe      -4.5   1.0   -5.0
 pipe       4.5   3.0   -5.0
 
+pipe-horiz -3.5  0.0    4.2
+pipe-horiz  3.5  0.0    0.0
+
 comment Ventilation shaft