Merge remote-tracking branch 'upstream/master'

inbox/models/inbox_mailbox.obj

@@ -1,208 +1,205 @@
-# Blender v2.73 (sub 0) OBJ File: 'mailbox.blend'
-# www.blender.org
-o Cylinder
-v 0.312500 -0.500000 -0.500000
-v 0.312500 -0.500000 0.500000
-v -0.312500 -0.500000 0.500000
-v -0.312500 -0.500000 -0.500000
-v -0.230971 -0.082709 0.437500
-v -0.250001 -0.178381 0.437500
-v 0.250001 -0.178381 0.437500
-v 0.230971 -0.082709 0.437500
-v 0.000000 0.125000 0.500000
-v -0.000000 0.125000 -0.500000
-v -0.119589 0.101212 0.500000
-v -0.119589 0.101212 -0.500000
-v -0.220971 0.033471 0.500000
-v -0.220971 0.033471 -0.500000
-v -0.288712 -0.067911 0.500000
-v -0.288712 -0.067911 -0.500000
-v -0.312500 -0.187500 0.500000
-v -0.312500 -0.187500 -0.500000
-v 0.176777 -0.001603 0.437500
-v 0.095671 0.052590 0.437500
-v 0.095671 0.052590 -0.500000
-v 0.176777 -0.001603 -0.500000
-v 0.230971 -0.082709 -0.500000
-v 0.250001 -0.178381 -0.500000
-v -0.250001 -0.178381 -0.500000
-v -0.230971 -0.082709 -0.500000
-v -0.176778 -0.001603 -0.500000
-v -0.095671 0.052590 -0.500000
-v -0.000000 0.071621 -0.500000
-v -0.250001 -0.437501 -0.500000
-v 0.250001 -0.437501 -0.500000
-v 0.000000 -0.067809 0.500000
-v 0.312500 -0.187500 0.500000
-v 0.312500 -0.187500 -0.500000
-v 0.288712 -0.067911 0.500000
-v 0.288712 -0.067911 -0.500000
-v 0.220971 0.033471 0.500000
-v 0.220971 0.033471 -0.500000
-v 0.119588 0.101212 0.500000
-v 0.119588 0.101212 -0.500000
-v -0.176778 -0.001603 0.437500
-v -0.095671 0.052590 0.437500
-v 0.000000 0.071621 0.437500
-v -0.250001 -0.437501 0.437500
-v 0.250001 -0.437501 0.437500
-v 0.000000 -0.082627 0.437500
-v -0.312500 -0.250000 -0.375000
-v -0.312500 -0.250000 -0.312500
-v -0.343750 -0.250000 -0.312500
-v -0.343750 -0.250000 -0.375000
-v -0.312500 0.250000 -0.375000
-v -0.312500 0.250000 -0.312500
-v -0.343750 0.250000 -0.312500
-v -0.343750 0.250000 -0.375000
-v -0.320312 0.125000 -0.312500
-v -0.320312 0.125000 -0.187500
-v -0.335937 0.125000 -0.187500
-v -0.335937 0.125000 -0.312500
-v -0.320312 0.250000 -0.312500
-v -0.320312 0.250000 -0.187500
-v -0.335937 0.250000 -0.187500
-v -0.335937 0.250000 -0.312500
-vt 0.000000 0.000000
-vt 0.181818 0.000000
-vt 0.181818 1.000000
-vt 0.000000 1.000000
-vt 0.818182 0.000000
-vt 0.909091 0.000000
-vt 0.909091 1.000000
-vt 0.818182 1.000000
-vt 0.363637 1.000000
-vt 0.363637 0.000000
-vt 0.454545 0.000000
-vt 0.454546 1.000000
-vt 0.545455 0.500000
-vt 0.545455 0.625000
-vt 0.454546 0.625000
-vt 0.454546 0.500000
-vt 0.636364 0.500000
-vt 0.636364 0.625000
-vt 0.454546 0.250000
-vt 0.818182 0.250000
-vt 0.818182 0.500000
-vt 0.954545 0.000000
-vt 0.954545 0.250000
-vt 0.909091 0.250000
-vt 0.909091 0.500000
-vt 0.954545 0.500000
-vt 1.000000 0.000000
-vt 1.000000 0.250000
-vt 0.973553 0.716044
-vt 0.933816 0.766735
-vt 0.804196 0.716095
-vt 0.437572 0.500000
-vt 0.507722 0.511894
-vt 0.493693 0.536205
-vt 0.437572 0.526690
-vt 0.987507 0.656250
-vt 0.567193 0.545764
-vt 0.606930 0.596456
-vt 0.573059 0.603855
-vt 0.541269 0.563301
-vt 0.000000 0.500000
-vt 0.366623 0.000000
-vt 0.366623 0.500000
-vt 0.874346 0.800606
-vt 0.620884 0.656250
-vt 0.634838 0.716044
-vt 0.674575 0.766735
-vt 0.734045 0.800606
-vt 0.804196 0.812500
-vt 0.987507 0.500000
-vt 0.620884 0.500000
-vt 0.584222 0.651690
-vt 0.620884 0.812500
-vt 0.584222 0.781251
-vt 0.254261 0.812500
-vt 0.254261 0.656250
-vt 0.290922 0.651690
-vt 0.290922 0.781251
-vt 0.268214 0.596456
-vt 0.302085 0.603855
-vt 0.307951 0.545765
-vt 0.333875 0.563302
-vt 0.367422 0.511894
-vt 0.381452 0.536205
-vt 0.116656 0.500000
-vt 0.116656 1.000000
-vt 0.050576 1.000000
-vt 0.050576 0.500000
-vt 1.000000 0.500000
-vt 0.936921 0.500000
-vt 0.936921 0.000000
-vt 0.865741 0.500000
-vt 0.865741 0.000000
-vt 0.683312 0.000000
-vt 0.683312 0.500000
-vt 0.549052 0.000000
-vt 0.549052 0.500000
-vt 0.620232 0.000000
-vt 0.620233 0.500000
-vt 0.188180 0.500000
-vt 0.188180 1.000000
-vt 0.254260 0.500000
-vt 0.254261 1.000000
-vt 0.000000 0.703643
-vt 0.000000 0.414971
-vt 0.648062 0.414971
-vt 0.648062 0.703643
-vt 0.820879 0.711328
-vt 1.000000 0.711328
-vt 1.000000 1.000000
-vt 0.820879 1.000000
-vt 0.648062 0.855664
-vt 0.661216 0.800429
-vt 0.754688 0.855664
-vt 0.698678 0.753603
-vt 0.754744 0.722315
-vt 0.754745 0.989013
-vt 0.698679 0.957725
-vt 0.661216 0.910899
-vt 0.000000 0.160377
-vt 0.000000 0.108347
-vt 0.648062 0.108347
-vt 0.648062 0.160377
-vt 0.648062 0.957694
-vt 0.648061 1.000000
-vt 0.000000 0.957694
-vt 0.648062 0.904383
-vt 0.000000 0.904383
-vt 0.648062 0.848183
-vt 0.000000 0.848183
-vt 0.000000 0.309258
-vt 0.648062 0.309258
-vt 0.000000 0.365304
-vt 0.648062 0.365304
-vt 0.000000 0.052030
-vt 0.648062 0.000000
-vt 0.648062 0.052030
-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
-vn -0.382700 0.923900 -0.000000
-vn -0.707100 0.707100 0.000000
-vn -0.923900 0.382700 0.000000
-vn -0.995200 0.098000 0.000000
-vn 0.995200 0.098000 -0.000000
-vn 0.923900 0.382700 -0.000000
-vn 0.707100 0.707100 -0.000000
-vn 0.382700 0.923900 -0.000000
-vn 0.382700 -0.923900 -0.000000
-vn 0.707100 -0.707100 -0.000000
-vn 0.923900 -0.382700 -0.000000
-vn 0.995200 -0.098000 -0.000000
-vn -0.995200 -0.098000 0.000000
-vn -0.923900 -0.382700 0.000000
-vn -0.707100 -0.707100 0.000000
-vn -0.382700 -0.923900 0.000000
-g Cylinder_Cylinder_flag
+v 0.313 -0.5 -0.5
+v 0.313 -0.5 0.5
+v -0.312 -0.5 0.5
+v -0.312 -0.5 -0.5
+v -0.231 -0.083 0.438
+v -0.25 -0.178 0.438
+v 0.25 -0.178 0.438
+v 0.231 -0.083 0.438
+v 0 0.125 0.5
+v 0 0.125 -0.5
+v -0.12 0.101 0.5
+v -0.12 0.101 -0.5
+v -0.221 0.033 0.5
+v -0.221 0.033 -0.5
+v -0.289 -0.068 0.5
+v -0.289 -0.068 -0.5
+v -0.312 -0.187 0.5
+v -0.312 -0.187 -0.5
+v 0.177 -0.002 0.438
+v 0.096 0.053 0.438
+v 0.096 0.053 -0.5
+v 0.177 -0.002 -0.5
+v 0.231 -0.083 -0.5
+v 0.25 -0.178 -0.5
+v -0.25 -0.178 -0.5
+v -0.231 -0.083 -0.5
+v -0.177 -0.002 -0.5
+v -0.096 0.053 -0.5
+v 0 0.072 -0.5
+v -0.25 -0.438 -0.5
+v 0.25 -0.438 -0.5
+v 0 -0.068 0.5
+v 0.313 -0.187 0.5
+v 0.313 -0.187 -0.5
+v 0.289 -0.068 0.5
+v 0.289 -0.068 -0.5
+v 0.221 0.033 0.5
+v 0.221 0.033 -0.5
+v 0.12 0.101 0.5
+v 0.12 0.101 -0.5
+v -0.177 -0.002 0.438
+v -0.096 0.053 0.438
+v 0 0.072 0.438
+v -0.25 -0.438 0.438
+v 0.25 -0.438 0.438
+v 0 -0.083 0.438
+v -0.312 -0.25 -0.375
+v -0.312 -0.25 -0.312
+v -0.344 -0.25 -0.312
+v -0.344 -0.25 -0.375
+v -0.312 0.25 -0.375
+v -0.312 0.25 -0.312
+v -0.344 0.25 -0.312
+v -0.344 0.25 -0.375
+v -0.32 0.125 -0.312
+v -0.32 0.125 -0.187
+v -0.336 0.125 -0.187
+v -0.336 0.125 -0.312
+v -0.32 0.25 -0.312
+v -0.32 0.25 -0.187
+v -0.336 0.25 -0.187
+v -0.336 0.25 -0.312
+vt 0 0
+vt 0.182 0
+vt 0.182 1
+vt 0 1
+vt 0.818 0
+vt 0.909 0
+vt 0.909 1
+vt 0.818 1
+vt 0.364 1
+vt 0.364 0
+vt 0.455 0
+vt 0.455 1
+vt 0.545 0.5
+vt 0.545 0.625
+vt 0.455 0.625
+vt 0.455 0.5
+vt 0.636 0.5
+vt 0.636 0.625
+vt 0.455 0.25
+vt 0.818 0.25
+vt 0.818 0.5
+vt 0.955 0
+vt 0.955 0.25
+vt 0.909 0.25
+vt 0.909 0.5
+vt 0.955 0.5
+vt 1 0
+vt 1 0.25
+vt 0.974 0.716
+vt 0.934 0.767
+vt 0.804 0.716
+vt 0.438 0.5
+vt 0.508 0.512
+vt 0.494 0.536
+vt 0.438 0.527
+vt 0.988 0.656
+vt 0.567 0.546
+vt 0.607 0.596
+vt 0.573 0.604
+vt 0.541 0.563
+vt 0 0.5
+vt 0.367 0
+vt 0.367 0.5
+vt 0.874 0.801
+vt 0.621 0.656
+vt 0.635 0.716
+vt 0.675 0.767
+vt 0.734 0.801
+vt 0.804 0.813
+vt 0.988 0.5
+vt 0.621 0.5
+vt 0.584 0.652
+vt 0.621 0.813
+vt 0.584 0.781
+vt 0.254 0.813
+vt 0.254 0.656
+vt 0.291 0.652
+vt 0.291 0.781
+vt 0.268 0.596
+vt 0.302 0.604
+vt 0.308 0.546
+vt 0.334 0.563
+vt 0.367 0.512
+vt 0.381 0.536
+vt 0.117 0.5
+vt 0.117 1
+vt 0.051 1
+vt 0.051 0.5
+vt 1 0.5
+vt 0.937 0.5
+vt 0.937 0
+vt 0.866 0.5
+vt 0.866 0
+vt 0.683 0
+vt 0.683 0.5
+vt 0.549 0
+vt 0.549 0.5
+vt 0.62 0
+vt 0.62 0.5
+vt 0.188 0.5
+vt 0.188 1
+vt 0.254 0.5
+vt 0.254 1
+vt 0 0.704
+vt 0 0.415
+vt 0.648 0.415
+vt 0.648 0.704
+vt 0.821 0.711
+vt 1 0.711
+vt 1 1
+vt 0.821 1
+vt 0.648 0.856
+vt 0.661 0.8
+vt 0.755 0.856
+vt 0.699 0.754
+vt 0.755 0.722
+vt 0.755 0.989
+vt 0.699 0.958
+vt 0.661 0.911
+vt 0 0.16
+vt 0 0.108
+vt 0.648 0.108
+vt 0.648 0.16
+vt 0.648 0.958
+vt 0.648 1
+vt 0 0.958
+vt 0.648 0.904
+vt 0 0.904
+vt 0.648 0.848
+vt 0 0.848
+vt 0 0.309
+vt 0.648 0.309
+vt 0 0.365
+vt 0.648 0.365
+vt 0 0.052
+vt 0.648 0
+vt 0.648 0.052
+vn 1 0 0
+vn 0 0 1
+vn -1 0 0
+vn 0 0 -1
+vn 0 -1 0
+vn 0 1 0
+vn -0.383 0.924 0
+vn -0.707 0.707 0
+vn -0.924 0.383 0
+vn -0.995 0.098 0
+vn 0.995 0.098 0
+vn 0.924 0.383 0
+vn 0.707 0.707 0
+vn 0.383 0.924 0
+vn 0.383 -0.924 0
+vn 0.707 -0.707 0
+vn 0.924 -0.383 0
+vn 0.995 -0.098 0
+vn -0.995 -0.098 0
+vn -0.924 -0.383 0
+vn -0.707 -0.707 0
+vn -0.383 -0.924 0
+g 1
 s off
 f 51/1/1 52/2/1 48/3/1 47/4/1
 f 52/5/2 53/6/2 49/7/2 48/8/2
@@ -215,7 +212,7 @@ f 60/6/2 61/22/2 57/23/2 56/24/2
 f 61/19/3 62/11/3 58/5/3 57/20/3
 f 55/25/5 56/24/5 57/23/5 58/26/5
 f 62/27/6 61/28/6 60/23/6 59/22/6
-g Cylinder_Cylinder_outside
+g 2
 f 35/29/2 37/30/2 32/31/2
 f 10/32/4 40/33/4 21/34/4 29/35/4
 f 33/36/2 35/29/2 32/31/2
@@ -249,7 +246,7 @@ f 33/77/11 34/76/11 36/78/12 35/79/12
 f 35/79/12 36/78/12 38/74/13 37/75/13
 f 39/80/14 40/81/14 10/66/6 9/65/6
 f 37/82/13 38/83/13 40/81/14 39/80/14
-g Cylinder_Cylinder_inside
+g 3
 s off
 f 31/84/6 30/85/6 44/86/6 45/87/6
 f 7/88/4 45/89/4 44/90/4 6/91/4