From ecfebe3c17e8f9b673b6fdc2b9b417ece7210f00 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 1 Feb 2021 22:38:48 +0100 Subject: [PATCH] Revert "Correct door model dimensions (#2804)" This introduces z-fighting so we'll just undo it. closes #2812 This reverts commit 3fdd5cdb5fb772d84618e57b346f6ccbf9380d57. --- mods/doors/models/door_a.obj | 54 ++++++++++++++--------------------- mods/doors/models/door_a2.obj | 18 ++++++------ mods/doors/models/door_b.obj | 16 +++++------ mods/doors/models/door_b2.obj | 16 +++++------ 4 files changed, 47 insertions(+), 57 deletions(-) diff --git a/mods/doors/models/door_a.obj b/mods/doors/models/door_a.obj index cb2241ed..7948f2f3 100644 --- a/mods/doors/models/door_a.obj +++ b/mods/doors/models/door_a.obj @@ -1,50 +1,40 @@ -# Blender v2.79 (sub 0) OBJ File: '' +# Blender v2.76 (sub 0) OBJ File: 'door_a.blend' # www.blender.org mtllib door_a.mtl o door_a -v 0.500000 1.500000 -0.500000 -v 0.500000 1.500000 -0.375000 -v 0.500000 -0.500000 -0.375000 -v 0.500000 -0.500000 -0.500000 -v -0.500000 1.500000 -0.375000 -v -0.500000 -0.500000 -0.375000 -v -0.500000 1.500000 -0.500000 -v -0.500000 -0.500000 -0.500000 +v 0.499000 -0.499000 -0.499000 +v 0.499000 1.499000 -0.499000 +v 0.499000 -0.499000 -0.375000 +v 0.499000 1.499000 -0.375000 +v -0.499000 -0.499000 -0.499000 +v -0.499000 1.499000 -0.499000 +v -0.499000 -0.499000 -0.375000 +v -0.499000 1.499000 -0.375000 vt 0.842105 1.000000 vt 0.894737 1.000000 vt 0.894737 0.000000 vt 0.842105 0.000000 vt 0.421053 1.000000 -vt 0.842105 1.000000 -vt 0.842105 0.000000 vt 0.421053 0.000000 -vt 0.894737 1.000000 vt 0.947368 1.000000 vt 0.947368 0.000000 -vt 0.894737 0.000000 vt 0.000000 1.000000 -vt 0.421053 1.000000 -vt 0.421053 0.000000 vt 0.000000 0.000000 vt 1.000000 0.500000 vt 0.947368 0.500000 -vt 0.947368 1.000000 vt 1.000000 1.000000 vt 1.000000 0.000000 -vt 0.947368 0.000000 -vt 0.947368 0.500000 -vt 1.000000 0.500000 -vn 1.0000 0.0000 0.0000 -vn 0.0000 -0.0000 1.0000 -vn -1.0000 0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn 0.0000 -1.0000 0.0000 -vn 0.0000 1.0000 0.0000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 usemtl None -s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 2/5/2 5/6/2 6/7/2 3/8/2 -f 5/9/3 7/10/3 8/11/3 6/12/3 -f 7/13/4 1/14/4 4/15/4 8/16/4 -f 4/17/5 3/18/5 6/19/5 8/20/5 -f 7/21/6 5/22/6 2/23/6 1/24/6 +s off +f 2/1/1 4/2/1 3/3/1 1/4/1 +f 4/5/2 8/1/2 7/4/2 3/6/2 +f 8/2/3 6/7/3 5/8/3 7/3/3 +f 6/9/4 2/5/4 1/6/4 5/10/4 +f 1/11/5 3/12/5 7/7/5 5/13/5 +f 6/14/6 8/8/6 4/12/6 2/11/6 diff --git a/mods/doors/models/door_a2.obj b/mods/doors/models/door_a2.obj index dee9f552..3bedc202 100644 --- a/mods/doors/models/door_a2.obj +++ b/mods/doors/models/door_a2.obj @@ -2,14 +2,14 @@ # www.blender.org mtllib door_a2.mtl o door_a2 -v -0.500000 1.500000 -0.500000 -v -0.500000 -0.500000 -0.500000 -v -0.500000 -0.500000 -0.375000 -v -0.500000 1.500000 -0.375000 -v 0.500000 -0.500000 -0.375000 -v 0.500000 1.500000 -0.375000 -v 0.500000 -0.500000 -0.500000 -v 0.500000 1.500000 -0.500000 +v -0.499000 1.499000 -0.499000 +v -0.499000 -0.499000 -0.499000 +v -0.499000 -0.499000 -0.375000 +v -0.499000 1.499000 -0.375000 +v 0.499000 -0.499000 -0.375000 +v 0.499000 1.499000 -0.375000 +v 0.499000 -0.499000 -0.499000 +v 0.499000 1.499000 -0.499000 vt 0.894737 1.000000 vt 0.894737 0.000000 vt 0.842105 0.000000 @@ -34,7 +34,7 @@ vt 1.000000 1.000000 vt 1.000000 0.500000 vt 0.947368 0.500000 vt 0.947368 1.000000 -vn -1.0000 0.0000 0.0000 +vn -1.0000 -0.0000 0.0000 vn 0.0000 -0.0000 1.0000 vn 1.0000 0.0000 0.0000 vn 0.0000 0.0000 -1.0000 diff --git a/mods/doors/models/door_b.obj b/mods/doors/models/door_b.obj index 20fba3f8..87f1729c 100644 --- a/mods/doors/models/door_b.obj +++ b/mods/doors/models/door_b.obj @@ -2,14 +2,14 @@ # www.blender.org mtllib door_b.mtl o door_b -v 0.500000 1.500000 -0.500000 -v 0.500000 1.500000 -0.375000 -v 0.500000 -0.500000 -0.375000 -v 0.500000 -0.500000 -0.500000 -v -0.500000 1.500000 -0.375000 -v -0.500000 -0.500000 -0.375000 -v -0.500000 1.500000 -0.500000 -v -0.500000 -0.500000 -0.500000 +v 0.499000 1.499000 -0.499000 +v 0.499000 1.499000 -0.375000 +v 0.499000 -0.499000 -0.375000 +v 0.499000 -0.499000 -0.499000 +v -0.499000 1.499000 -0.375000 +v -0.499000 -0.499000 -0.375000 +v -0.499000 1.499000 -0.499000 +v -0.499000 -0.499000 -0.499000 vt 0.894736 1.000000 vt 0.947368 1.000000 vt 0.947368 0.000000 diff --git a/mods/doors/models/door_b2.obj b/mods/doors/models/door_b2.obj index ef5d53ec..35632a5e 100644 --- a/mods/doors/models/door_b2.obj +++ b/mods/doors/models/door_b2.obj @@ -2,14 +2,14 @@ # www.blender.org mtllib door_b2.mtl o door_b2 -v 0.500000 1.500000 -0.500000 -v 0.500000 1.500000 -0.375000 -v 0.500000 -0.500000 -0.375000 -v 0.500000 -0.500000 -0.500000 -v -0.500000 1.500000 -0.375000 -v -0.500000 -0.500000 -0.375000 -v -0.500000 1.500000 -0.500000 -v -0.500000 -0.500000 -0.500000 +v 0.499000 1.499000 -0.499000 +v 0.499000 1.499000 -0.375000 +v 0.499000 -0.499000 -0.375000 +v 0.499000 -0.499000 -0.499000 +v -0.499000 1.499000 -0.375000 +v -0.499000 -0.499000 -0.375000 +v -0.499000 1.499000 -0.499000 +v -0.499000 -0.499000 -0.499000 vt 0.842105 1.000000 vt 0.894737 1.000000 vt 0.894737 0.000000