From 610f2e0bdc627ea6ea824a2a136e7a9dc5dff157 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Mon, 11 May 2015 15:05:50 -0400 Subject: [PATCH] fix broken right-banister model, re-write left one to make sure the normals match --- homedecor/models/homedecor_banister_left.obj | 149 +++++++++------- homedecor/models/homedecor_banister_right.obj | 164 ++++++++++-------- 2 files changed, 172 insertions(+), 141 deletions(-) diff --git a/homedecor/models/homedecor_banister_left.obj b/homedecor/models/homedecor_banister_left.obj index b656d44d..1a2fcc01 100644 --- a/homedecor/models/homedecor_banister_left.obj +++ b/homedecor/models/homedecor_banister_left.obj @@ -1,43 +1,42 @@ -# Blender v2.73 (sub 0) OBJ File: 'bannister.blend' +# Blender v2.73 (sub 0) OBJ File: 'banister.blend' # www.blender.org -o Cylinder -v 0.265203 0.250000 0.437499 -v 0.202703 1.187500 0.437499 -v 0.265203 1.250000 0.437499 -v -0.297297 -0.187500 0.437499 -v -0.234797 0.812500 0.437499 -v 0.202703 0.250000 0.437499 -v -0.047297 1.000000 0.499999 -v 0.483953 1.468750 0.499999 -v -0.578547 0.531250 0.499999 +o Cylinder_Cylinder_verticals v 0.421453 1.531250 0.499999 +v -0.578547 0.531250 0.499999 v -0.516047 0.468750 0.499999 -v 0.265203 0.250000 0.374999 +v 0.483953 1.468750 0.499999 +v 0.421453 1.531250 0.312499 +v 0.483953 1.468750 0.312499 +v -0.516047 0.468750 0.312499 +v -0.578547 0.531250 0.312499 +v 0.202703 0.250000 0.437499 +v 0.265203 0.250000 0.437499 +v 0.265203 1.250000 0.437499 +v 0.202703 1.187500 0.437499 +v 0.202703 0.250000 0.374999 v 0.202703 1.187500 0.374999 v 0.265203 1.250000 0.374999 -v -0.297297 0.750000 0.437499 +v 0.265203 0.250000 0.374999 +v 0.265203 0.250000 0.499999 +v 0.202703 0.250000 0.499999 +v -0.297297 -0.187500 0.437499 v -0.234797 -0.187500 0.437499 -v 0.202703 0.250000 0.374999 -v 0.483953 1.468750 0.312499 -v -0.578547 0.531250 0.312499 -v 0.421453 1.531250 0.312499 -v -0.516047 0.468750 0.312499 -v -0.234797 -0.187500 0.374999 +v -0.234797 0.812500 0.437499 +v -0.297297 0.750000 0.437499 +v -0.297297 -0.187500 0.374999 v -0.297297 0.750000 0.374999 v -0.234797 0.812500 0.374999 -v -0.297297 -0.187500 0.374999 -v 0.265203 0.250000 0.499999 -v -0.297297 -0.187500 0.499999 -v 0.202703 0.250000 0.499999 +v -0.234797 -0.187500 0.374999 v -0.234797 -0.187500 0.499999 -v 0.265203 0.312500 0.437499 -v -0.297297 -0.125000 0.437499 -v 0.202703 0.312500 0.437499 -v -0.234797 -0.125000 0.437499 -v 0.265203 0.312500 0.499999 +v -0.297297 -0.187500 0.499999 v -0.297297 -0.125000 0.499999 -v 0.202703 0.312500 0.499999 +v -0.297297 -0.125000 0.437499 +v -0.234797 -0.125000 0.437499 v -0.234797 -0.125000 0.499999 +v 0.202703 0.312500 0.437499 +v 0.202703 0.312500 0.499999 +v 0.265203 0.312500 0.499999 +v 0.265203 0.312500 0.437499 vt -0.312500 0.500000 vt -0.312500 0.437500 vt 0.625000 0.437500 @@ -92,9 +91,9 @@ vt 0.937500 0.062500 vt -0.250000 0.875000 vt -0.250000 0.937500 vt -0.312500 0.937500 +vt -0.250000 0.375000 vt -0.312500 0.312500 vt -0.250000 0.312500 -vt -0.250000 0.375000 vt -0.125000 0.937500 vt -0.125000 0.875000 vt -0.125000 1.000000 @@ -114,40 +113,58 @@ vt -0.375000 0.312500 vt 0.625000 0.312500 vt 0.625000 0.500000 vt -0.375000 0.500000 -vn -0.000000 0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 -1.000000 0.000000 -vn 1.000000 0.000000 0.000000 +vn -0.707100 0.000000 0.707100 +vn 0.707100 0.000000 0.707100 +vn 0.894400 0.000000 0.447200 +vn -0.554700 0.000000 0.832000 +vn -0.577300 -0.577400 -0.577400 +vn -0.554700 -0.000000 -0.832100 +vn 0.894400 -0.000000 -0.447200 +vn 0.577400 -0.577400 -0.577400 +vn 0.577400 -0.577400 0.577400 +vn -0.577400 -0.577400 0.577300 +vn -0.554700 0.000000 0.832100 +vn -0.577400 -0.577400 -0.577400 +vn 0.577400 -0.577400 -0.577300 +vn -0.577400 -0.577400 0.577400 +vn -0.577300 0.577300 0.577300 +vn -0.707100 0.707100 -0.000000 vn -1.000000 0.000000 0.000000 -vn 0.000000 1.000000 0.000000 -vn 0.707100 0.707100 0.000000 -vn -0.707100 -0.707100 0.000000 -vn 0.707100 -0.707100 0.000000 -vn -0.707100 0.707100 0.000000 -g Cylinder_Cylinder_verticals -s off -f 6/1/1 1/2/1 3/3/1 2/4/1 -f 17/5/2 13/6/2 14/7/2 12/8/2 -f 17/9/3 12/10/3 26/11/3 28/12/3 -f 4/13/1 16/14/1 5/15/1 15/16/1 -f 25/13/2 23/16/2 24/17/2 22/5/2 -f 25/18/3 22/19/3 29/20/3 27/21/3 -f 3/22/4 1/23/4 12/24/4 14/25/4 -f 6/26/5 2/27/5 13/28/5 17/2/5 -f 5/29/4 16/30/4 22/31/4 24/32/4 -f 4/33/5 15/34/5 23/35/5 25/36/5 -f 27/37/5 35/38/5 31/39/5 4/33/5 -f 16/40/4 33/41/4 37/42/4 29/43/4 -f 32/44/6 36/45/6 34/46/6 30/47/6 -f 31/48/6 35/49/6 37/50/6 33/51/6 -f 1/42/4 30/52/4 34/53/4 26/54/4 -f 28/55/5 36/56/5 32/57/5 6/26/5 -f 26/42/1 34/52/1 36/53/1 28/54/1 -f 29/40/1 37/41/1 35/42/1 27/43/1 -g Cylinder_Cylinder_top -f 10/32/1 9/58/1 11/59/1 8/22/1 -f 20/32/2 18/29/2 21/60/2 19/58/2 -f 10/61/7 8/62/7 18/63/7 20/64/7 -f 9/65/8 19/66/8 21/67/8 11/68/8 -f 8/69/9 11/70/9 21/71/9 18/72/9 -f 9/73/10 10/74/10 20/75/10 19/76/10 +vn 1.000000 0.000000 0.000000 +vn 0.707100 0.707100 -0.000000 +vn 0.577300 0.577300 0.577300 +vn 0.000000 0.816500 0.577300 +vn -0.816500 0.000000 0.577300 +vn 0.000000 -0.816500 0.577300 +vn 0.816500 0.000000 0.577300 +vn 0.000000 0.816500 -0.577300 +vn 0.816500 0.000000 -0.577300 +vn 0.000000 -0.816500 -0.577300 +vn -0.816500 0.000000 -0.577300 +g Cylinder_Cylinder_verticals_Cylinder_Cylinder_verticals_verticals +s 1 +f 9/1/1 10/2/2 11/3/3 12/4/4 +f 13/5/5 14/6/6 15/7/7 16/8/8 +f 13/9/5 16/10/8 17/11/9 18/12/10 +f 19/13/1 20/14/2 21/15/3 22/16/11 +f 23/13/12 24/16/6 25/17/7 26/5/13 +f 23/18/12 26/19/13 27/20/9 28/21/14 +f 11/22/3 10/23/2 16/24/8 15/25/7 +f 9/26/1 12/27/4 14/28/6 13/2/5 +f 21/29/3 20/30/2 26/31/13 25/32/7 +f 19/33/1 22/34/11 24/35/6 23/36/12 +f 28/37/14 29/38/15 30/39/16 19/33/17 +f 20/40/18 31/41/19 32/42/20 27/43/9 +f 33/44/16 34/45/15 35/46/20 36/47/19 +f 30/48/16 29/49/15 32/50/20 31/51/19 +f 10/42/18 36/52/19 35/53/20 17/54/9 +f 33/55/16 9/26/17 18/56/10 34/57/15 +f 17/42/9 35/52/20 34/53/15 18/54/10 +f 27/40/9 32/41/20 29/42/15 28/43/14 +g Cylinder_Cylinder_verticals_Cylinder_Cylinder_verticals_railing +f 1/32/21 2/58/22 3/59/23 4/22/24 +f 5/32/25 6/29/26 7/60/27 8/58/28 +f 1/61/21 4/62/24 6/63/26 5/64/25 +f 2/65/22 8/66/28 7/67/27 3/68/23 +f 4/69/24 3/70/23 7/71/27 6/72/26 +f 2/73/22 1/74/21 5/75/25 8/76/28 diff --git a/homedecor/models/homedecor_banister_right.obj b/homedecor/models/homedecor_banister_right.obj index 683c4f9d..443aa421 100644 --- a/homedecor/models/homedecor_banister_right.obj +++ b/homedecor/models/homedecor_banister_right.obj @@ -1,43 +1,42 @@ -# Blender v2.73 (sub 0) OBJ File: 'bannister.blend' +# Blender v2.73 (sub 0) OBJ File: 'banister-left.blend' # www.blender.org -o Cylinder -v 0.265203 0.250000 -0.437499 -v 0.202703 1.187500 -0.437499 -v 0.265203 1.250000 -0.437499 -v -0.297297 -0.187500 -0.437499 -v -0.234797 0.812500 -0.437499 -v 0.202703 0.250000 -0.437499 -v -0.047297 1.000000 -0.499999 -v 0.483953 1.468750 -0.499999 -v -0.578547 0.531250 -0.499999 -v 0.421453 1.531250 -0.499999 -v -0.516047 0.468750 -0.499999 -v 0.265203 0.250000 -0.374999 -v 0.202703 1.187500 -0.374999 -v 0.265203 1.250000 -0.374999 -v -0.297297 0.750000 -0.437499 -v -0.234797 -0.187500 -0.437499 -v 0.202703 0.250000 -0.374999 -v 0.483953 1.468750 -0.312499 -v -0.578547 0.531250 -0.312499 -v 0.421453 1.531250 -0.312499 -v -0.516047 0.468750 -0.312499 -v -0.234797 -0.187500 -0.374999 -v -0.297297 0.750000 -0.374999 -v -0.234797 0.812500 -0.374999 -v -0.297297 -0.187500 -0.374999 -v 0.265203 0.250000 -0.499999 -v -0.297297 -0.187500 -0.499999 -v 0.202703 0.250000 -0.499999 -v -0.234797 -0.187500 -0.499999 -v 0.265203 0.312500 -0.437499 -v -0.297297 -0.125000 -0.437499 -v 0.202703 0.312500 -0.437499 -v -0.234797 -0.125000 -0.437499 -v 0.265203 0.312500 -0.499999 -v -0.297297 -0.125000 -0.499999 -v 0.202703 0.312500 -0.499999 -v -0.234797 -0.125000 -0.499999 +o Cylinder_Cylinder_verticals +v -0.421453 1.531250 0.499999 +v 0.578547 0.531250 0.499999 +v 0.516047 0.468750 0.499999 +v -0.483953 1.468750 0.499999 +v -0.421453 1.531250 0.312499 +v -0.483953 1.468750 0.312499 +v 0.516047 0.468750 0.312499 +v 0.578547 0.531250 0.312499 +v -0.202703 0.250000 0.437499 +v -0.265203 0.250000 0.437499 +v -0.265203 1.250000 0.437499 +v -0.202703 1.187500 0.437499 +v -0.202703 0.250000 0.374999 +v -0.202703 1.187500 0.374999 +v -0.265203 1.250000 0.374999 +v -0.265203 0.250000 0.374999 +v -0.265203 0.250000 0.499999 +v -0.202703 0.250000 0.499999 +v 0.297297 -0.187500 0.437499 +v 0.234797 -0.187500 0.437499 +v 0.234797 0.812500 0.437499 +v 0.297297 0.750000 0.437499 +v 0.297297 -0.187500 0.374999 +v 0.297297 0.750000 0.374999 +v 0.234797 0.812500 0.374999 +v 0.234797 -0.187500 0.374999 +v 0.234797 -0.187500 0.499999 +v 0.297297 -0.187500 0.499999 +v 0.297297 -0.125000 0.499999 +v 0.297297 -0.125000 0.437499 +v 0.234797 -0.125000 0.437499 +v 0.234797 -0.125000 0.499999 +v -0.202703 0.312500 0.437499 +v -0.202703 0.312500 0.499999 +v -0.265203 0.312500 0.499999 +v -0.265203 0.312500 0.437499 vt -0.312500 0.500000 vt 0.562500 0.500000 vt 0.625000 0.437500 @@ -92,9 +91,9 @@ vt 0.875000 0.125000 vt -0.312500 0.937500 vt -0.250000 0.937500 vt -0.250000 0.875000 -vt -0.312500 0.312500 vt -0.250000 0.375000 vt -0.250000 0.312500 +vt -0.312500 0.312500 vt -0.125000 0.875000 vt -0.125000 0.937500 vt -0.125000 1.000000 @@ -114,40 +113,55 @@ vt -0.375000 0.312500 vt -0.375000 0.500000 vt 0.625000 0.500000 vt 0.625000 0.312500 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 -1.000000 0.000000 +vn 0.707100 0.000000 0.707100 +vn 0.554700 0.000000 0.832000 +vn -0.894400 0.000000 0.447200 +vn -0.707100 0.000000 0.707100 +vn 0.577400 -0.577400 -0.577400 +vn -0.577400 -0.577400 -0.577400 +vn -0.894400 -0.000000 -0.447200 +vn 0.554700 -0.000000 -0.832100 +vn 0.577400 -0.577400 0.577300 +vn -0.577400 -0.577400 0.577400 +vn 0.577400 -0.577400 0.577400 vn 1.000000 0.000000 0.000000 +vn 0.707100 0.707100 -0.000000 +vn 0.577300 0.577300 0.577300 vn -1.000000 0.000000 0.000000 -vn 0.000000 1.000000 0.000000 -vn 0.707100 0.707100 0.000000 -vn -0.707100 -0.707100 0.000000 -vn 0.707100 -0.707100 0.000000 -vn -0.707100 0.707100 0.000000 -g Cylinder_Cylinder_verticals -s off -f 6/1/1 2/2/1 3/3/1 1/4/1 -f 17/5/2 12/6/2 14/7/2 13/8/2 -f 17/9/3 28/10/3 26/11/3 12/12/3 -f 4/13/1 15/14/1 5/15/1 16/16/1 -f 25/13/2 22/5/2 24/17/2 23/14/2 -f 25/18/3 27/19/3 29/20/3 22/21/3 -f 3/22/4 14/23/4 12/24/4 1/25/4 -f 6/26/5 17/4/5 13/27/5 2/28/5 -f 5/29/4 24/30/4 22/31/4 16/32/4 -f 4/33/5 25/34/5 23/35/5 15/36/5 -f 27/37/5 4/33/5 31/38/5 35/39/5 -f 16/40/4 29/41/4 37/42/4 33/43/4 -f 32/44/6 30/45/6 34/46/6 36/47/6 -f 31/48/6 33/49/6 37/50/6 35/51/6 -f 1/42/4 26/52/4 34/53/4 30/54/4 -f 28/55/5 6/26/5 32/56/5 36/57/5 -f 26/42/1 28/52/1 36/53/1 34/54/1 -f 29/40/1 27/41/1 35/42/1 37/43/1 -g Cylinder_Cylinder_top -f 10/30/1 8/22/1 11/58/1 9/59/1 -f 20/30/2 19/59/2 21/60/2 18/29/2 -f 10/61/7 20/62/7 18/63/7 8/64/7 -f 9/65/8 11/66/8 21/67/8 19/68/8 -f 8/69/9 18/70/9 21/71/9 11/72/9 -f 9/73/10 19/74/10 20/75/10 10/76/10 +vn -0.577300 0.577300 0.577300 +vn -0.707100 0.707100 -0.000000 +vn 0.000000 0.816500 0.577300 +vn -0.816500 0.000000 0.577300 +vn 0.000000 -0.816500 0.577300 +vn 0.816500 0.000000 0.577300 +vn 0.000000 0.816500 -0.577300 +vn 0.816500 0.000000 -0.577300 +vn 0.000000 -0.816500 -0.577300 +vn -0.816500 0.000000 -0.577300 +g Cylinder_Cylinder_verticals_Cylinder_Cylinder_verticals_verticals +s 1 +f 9/1/1 12/2/2 11/3/3 10/4/4 +f 13/5/5 16/6/6 15/7/7 14/8/8 +f 13/9/5 18/10/9 17/11/10 16/12/6 +f 19/13/1 22/14/2 21/15/3 20/16/4 +f 23/13/5 26/5/6 25/17/7 24/14/8 +f 23/18/5 28/19/11 27/20/10 26/21/6 +f 11/22/3 15/23/7 16/24/6 10/25/4 +f 9/26/1 13/4/5 14/27/8 12/28/2 +f 21/29/3 25/30/7 26/31/6 20/32/4 +f 19/33/1 23/34/5 24/35/8 22/36/2 +f 28/37/11 19/33/12 30/38/13 29/39/14 +f 20/40/15 27/41/10 32/42/16 31/43/17 +f 33/44/13 36/45/17 35/46/16 34/47/14 +f 30/48/13 31/49/17 32/50/16 29/51/14 +f 10/42/15 17/52/10 35/53/16 36/54/17 +f 33/55/13 34/56/14 18/57/9 9/26/12 +f 17/42/10 18/52/9 34/53/14 35/54/16 +f 27/40/10 28/41/11 29/42/14 32/43/16 +g Cylinder_Cylinder_verticals_Cylinder_Cylinder_verticals_railing +f 1/30/18 4/22/19 3/58/20 2/59/21 +f 5/30/22 8/59/23 7/60/24 6/29/25 +f 1/61/18 5/62/22 6/63/25 4/64/19 +f 2/65/21 3/66/20 7/67/24 8/68/23 +f 4/69/19 6/70/25 7/71/24 3/72/20 +f 2/73/21 8/74/23 5/75/22 1/76/18