Merge remote-tracking branch 'upstream/master'

computer/models/computer_laptop.obj

@@ -1,86 +1,81 @@
-# Blender v2.69 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib computer_laptop.mtl
-o Cube.001
-v -0.340277 0.022636 0.335290
-v -0.340277 0.013075 0.362499
-v 0.332320 0.022636 0.335292
-v 0.332320 -0.432772 0.182772
-v 0.332320 0.013075 0.362501
-v -0.340276 -0.499994 -0.312651
-v -0.340276 -0.432772 -0.312651
-v 0.332321 -0.499994 -0.312650
-v -0.340277 -0.499994 0.182771
-v 0.332320 -0.499994 0.182772
-v -0.340277 -0.432772 0.182771
-v -0.340278 -0.432772 0.209979
-v 0.332320 -0.432772 0.209981
-v 0.332320 -0.499994 0.209981
-v -0.340278 -0.499994 0.209979
-v -0.319957 -0.417924 0.194820
-v -0.319957 -0.001053 0.334433
-v 0.312000 -0.417925 0.194821
-v -0.340277 -0.432772 -0.159321
-v 0.332321 -0.432772 -0.312650
-v 0.311999 -0.001054 0.334434
-v 0.332321 -0.432772 -0.159320
-vt 0.682604 0.005242
-vt 0.682603 0.021207
-vt 0.310265 0.005245
-vt 0.044426 0.009206
-vt 0.310266 0.021211
-vt 0.753340 0.119988
-vt 0.810356 0.119988
-vt 0.753340 0.597765
-vt 0.856851 0.982221
-vt 0.745750 0.982220
-vt 0.856851 0.831387
-vt 0.948453 0.009205
-vt 0.878028 0.982221
-vt 0.878028 0.831387
-vt 0.983700 0.982221
-vt 0.862953 0.831387
-vt 0.862953 0.982221
-vt 0.728292 0.490807
-vt 0.728292 0.989869
-vt 0.010900 0.490807
-vt 0.831643 0.129995
-vt 0.982007 0.129995
-vt 0.831643 0.789586
-vt 0.758249 0.754841
-vt 0.758228 0.812823
-vt 0.756060 0.752868
-vt 0.798519 0.812617
-vt 0.756052 0.814797
-vt 0.798577 0.754909
-vt 0.800285 0.814587
-vt 0.707729 0.114386
-vt 0.707729 0.471212
-vt 0.006162 0.114385
-vt 0.345650 0.099088
-vt 0.497058 0.032709
-vt 0.497058 0.099088
-vt 0.990661 0.099453
-vt 0.838275 0.032645
-vt 0.990661 0.032645
-vt 0.007709 0.008663
-vt 0.012705 0.022873
-vt 0.983559 0.009737
-vt 0.943457 0.023414
-vt 0.049421 0.023416
-vt 0.810356 0.597766
-vt 0.745750 0.831387
-vt 0.983700 0.831387
-vt 0.010900 0.989869
-vt 0.982007 0.789586
-vt 0.800332 0.752938
-vt 0.006162 0.471212
-vt 0.007844 0.099088
-vt 0.007844 0.032709
-vt 0.498289 0.099453
-vt 0.498289 0.032646
-vt 0.978563 0.023946
-usemtl Material.001
+v -0.34 0.023 0.335
+v -0.34 0.013 0.362
+v 0.332 0.023 0.335
+v 0.332 -0.433 0.183
+v 0.332 0.013 0.363
+v -0.34 -0.5 -0.313
+v -0.34 -0.433 -0.313
+v 0.332 -0.5 -0.313
+v -0.34 -0.5 0.183
+v 0.332 -0.5 0.183
+v -0.34 -0.433 0.183
+v -0.34 -0.433 0.21
+v 0.332 -0.433 0.21
+v 0.332 -0.5 0.21
+v -0.34 -0.5 0.21
+v -0.32 -0.418 0.195
+v -0.32 -0.001 0.334
+v 0.312 -0.418 0.195
+v -0.34 -0.433 -0.159
+v 0.332 -0.433 -0.313
+v 0.312 -0.001 0.334
+v 0.332 -0.433 -0.159
+vt 0.683 0.005
+vt 0.683 0.021
+vt 0.31 0.005
+vt 0.044 0.009
+vt 0.31 0.021
+vt 0.753 0.12
+vt 0.81 0.12
+vt 0.753 0.598
+vt 0.857 0.982
+vt 0.746 0.982
+vt 0.857 0.831
+vt 0.948 0.009
+vt 0.878 0.982
+vt 0.878 0.831
+vt 0.984 0.982
+vt 0.863 0.831
+vt 0.863 0.982
+vt 0.728 0.491
+vt 0.728 0.99
+vt 0.011 0.491
+vt 0.832 0.13
+vt 0.982 0.13
+vt 0.832 0.79
+vt 0.758 0.755
+vt 0.758 0.813
+vt 0.756 0.753
+vt 0.799 0.813
+vt 0.756 0.815
+vt 0.799 0.755
+vt 0.8 0.815
+vt 0.708 0.114
+vt 0.708 0.471
+vt 0.006 0.114
+vt 0.346 0.099
+vt 0.497 0.033
+vt 0.497 0.099
+vt 0.991 0.099
+vt 0.838 0.033
+vt 0.991 0.033
+vt 0.008 0.009
+vt 0.013 0.023
+vt 0.984 0.01
+vt 0.943 0.023
+vt 0.049 0.023
+vt 0.81 0.598
+vt 0.746 0.831
+vt 0.984 0.831
+vt 0.011 0.99
+vt 0.982 0.79
+vt 0.8 0.753
+vt 0.006 0.471
+vt 0.008 0.099
+vt 0.008 0.033
+vt 0.498 0.099
+vt 0.498 0.033
+vt 0.979 0.024
 s off
 f 1/1 2/2 3/3
 f 4/4 3/3 5/5

computer/models/computer_laptop_closed.obj

@@ -1,98 +1,93 @@
-# Blender v2.69 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib computer_laptop_closed.mtl
-o Cube.001
-v 0.332320 -0.432772 0.182772
-v -0.340276 -0.499994 -0.312651
-v -0.340276 -0.432772 -0.312651
-v 0.332321 -0.499994 -0.312650
-v -0.340277 -0.499994 0.182771
-v 0.332320 -0.499994 0.182772
-v -0.340277 -0.432772 0.182771
-v -0.340278 -0.432772 0.209979
-v 0.332320 -0.432772 0.209981
-v 0.332320 -0.499994 0.209981
-v -0.340278 -0.499994 0.209979
-v -0.340277 -0.432772 -0.159321
-v 0.332321 -0.432772 -0.312650
-v 0.332321 -0.432772 -0.159320
-v -0.339100 -0.432290 -0.312591
-v -0.339100 -0.401111 -0.312123
-v 0.331143 -0.432288 -0.312592
-v 0.331143 -0.432434 0.206702
-v 0.331143 -0.401109 -0.312123
-v -0.339100 -0.432435 0.206702
-v -0.339101 -0.404537 0.197368
-v 0.331143 -0.404535 0.197367
-v -0.318852 -0.425175 0.187344
-v -0.318852 -0.425042 -0.288007
-v 0.310895 -0.425173 0.187344
-v 0.310894 -0.425040 -0.288006
-vt 0.753340 0.119988
-vt 0.810356 0.119988
-vt 0.753340 0.597765
-vt 0.856851 0.982221
-vt 0.745750 0.982220
-vt 0.856851 0.831387
-vt 0.878028 0.831387
-vt 0.878028 0.982221
-vt 0.862953 0.831387
-vt 0.862953 0.982221
-vt 0.858063 0.829423
-vt 0.885587 0.829423
-vt 0.858063 0.950158
-vt 0.935597 0.852882
-vt 0.935597 0.922715
-vt 0.798294 0.852882
-vt 0.345650 0.099088
-vt 0.497058 0.032709
-vt 0.497058 0.099088
-vt 0.990661 0.099453
-vt 0.838275 0.032645
-vt 0.990661 0.032645
-vt 0.007709 0.008663
-vt 0.044426 0.009206
-vt 0.012705 0.022873
-vt 0.948453 0.009205
-vt 0.983559 0.009737
-vt 0.943457 0.023414
-vt 0.810356 0.597766
-vt 0.745750 0.831387
-vt 0.885587 0.950158
-vt 0.912135 0.962581
-vt 0.785835 0.838012
-vt 0.886333 0.908011
-vt 0.922048 0.840165
-vt 0.798294 0.922715
-vt 0.007844 0.099088
-vt 0.007844 0.032709
-vt 0.498289 0.099453
-vt 0.498289 0.032646
-vt 0.049421 0.023416
-vt 0.978563 0.023946
-vt 0.682604 0.005242
-vt 0.682603 0.021207
-vt 0.310265 0.005245
-vt 0.310266 0.021211
-vt 0.983700 0.982221
-vt 0.922420 0.868181
-vt 0.922420 0.951695
-vt 0.802372 0.868181
-vt 0.758249 0.754841
-vt 0.758228 0.812823
-vt 0.756060 0.752868
-vt 0.798519 0.812617
-vt 0.756052 0.814797
-vt 0.798577 0.754909
-vt 0.800285 0.814587
-vt 0.983700 0.831387
-vt 0.802372 0.951695
-vt 0.800332 0.752938
-vt 0.896350 0.948981
-vt 0.903598 0.848845
-vt 0.888354 0.925385
-vt 0.811076 0.850308
-usemtl Material.001
+v 0.332 -0.433 0.183
+v -0.34 -0.5 -0.313
+v -0.34 -0.433 -0.313
+v 0.332 -0.5 -0.313
+v -0.34 -0.5 0.183
+v 0.332 -0.5 0.183
+v -0.34 -0.433 0.183
+v -0.34 -0.433 0.21
+v 0.332 -0.433 0.21
+v 0.332 -0.5 0.21
+v -0.34 -0.5 0.21
+v -0.34 -0.433 -0.159
+v 0.332 -0.433 -0.313
+v 0.332 -0.433 -0.159
+v -0.339 -0.432 -0.313
+v -0.339 -0.401 -0.312
+v 0.331 -0.432 -0.313
+v 0.331 -0.432 0.207
+v 0.331 -0.401 -0.312
+v -0.339 -0.432 0.207
+v -0.339 -0.405 0.197
+v 0.331 -0.405 0.197
+v -0.319 -0.425 0.187
+v -0.319 -0.425 -0.288
+v 0.311 -0.425 0.187
+v 0.311 -0.425 -0.288
+vt 0.753 0.12
+vt 0.81 0.12
+vt 0.753 0.598
+vt 0.857 0.982
+vt 0.746 0.982
+vt 0.857 0.831
+vt 0.878 0.831
+vt 0.878 0.982
+vt 0.863 0.831
+vt 0.863 0.982
+vt 0.858 0.829
+vt 0.886 0.829
+vt 0.858 0.95
+vt 0.936 0.853
+vt 0.936 0.923
+vt 0.798 0.853
+vt 0.346 0.099
+vt 0.497 0.033
+vt 0.497 0.099
+vt 0.991 0.099
+vt 0.838 0.033
+vt 0.991 0.033
+vt 0.008 0.009
+vt 0.044 0.009
+vt 0.013 0.023
+vt 0.948 0.009
+vt 0.984 0.01
+vt 0.943 0.023
+vt 0.81 0.598
+vt 0.746 0.831
+vt 0.886 0.95
+vt 0.912 0.963
+vt 0.786 0.838
+vt 0.886 0.908
+vt 0.922 0.84
+vt 0.798 0.923
+vt 0.008 0.099
+vt 0.008 0.033
+vt 0.498 0.099
+vt 0.498 0.033
+vt 0.049 0.023
+vt 0.979 0.024
+vt 0.683 0.005
+vt 0.683 0.021
+vt 0.31 0.005
+vt 0.31 0.021
+vt 0.984 0.982
+vt 0.922 0.868
+vt 0.922 0.952
+vt 0.802 0.868
+vt 0.758 0.755
+vt 0.758 0.813
+vt 0.756 0.753
+vt 0.799 0.813
+vt 0.756 0.815
+vt 0.799 0.755
+vt 0.8 0.815
+vt 0.984 0.831
+vt 0.802 0.952
+vt 0.8 0.753
+vt 0.896 0.949
+vt 0.904 0.849
+vt 0.888 0.925
+vt 0.811 0.85
 s off
 f 2/1 3/2 4/3
 f 5/4 2/5 6/6

computer/models/computer_tower.obj

@@ -1,29 +1,24 @@
-# Blender v2.72 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib computer_tower.mtl
-o Cube.001
-v -0.182508 -0.499998 0.450000
-v -0.182508 -0.499998 -0.349946
-v 0.182508 -0.499998 -0.349946
-v 0.182508 -0.499998 0.450000
-v -0.182508 0.335734 0.450000
-v 0.182508 0.335734 0.450000
-v 0.182508 0.335734 -0.349946
-v -0.182508 0.335734 -0.349947
-vt 0.999994 0.750017
-vt 0.500006 0.749983
-vt 0.500002 0.499996
-vt 0.999997 0.500009
-vt 0.499989 0.999941
-vt 0.999986 0.999931
-vt 0.500005 0.000003
-vt 0.000007 0.500002
-vt -0.000003 0.000003
-vt 0.250005 0.999991
-vt 0.250005 0.499995
-vt 0.999993 0.000002
-vt 0.000017 0.999997
-usemtl Material.001
+v -0.183 -0.5 0.45
+v -0.183 -0.5 -0.35
+v 0.183 -0.5 -0.35
+v 0.183 -0.5 0.45
+v -0.183 0.336 0.45
+v 0.183 0.336 0.45
+v 0.183 0.336 -0.35
+v -0.183 0.336 -0.35
+vt 1 0.75
+vt 0.5 0.75
+vt 0.5 0.5
+vt 1 0.5
+vt 0.5 1
+vt 1 1
+vt 0.5 0
+vt 0 0.5
+vt 0 0
+vt 0.25 1
+vt 0.25 0.5
+vt 1 0
+vt 0 1
 s off
 f 1/1 2/2 3/3 4/4
 f 5/5 6/2 7/1 8/6

computer/models/tetris_arcade.obj

@@ -1,129 +1,123 @@
-# Blender v2.66 (sub 1) OBJ File: ''
-# www.blender.org
-mtllib tetris_arcade.mtl
-o Cube.001
-v -0.450000 1.299500 -0.450000
-v -0.450000 1.299500 -0.500000
-v 0.450000 1.299500 -0.500000
-v 0.450000 1.299500 -0.450000
-v -0.450000 1.499500 -0.450000
-v -0.450000 1.499500 -0.500000
-v 0.450000 1.499500 -0.500000
-v 0.450000 1.499500 -0.450000
-v 0.450000 -0.495000 -0.500000
-v 0.450000 0.305000 -0.500001
-v -0.450000 -0.495000 -0.499999
-v -0.450000 0.305000 -0.500000
-v 0.450000 -0.498500 0.500000
-v 0.450000 -0.498500 -0.500000
-v 0.500000 -0.498500 -0.500000
-v 0.500000 -0.498500 0.500000
-v 0.450000 1.498500 0.500000
-v 0.450000 1.498500 -0.500000
-v 0.500000 1.498500 -0.500000
-v 0.500000 1.498500 0.500000
-v 0.499998 -0.499998 -0.499998
-v 0.499998 -0.499998 0.499998
-v -0.499998 -0.499998 0.499998
-v -0.499998 -0.499998 -0.499998
-v 0.499998 1.499994 -0.499998
-v -0.499998 1.499994 -0.499998
-v -0.499998 1.499994 0.499998
-v 0.499998 1.499994 0.499998
-v -0.500000 -0.498500 0.500000
-v -0.500000 -0.498500 -0.500000
-v -0.450000 -0.498500 -0.500000
-v -0.450000 -0.498500 0.500000
-v -0.500000 1.498500 0.500000
-v -0.500000 1.498500 -0.500000
-v -0.450000 1.498500 -0.500000
-v -0.450000 1.498500 0.500000
-v 0.450000 0.304976 -0.499762
-v 0.450000 0.474024 -0.137239
-v -0.450000 0.304976 -0.499761
-v -0.450000 0.474024 -0.137238
-v 0.450000 0.472946 -0.138083
-v 0.450000 0.613900 -0.086780
-v -0.450000 0.472946 -0.138082
-v -0.450000 0.613900 -0.086779
-v 0.450000 0.610884 -0.085130
-v 0.450000 1.398731 0.053788
-v -0.450000 0.610884 -0.085130
-v -0.450000 1.398731 0.053789
-v 0.450000 1.395000 0.055138
-v 0.450000 1.495000 0.055138
-v -0.450000 1.395000 0.055138
-v -0.450000 1.495000 0.055138
-vt 0.250108 0.745030
-vt 0.250224 0.516409
-vt 0.494888 0.516008
-vt 0.495027 0.744660
-vt 0.500090 0.744658
-vt 0.250080 0.744698
-vt 0.250023 0.693307
-vt 0.500163 0.693337
-vt 0.244872 0.999900
-vt 0.000100 0.999900
-vt 0.000100 0.925965
-vt 0.244701 0.925965
-vt -0.000234 0.985285
-vt 0.246386 0.985398
-vt 0.246568 0.999900
-vt 0.254685 0.396330
-vt 0.255312 0.252326
-vt 0.489851 0.252497
-vt 0.489923 0.396494
-vt 0.746604 0.251526
-vt 1.000599 0.251553
-vt 1.000481 0.749319
-vt 0.748216 0.749150
-vt 0.971448 0.251053
-vt 0.999396 0.251108
-vt 1.000262 0.749144
-vt 0.972149 0.748806
-vt 0.250110 0.749633
-vt 0.000464 0.749633
-vt 0.001279 0.251648
-vt 0.250023 0.251690
-vt 0.742499 0.744632
-vt 0.500700 0.744632
-vt 0.500700 0.255368
-vt 0.742499 0.255368
-vt 0.951737 0.252687
-vt 0.999900 0.252686
-vt 0.999900 0.748679
-vt 0.951737 0.748679
-vt 1.000029 0.749233
-vt 0.744529 0.749104
-vt 0.745177 0.251367
-vt 1.001019 0.251067
-vt 0.255742 0.485017
-vt 0.255492 0.401623
-vt 0.494936 0.401277
-vt 0.495186 0.485021
-vt 0.260753 0.515705
-vt 0.260629 0.484664
-vt 0.494387 0.484878
-vt 0.494282 0.515673
-vt -0.000037 0.745106
-vt 0.000017 0.703328
-vt 0.245542 0.703882
-vt 0.245632 0.745399
-vt 0.250050 0.250050
-vt 0.000100 0.250050
-vt 0.000100 0.000100
-vt 0.250050 0.000100
-vt 0.250050 0.749950
-vt 0.250050 0.999900
-vt 0.000100 0.749950
-vt 0.999900 0.250049
-vt 0.999900 0.749949
-vt 0.749950 0.749950
-vt 0.749950 0.250050
-usemtl Material.001
+v -0.45 1.3 -0.45
+v -0.45 1.3 -0.5
+v 0.45 1.3 -0.5
+v 0.45 1.3 -0.45
+v -0.45 1.5 -0.45
+v -0.45 1.5 -0.5
+v 0.45 1.5 -0.5
+v 0.45 1.5 -0.45
+v 0.45 -0.495 -0.5
+v 0.45 0.305 -0.5
+v -0.45 -0.495 -0.5
+v -0.45 0.305 -0.5
+v 0.45 -0.498 0.5
+v 0.45 -0.498 -0.5
+v 0.5 -0.498 -0.5
+v 0.5 -0.498 0.5
+v 0.45 1.499 0.5
+v 0.45 1.499 -0.5
+v 0.5 1.499 -0.5
+v 0.5 1.499 0.5
+v 0.5 -0.5 -0.5
+v 0.5 -0.5 0.5
+v -0.5 -0.5 0.5
+v -0.5 -0.5 -0.5
+v 0.5 1.5 -0.5
+v -0.5 1.5 -0.5
+v -0.5 1.5 0.5
+v 0.5 1.5 0.5
+v -0.5 -0.498 0.5
+v -0.5 -0.498 -0.5
+v -0.45 -0.498 -0.5
+v -0.45 -0.498 0.5
+v -0.5 1.499 0.5
+v -0.5 1.499 -0.5
+v -0.45 1.499 -0.5
+v -0.45 1.499 0.5
+v 0.45 0.305 -0.5
+v 0.45 0.474 -0.137
+v -0.45 0.305 -0.5
+v -0.45 0.474 -0.137
+v 0.45 0.473 -0.138
+v 0.45 0.614 -0.087
+v -0.45 0.473 -0.138
+v -0.45 0.614 -0.087
+v 0.45 0.611 -0.085
+v 0.45 1.399 0.054
+v -0.45 0.611 -0.085
+v -0.45 1.399 0.054
+v 0.45 1.395 0.055
+v 0.45 1.495 0.055
+v -0.45 1.395 0.055
+v -0.45 1.495 0.055
+vt 0.25 0.745
+vt 0.25 0.516
+vt 0.495 0.516
+vt 0.495 0.745
+vt 0.5 0.745
+vt 0.25 0.745
+vt 0.25 0.693
+vt 0.5 0.693
+vt 0.245 1
+vt 0 1
+vt 0 0.926
+vt 0.245 0.926
+vt 0 0.985
+vt 0.246 0.985
+vt 0.247 1
+vt 0.255 0.396
+vt 0.255 0.252
+vt 0.49 0.252
+vt 0.49 0.396
+vt 0.747 0.252
+vt 1.001 0.252
+vt 1 0.749
+vt 0.748 0.749
+vt 0.971 0.251
+vt 0.999 0.251
+vt 1 0.749
+vt 0.972 0.749
+vt 0.25 0.75
+vt 0 0.75
+vt 0.001 0.252
+vt 0.25 0.252
+vt 0.742 0.745
+vt 0.501 0.745
+vt 0.501 0.255
+vt 0.742 0.255
+vt 0.952 0.253
+vt 1 0.253
+vt 1 0.749
+vt 0.952 0.749
+vt 1 0.749
+vt 0.745 0.749
+vt 0.745 0.251
+vt 1.001 0.251
+vt 0.256 0.485
+vt 0.255 0.402
+vt 0.495 0.401
+vt 0.495 0.485
+vt 0.261 0.516
+vt 0.261 0.485
+vt 0.494 0.485
+vt 0.494 0.516
+vt 0 0.745
+vt 0 0.703
+vt 0.246 0.704
+vt 0.246 0.745
+vt 0.25 0.25
+vt 0 0.25
+vt 0 0
+vt 0.25 0
+vt 0.25 0.75
+vt 0.25 1
+vt 0 0.75
+vt 1 0.25
+vt 1 0.75
+vt 0.75 0.75
+vt 0.75 0.25
 s off
 f 46/1 45/2 47/3 48/4
-usemtl Material.001_tetris_arcade.png
 f 6/5 7/6 3/7 2/8
 f 8/9 5/10 1/11 4/12
 f 1/10 2/13 3/14 4/15
@@ -137,7 +131,6 @@ f 35/40 36/41 32/42 31/43
 f 38/44 37/45 39/46 40/47
 f 42/48 41/49 43/50 44/51
 f 50/52 49/53 51/54 52/55
-usemtl Material.001_NONE
 f 21/56 22/57 23/58 24/59
 f 25/60 26/61 27/10 28/62
 f 22/63 28/64 27/65 23/66