Merge remote-tracking branch 'upstream/master'

homedecor_common/models/homedecor_cube.obj

@@ -1,19 +1,16 @@
-# Blender v2.73 (sub 0) OBJ File: 'cobe+1.001.blend'
-# www.blender.org
-o Cylinder
-v -0.499500 -0.499500 0.499500
-v -0.499500 -0.499500 -0.499500
-v 0.499500 -0.499500 -0.499500
-v 0.499500 -0.499500 0.499500
-v -0.499500 0.499500 0.499500
-v -0.499500 0.499500 -0.499500
-v 0.499500 0.499500 -0.499500
-v 0.499500 0.499500 0.499500
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-g Cylinder_Cylinder_None
+v -0.499 -0.499 0.5
+v -0.499 -0.499 -0.499
+v 0.5 -0.499 -0.499
+v 0.5 -0.499 0.5
+v -0.499 0.5 0.5
+v -0.499 0.5 -0.499
+v 0.5 0.5 -0.499
+v 0.5 0.5 0.5
+vt 1 1
+vt 0 1
+vt 0 0
+vt 1 0
+g 1
 s off
 f 5/1 6/2 2/3 1/4
 f 6/1 7/2 3/3 2/4

homedecor_common/models/homedecor_slope.obj

@@ -1,26 +1,23 @@
-# Blender v2.73 (sub 0) OBJ File: 'slope_test_slope_onetexture.blend'
-# www.blender.org
-o Cube_Cube.002
-v 0.500000 0.500000 0.500000
-v -0.500000 0.500000 0.500000
-v -0.500000 -0.500000 0.500000
-v 0.500000 -0.500000 0.500000
-v -0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 -0.500000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vn 0.000000 -0.000000 1.000000
-vn 0.000000 -1.000000 -0.000000
-vn 0.000000 0.707100 -0.707100
-vn -1.000000 0.000000 0.000000
-vn 1.000000 0.000000 0.000000
-g Cube_Cube.002_Cube_Cube.002_front-back-bottom
+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 -0.5 -0.5
+v 0.5 -0.5 -0.5
+vt 1 1
+vt 0 1
+vt 0 0
+vt 1 0
+vn 0 0 1
+vn 0 -1 0
+vn 0 0.707 -0.707
+vn -1 0 0
+vn 1 0 0
+g 1
 s off
 f 1/1/1 2/2/1 3/3/1 4/4/1
 f 4/3/2 3/4/2 5/1/2 6/2/2
 f 2/1/3 1/2/3 6/3/3 5/4/3
-g Cube_Cube.002_Cube_Cube.002_sides
+g 2
 f 2/1/4 5/3/4 3/4/4
 f 1/2/5 4/3/5 6/4/5

homedecor_common/models/homedecor_slope_inner_corner.obj

@@ -1,27 +1,24 @@
-# Blender v2.73 (sub 0) OBJ File: 'slope_test_icorner_onetexture.blend'
-# www.blender.org
-o Cube_Cube.000
-v 0.500000 0.500000 0.500000
-v -0.500000 0.500000 0.500000
-v -0.500000 -0.500000 0.500000
-v 0.500000 -0.500000 0.500000
-v -0.500000 -0.500000 -0.500000
-v 0.500000 0.500000 -0.500000
-v 0.500000 -0.500000 0.500000
-v 0.500000 -0.500000 -0.500000
-v -0.500000 -0.500000 -0.500000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vn 1.000000 -0.000000 0.000000
-vn -1.000000 0.000000 0.000000
-vn 0.000000 0.707100 -0.707100
-vn 0.000000 -0.000000 -1.000000
-vn -0.000000 -1.000000 -0.000000
-vn -0.000000 -0.000000 1.000000
-vn -0.707100 0.707100 -0.000000
-g Cube_Cube.000_Cube_Cube.000_None
+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 -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 -0.5 -0.5
+vt 1 1
+vt 0 1
+vt 0 0
+vt 1 0
+vn 1 0 0
+vn -1 0 0
+vn 0 0.707 -0.707
+vn 0 0 -1
+vn 0 -1 0
+vn 0 0 1
+vn -0.707 0.707 0
+g 1
 s off
 f 6/1/1 1/2/1 7/3/1 8/4/1
 f 2/1/2 5/3/2 3/4/2
@@ -30,5 +27,3 @@ f 6/2/4 8/3/4 9/4/4
 f 9/1/5 8/2/5 7/3/5 3/4/5
 f 3/3/6 7/4/6 1/1/6 2/2/6
 f 1/1/7 6/2/7 9/3/7
-l 1 4
-l 3 4

homedecor_common/models/homedecor_slope_outer_corner.obj

@@ -1,21 +1,18 @@
-# Blender v2.73 (sub 0) OBJ File: 'slope_test_ocorner_onetexture.blend'
-# www.blender.org
-o Cube_Cube.002
-v 0.500000 0.500000 0.500000
-v -0.500000 -0.500000 0.500000
-v 0.500000 -0.500000 0.500000
-v -0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 -0.500000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vn 0.000000 -1.000000 -0.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 -0.000000 1.000000
-vn -0.707100 0.707100 0.000000
-vn 0.000000 0.707100 -0.707100
-g Cube_Cube.002_Cube_Cube.002_None
+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 -0.5 -0.5
+vt 1 1
+vt 0 1
+vt 0 0
+vt 1 0
+vn 0 -1 0
+vn 1 0 0
+vn 0 0 1
+vn -0.707 0.707 0
+vn 0 0.707 -0.707
+g 1
 s off
 f 3/1/1 2/2/1 4/3/1 5/4/1
 f 1/2/2 3/3/2 5/4/2