Переименован шейдер, обновлены модели

lab2/res/snowman.mtl

@@ -1,10 +1,10 @@
-# Blender MTL File: 'mesh_snowman.blend'
+# Blender MTL File: 'snowman.blend'
 # Material Count: 4
 
 newmtl Body-0
 Ns 250.000000
 Ka 1.000000 1.000000 1.000000
-Kd 0.310327 0.800000 0.457029
+Kd 0.041092 0.800000 0.056051
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.450000
@@ -14,7 +14,7 @@ illum 2
 newmtl Body-1
 Ns 250.000000
 Ka 1.000000 1.000000 1.000000
-Kd 0.569280 0.266345 0.800000
+Kd 0.249637 0.165539 0.800000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.450000
@@ -34,7 +34,7 @@ illum 2
 newmtl Neck
 Ns 250.000000
 Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.502547 0.345282
+Kd 0.800000 0.000000 0.626632
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.450000

lab2/res/xyz.obj

@@ -1,155 +1,229 @@
 # Blender v3.4.1 OBJ File: 'xyz.blend'
 # www.blender.org
 mtllib xyz.mtl
-o DirX_Cube.001
+o DirY_y
-v 0.000000 -0.039002 0.039002
+v -0.000000 1.000000 0.000000
-v 0.000000 0.039002 0.039002
+v 0.038239 0.900000 0.038239
-v 0.000000 -0.039002 -0.039002
+v 0.038239 0.900000 -0.038239
-v 0.000000 0.039002 -0.039002
+v -0.038239 0.900000 -0.038239
-v 0.874245 -0.039002 0.039002
+v -0.038239 0.900000 0.038239
-v 0.874245 0.039002 0.039002
+v 0.078238 0.900000 0.078239
-v 0.874245 -0.039002 -0.039002
+v 0.078238 0.900000 -0.078239
-v 0.874245 0.039002 -0.039002
+v -0.078239 0.900000 -0.078239
-v 0.871079 -0.088003 0.087236
+v -0.078239 0.900000 0.078239
-v 0.871079 0.088003 0.087236
+v 0.038239 0.050702 0.038239
-v 0.871079 -0.088003 -0.088770
+v 0.038239 0.050702 -0.038239
-v 0.871079 0.088003 -0.088770
+v -0.038239 0.050702 -0.038239
-v 0.999919 0.000000 -0.000767
+v -0.038239 0.050702 0.038239
-vn -1.0000 0.0000 0.0000
+vt 0.500000 0.000000
-vn 0.0000 0.0000 -1.0000
+vt 0.625000 0.250000
-vn 0.0000 0.0000 1.0000
+vt 0.375000 0.250000
-vn 0.0000 -1.0000 0.0000
+vt 0.375000 0.500000
-vn 0.0000 1.0000 0.0000
+vt 0.625000 0.500000
-vn 0.5640 0.0000 -0.8258
+vt 0.500000 0.875000
-vn 0.5640 0.0000 0.8258
+vt 0.125000 0.500000
-vn 0.5640 -0.8258 0.0000
+vt 0.875000 0.500000
-vn 0.5640 0.8258 0.0000
+vt 0.412763 0.500000
-usemtl Red
+vt 0.587237 0.500000
-s off
+vt 0.587237 0.500000
-f 2//1 3//1 1//1
+vt 0.342866 0.500000
-f 4//2 7//2 3//2
+vt 0.657135 0.500000
-f 6//3 1//3 5//3
+vt 0.412763 0.500000
-f 7//4 1//4 3//4
+vt 0.657135 0.500000
-f 4//5 6//5 8//5
+vt 0.342866 0.500000
-f 10//1 11//1 9//1
+vn 0.7876 0.6162 0.0000
-f 11//6 12//6 13//6
+vn -0.7876 0.6162 0.0000
-f 13//7 10//7 9//7
+vn 0.0000 0.6162 -0.7876
-f 11//8 13//8 9//8
+vn 0.0000 0.6162 0.7876
-f 13//9 12//9 10//9
+vn -1.0000 -0.0000 0.0000
-f 2//1 4//1 3//1
-f 4//2 8//2 7//2
-f 6//3 2//3 1//3
-f 7//4 5//4 1//4
-f 4//5 2//5 6//5
-f 10//1 12//1 11//1
-o DirY_Cube.004
-v 0.039002 0.000000 0.039002
-v -0.039002 0.000000 0.039002
-v 0.039002 0.000000 -0.039002
-v -0.039002 0.000000 -0.039002
-v 0.039002 0.874245 0.039002
-v -0.039002 0.874245 0.039002
-v 0.039002 0.874245 -0.039002
-v -0.039002 0.874245 -0.039002
-v 0.088003 0.871079 0.087236
-v -0.088003 0.871079 0.087236
-v 0.088003 0.871079 -0.088770
-v -0.088003 0.871079 -0.088770
-v -0.000000 0.999919 -0.000767
 vn 0.0000 -1.0000 0.0000
 vn 0.0000 0.0000 -1.0000
 vn 0.0000 0.0000 1.0000
 vn 1.0000 0.0000 0.0000
-vn -1.0000 -0.0000 0.0000
-vn 0.0000 0.5640 -0.8258
-vn 0.0000 0.5640 0.8258
-vn 0.8258 0.5640 0.0000
-vn -0.8258 0.5640 0.0000
 usemtl Green
 s off
-f 15//10 16//10 14//10
+f 1/1/1 6/2/1 7/3/1
-f 17//11 20//11 16//11
+f 8/4/2 9/5/2 1/6/2
-f 19//12 14//12 18//12
+f 7/7/3 8/4/3 1/6/3
-f 20//13 14//13 16//13
+f 9/5/4 6/8/4 1/6/4
-f 17//14 19//14 21//14
+f 4/9/5 13/10/5 5/11/5
-f 23//10 24//10 22//10
+f 3/12/6 6/8/6 2/13/6
-f 24//15 25//15 26//15
+f 4/9/6 7/7/6 3/12/6
-f 26//16 23//16 22//16
+f 2/13/6 9/5/6 5/11/6
-f 24//17 26//17 22//17
+f 5/11/6 8/4/6 4/9/6
-f 26//18 25//18 23//18
+f 3/12/7 12/14/7 4/9/7
-f 15//10 17//10 16//10
+f 5/11/8 10/15/8 2/13/8
-f 17//11 21//11 20//11
+f 2/13/9 11/16/9 3/12/9
-f 19//12 15//12 14//12
+f 4/9/5 12/14/5 13/10/5
-f 20//13 18//13 14//13
+f 3/12/6 7/7/6 6/8/6
-f 17//14 15//14 19//14
+f 4/9/6 8/4/6 7/7/6
-f 23//10 25//10 24//10
+f 2/13/6 6/8/6 9/5/6
-o DirZ_Cube.005
+f 5/11/6 9/5/6 8/4/6
-v -0.039002 -0.039002 0.000000
+f 3/12/7 11/16/7 12/14/7
-v -0.039002 0.039002 0.000000
+f 5/11/8 13/10/8 10/15/8
-v 0.039002 -0.039002 0.000000
+f 2/13/9 10/15/9 11/16/9
-v 0.039002 0.039002 0.000000
+o center_Cube
-v -0.039002 -0.039002 0.874245
+v -0.060000 -0.060000 -0.060000
-v -0.039002 0.039002 0.874245
+v -0.060000 -0.060000 0.060000
-v 0.039002 -0.039002 0.874245
+v -0.060000 0.060000 -0.060000
-v 0.039002 0.039002 0.874245
+v -0.060000 0.060000 0.060000
-v -0.087236 -0.088003 0.871079
+v 0.060000 -0.060000 -0.060000
-v -0.087236 0.088003 0.871079
+v 0.060000 -0.060000 0.060000
-v 0.088770 -0.088003 0.871079
+v 0.060000 0.060000 -0.060000
-v 0.088770 0.088003 0.871079
+v 0.060000 0.060000 0.060000
-v 0.000767 0.000000 0.999919
+vt 0.625000 0.000000
-vn 0.0000 0.0000 -1.0000
+vt 0.375000 0.250000
-vn 1.0000 0.0000 0.0000
+vt 0.375000 0.000000
-vn -1.0000 0.0000 -0.0000
+vt 0.625000 0.250000
-vn 0.0000 -1.0000 0.0000
+vt 0.375000 0.500000
-vn 0.0000 1.0000 0.0000
+vt 0.625000 0.500000
-vn 0.8258 0.0000 0.5640
+vt 0.375000 0.750000
-vn -0.8258 0.0000 0.5640
+vt 0.625000 0.750000
-vn 0.0000 -0.8258 0.5640
+vt 0.375000 1.000000
-vn 0.0000 0.8258 0.5640
+vt 0.125000 0.750000
-usemtl Blue
+vt 0.125000 0.500000
-s off
+vt 0.875000 0.500000
-f 28//19 29//19 27//19
+vt 0.625000 1.000000
-f 30//20 33//20 29//20
+vt 0.875000 0.750000
-f 32//21 27//21 31//21
-f 33//22 27//22 29//22
-f 30//23 32//23 34//23
-f 36//19 37//19 35//19
-f 37//24 38//24 39//24
-f 39//25 36//25 35//25
-f 37//26 39//26 35//26
-f 39//27 38//27 36//27
-f 28//19 30//19 29//19
-f 30//20 34//20 33//20
-f 32//21 28//21 27//21
-f 33//22 31//22 27//22
-f 30//23 28//23 32//23
-f 36//19 38//19 37//19
-o center_Cube.006
-v 0.062605 0.062605 -0.062605
-v 0.062605 -0.062605 -0.062605
-v 0.062605 0.062605 0.062605
-v 0.062605 -0.062605 0.062605
-v -0.062605 0.062605 -0.062605
-v -0.062605 -0.062605 -0.062605
-v -0.062605 0.062605 0.062605
-v -0.062605 -0.062605 0.062605
-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 1.0000 0.0000 0.0000
 vn 0.0000 -1.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 0.0000 0.0000 1.0000
 usemtl center_color
 s off
-f 41//28 40//28 42//28
+f 15/17/10 16/18/10 14/19/10
-f 43//29 42//29 46//29
+f 17/20/11 20/21/11 16/18/11
-f 47//30 46//30 44//30
+f 21/22/12 18/23/12 20/21/12
-f 45//31 44//31 40//31
+f 19/24/13 14/25/13 18/23/13
-f 46//32 42//32 40//32
+f 20/21/14 14/26/14 16/27/14
-f 43//33 47//33 45//33
+f 17/28/15 19/24/15 21/22/15
-f 41//28 42//28 43//28
+f 15/17/10 17/20/10 16/18/10
-f 43//29 46//29 47//29
+f 17/20/11 21/22/11 20/21/11
-f 47//30 44//30 45//30
+f 21/22/12 19/24/12 18/23/12
-f 45//31 40//31 41//31
+f 19/24/13 15/29/13 14/25/13
-f 46//32 40//32 44//32
+f 20/21/14 18/23/14 14/26/14
-f 43//33 45//33 41//33
+f 17/28/15 15/30/15 19/24/15
+o DirZ_z
+v -0.000000 -0.000000 1.000000
+v 0.038239 -0.038239 0.900000
+v 0.038238 0.038239 0.900000
+v -0.038239 0.038239 0.900000
+v -0.038239 -0.038239 0.900000
+v 0.078239 -0.078239 0.900000
+v 0.078238 0.078239 0.900000
+v -0.078239 0.078239 0.900000
+v -0.078239 -0.078239 0.900000
+v 0.038239 -0.038239 0.050702
+v 0.038239 0.038239 0.050702
+v -0.038239 0.038239 0.050702
+v -0.038239 -0.038239 0.050702
+vt 0.500000 0.000000
+vt 0.625000 0.250000
+vt 0.375000 0.250000
+vt 0.375000 0.500000
+vt 0.625000 0.500000
+vt 0.500000 0.875000
+vt 0.125000 0.500000
+vt 0.875000 0.500000
+vt 0.412763 0.500000
+vt 0.587237 0.500000
+vt 0.587237 0.500000
+vt 0.342866 0.500000
+vt 0.657135 0.500000
+vt 0.412763 0.500000
+vt 0.657135 0.500000
+vt 0.342866 0.500000
+vn 0.7876 0.0000 0.6162
+vn -0.7876 -0.0000 0.6162
+vn 0.0000 0.7876 0.6162
+vn 0.0000 -0.7876 0.6162
+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.0000 0.0000 0.0000
+usemtl Blue
+s off
+f 22/31/16 27/32/16 28/33/16
+f 29/34/17 30/35/17 22/36/17
+f 28/37/18 29/34/18 22/36/18
+f 30/35/19 27/38/19 22/36/19
+f 25/39/20 34/40/20 26/41/20
+f 24/42/21 27/38/21 23/43/21
+f 25/39/21 28/37/21 24/42/21
+f 23/43/21 30/35/21 26/41/21
+f 26/41/21 29/34/21 25/39/21
+f 24/42/22 33/44/22 25/39/22
+f 26/41/23 31/45/23 23/43/23
+f 23/43/24 32/46/24 24/42/24
+f 25/39/20 33/44/20 34/40/20
+f 24/42/21 28/37/21 27/38/21
+f 25/39/21 29/34/21 28/37/21
+f 23/43/21 27/38/21 30/35/21
+f 26/41/21 30/35/21 29/34/21
+f 24/42/22 32/46/22 33/44/22
+f 26/41/23 34/40/23 31/45/23
+f 23/43/24 31/45/24 32/46/24
+o DirX_x
+v 1.000000 0.000000 0.000000
+v 0.900000 -0.038239 0.038239
+v 0.900000 -0.038239 -0.038239
+v 0.900000 0.038239 -0.038239
+v 0.900000 0.038239 0.038239
+v 0.900000 -0.078239 0.078239
+v 0.900000 -0.078239 -0.078239
+v 0.900000 0.078239 -0.078239
+v 0.900000 0.078239 0.078239
+v 0.050702 -0.038239 0.038239
+v 0.050702 -0.038239 -0.038239
+v 0.050702 0.038239 -0.038239
+v 0.050702 0.038239 0.038239
+vt 0.500000 0.000000
+vt 0.625000 0.250000
+vt 0.375000 0.250000
+vt 0.375000 0.500000
+vt 0.625000 0.500000
+vt 0.500000 0.875000
+vt 0.125000 0.500000
+vt 0.875000 0.500000
+vt 0.412763 0.500000
+vt 0.587237 0.500000
+vt 0.587237 0.500000
+vt 0.342866 0.500000
+vt 0.657135 0.500000
+vt 0.412763 0.500000
+vt 0.657135 0.500000
+vt 0.342866 0.500000
+vn 0.6162 -0.7876 0.0000
+vn 0.6162 0.7876 0.0000
+vn 0.6162 0.0000 -0.7876
+vn 0.6162 0.0000 0.7876
+vn -0.0000 1.0000 0.0000
+vn -1.0000 -0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn -0.0000 0.0000 1.0000
+vn 0.0000 -1.0000 0.0000
+usemtl Red
+s off
+f 35/47/25 40/48/25 41/49/25
+f 42/50/26 43/51/26 35/52/26
+f 41/53/27 42/50/27 35/52/27
+f 43/51/28 40/54/28 35/52/28
+f 38/55/29 47/56/29 39/57/29
+f 37/58/30 40/54/30 36/59/30
+f 38/55/30 41/53/30 37/58/30
+f 36/59/30 43/51/30 39/57/30
+f 39/57/30 42/50/30 38/55/30
+f 37/58/31 46/60/31 38/55/31
+f 39/57/32 44/61/32 36/59/32
+f 36/59/33 45/62/33 37/58/33
+f 38/55/29 46/60/29 47/56/29
+f 37/58/30 41/53/30 40/54/30
+f 38/55/30 42/50/30 41/53/30
+f 36/59/30 40/54/30 43/51/30
+f 39/57/30 43/51/30 42/50/30
+f 37/58/31 45/62/31 46/60/31
+f 39/57/32 47/56/32 44/61/32
+f 36/59/33 44/61/33 45/62/33

lab2/src/render.cpp

@@ -81,7 +81,7 @@ int loadResources() {
         return -1;
     }
 
-    shader = Shader::loadShader("res/main.vsh", "res/main.fsh");
+    shader = Shader::loadShader("res/main-colored.vsh", "res/main-colored.fsh");
     if (shader == nullptr) {
         return -1;
     }