aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authortaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-07-30 21:02:32 +0000
committertaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-07-30 21:02:32 +0000
commit62fc6aad00fcfb09b85cce87a50b30e6422afe21 (patch)
tree5446730621b49b9beb12a56bea644b2158d371da /data
parentc8ffb4adf132ba6cf4ed3ad08db9f9bfbe1d7280 (diff)
Use simplified geometry for collision detection
git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@196 84d2e878-0bd5-11dd-ad15-13eda11d74c5
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am2
-rw-r--r--data/models/lander-coll79
2 files changed, 80 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 4f5f4f7..1c3afd6 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/pipe
+ models/platform models/ceiling models/tiledfloor models/pipe models/lander-coll
shadersdir = $(datadir)/thrust3d/shaders
shaders_DATA = shaders/lighting.vert shaders/lighting.frag shaders/swirlytron.vert shaders/swirlytron.frag
diff --git a/data/models/lander-coll b/data/models/lander-coll
new file mode 100644
index 0000000..5523ad3
--- /dev/null
+++ b/data/models/lander-coll
@@ -0,0 +1,79 @@
+# source-material/models/lander-new-coll.obj
+
+QUADS
+ +0.000 +0.320 +0.284 0.000 0.000 +0.309 +0.951 +0.000
+ +0.000 +0.320 +0.384 0.000 0.000 +0.309 +0.951 +0.000
+ +0.188 +0.259 +0.384 0.000 0.000 +0.309 +0.951 +0.000
+ +0.188 +0.259 +0.284 0.000 0.000 +0.309 +0.951 +0.000
+ -0.304 +0.099 +0.284 0.000 0.000 -0.809 +0.588 +0.000
+ -0.304 +0.099 +0.384 0.000 0.000 -0.809 +0.588 +0.000
+ -0.188 +0.259 +0.384 0.000 0.000 -0.809 +0.588 +0.000
+ -0.188 +0.259 +0.284 0.000 0.000 -0.809 +0.588 +0.000
+ -0.188 -0.259 +0.284 0.000 0.000 -0.809 -0.588 +0.000
+ -0.188 -0.259 +0.384 0.000 0.000 -0.809 -0.588 +0.000
+ -0.304 -0.099 +0.384 0.000 0.000 -0.809 -0.588 +0.000
+ -0.304 -0.099 +0.284 0.000 0.000 -0.809 -0.588 +0.000
+ +0.188 -0.259 +0.284 0.000 0.000 +0.309 -0.951 +0.000
+ +0.188 -0.259 +0.384 0.000 0.000 +0.309 -0.951 +0.000
+ -0.000 -0.320 +0.384 0.000 0.000 +0.309 -0.951 +0.000
+ -0.000 -0.320 +0.284 0.000 0.000 +0.309 -0.951 +0.000
+ +0.304 +0.099 +0.284 0.000 0.000 +1.000 -0.000 +0.000
+ +0.304 +0.099 +0.384 0.000 0.000 +1.000 -0.000 +0.000
+ +0.304 -0.099 +0.384 0.000 0.000 +1.000 -0.000 +0.000
+ +0.304 -0.099 +0.284 0.000 0.000 +1.000 -0.000 +0.000
+
+TRIANGLES
+ +0.063 +0.194 +0.479 0.000 0.000 +0.052 +0.703 +0.709
+ +0.010 +0.233 +0.444 0.000 0.000 +0.052 +0.703 +0.709
+ -0.015 +0.183 +0.496 0.000 0.000 +0.052 +0.703 +0.709
+ -0.178 +0.042 +0.496 0.000 0.000 -0.508 +0.155 +0.847
+ -0.121 +0.000 +0.538 0.000 0.000 -0.508 +0.155 +0.847
+ -0.113 +0.082 +0.528 0.000 0.000 -0.508 +0.155 +0.847
+ +0.169 +0.071 +0.496 0.000 0.000 +0.602 +0.108 +0.791
+ +0.140 +0.000 +0.528 0.000 0.000 +0.602 +0.108 +0.791
+ +0.204 -0.000 +0.479 0.000 0.000 +0.602 +0.108 +0.791
+ -0.015 -0.183 +0.496 0.000 0.000 -0.183 -0.562 +0.807
+ -0.037 -0.115 +0.538 0.000 0.000 -0.183 -0.562 +0.807
+ -0.095 -0.157 +0.496 0.000 0.000 -0.183 -0.562 +0.807
+ +0.020 -0.063 +0.561 0.000 0.000 -0.067 -0.205 +0.976
+ -0.000 +0.000 +0.573 0.000 0.000 -0.067 -0.205 +0.976
+ -0.053 -0.039 +0.561 0.000 0.000 -0.067 -0.205 +0.976
+
+QUADS
+ +0.257 +0.339 +0.000 0.000 0.000 -0.000 +1.000 +0.000
+ +0.143 +0.339 +0.000 0.000 0.000 -0.000 +1.000 +0.000
+ +0.143 +0.339 +0.100 0.000 0.000 -0.000 +1.000 +0.000
+ +0.257 +0.339 +0.100 0.000 0.000 -0.000 +1.000 +0.000
+ +0.339 +0.143 +0.000 0.000 0.000 +1.000 +0.000 +0.000
+ +0.339 +0.257 +0.000 0.000 0.000 +1.000 +0.000 +0.000
+ +0.339 +0.257 +0.100 0.000 0.000 +1.000 +0.000 +0.000
+ +0.339 +0.143 +0.100 0.000 0.000 +1.000 +0.000 +0.000
+ -0.339 +0.257 +0.000 0.000 0.000 -1.000 +0.000 +0.000
+ -0.339 +0.143 +0.000 0.000 0.000 -1.000 +0.000 +0.000
+ -0.339 +0.143 +0.100 0.000 0.000 -1.000 +0.000 +0.000
+ -0.339 +0.257 +0.100 0.000 0.000 -1.000 +0.000 +0.000
+ -0.143 +0.339 +0.000 0.000 0.000 -0.000 +1.000 +0.000
+ -0.257 +0.339 +0.000 0.000 0.000 -0.000 +1.000 +0.000
+ -0.257 +0.339 +0.100 0.000 0.000 -0.000 +1.000 +0.000
+ -0.143 +0.339 +0.100 0.000 0.000 -0.000 +1.000 +0.000
+ -0.339 -0.143 +0.000 0.000 0.000 -1.000 +0.000 +0.000
+ -0.339 -0.257 +0.000 0.000 0.000 -1.000 +0.000 +0.000
+ -0.339 -0.257 +0.100 0.000 0.000 -1.000 +0.000 +0.000
+ -0.339 -0.143 +0.100 0.000 0.000 -1.000 +0.000 +0.000
+ -0.257 -0.339 +0.000 0.000 0.000 +0.000 -1.000 +0.000
+ -0.143 -0.339 +0.000 0.000 0.000 +0.000 -1.000 +0.000
+ -0.143 -0.339 +0.100 0.000 0.000 +0.000 -1.000 +0.000
+ -0.257 -0.339 +0.100 0.000 0.000 +0.000 -1.000 +0.000
+ +0.339 -0.257 +0.000 0.000 0.000 +1.000 +0.000 +0.000
+ +0.339 -0.143 +0.000 0.000 0.000 +1.000 +0.000 +0.000
+ +0.339 -0.143 +0.100 0.000 0.000 +1.000 +0.000 +0.000
+ +0.339 -0.257 +0.100 0.000 0.000 +1.000 +0.000 +0.000
+ +0.143 -0.339 +0.000 0.000 0.000 +0.000 -1.000 +0.000
+ +0.257 -0.339 +0.000 0.000 0.000 +0.000 -1.000 +0.000
+ +0.257 -0.339 +0.100 0.000 0.000 +0.000 -1.000 +0.000
+ +0.143 -0.339 +0.100 0.000 0.000 +0.000 -1.000 +0.000
+ +0.143 -0.339 +0.000 0.000 0.000 +0.000 -1.000 +0.000
+ +0.257 -0.339 +0.000 0.000 0.000 +0.000 -1.000 +0.000
+ +0.257 -0.339 +0.100 0.000 0.000 +0.000 -1.000 +0.000
+ +0.143 -0.339 +0.100 0.000 0.000 +0.000 -1.000 +0.000
+