From d21668cb1e1e22dec6224607569e16106b50f749 Mon Sep 17 00:00:00 2001 From: "R.E. Kovalev" Date: Tue, 20 Jun 2023 09:38:26 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BF=D0=BB=D0=BE=D1=81=D0=BA=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 6484665..05b5571 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -311,7 +311,7 @@ int main(void) ssaoBlurShader.link(); // Модель прямоугольника - GrouptedModel rectangle = loadOBJtoGroupted("../resources/models/plane2.obj", "../resources/models/", "../resources/textures/"); + Model rectangle = loadOBJtoGroupted("../resources/models/plane2.obj", "../resources/models/", "../resources/textures/").parts[0]; // Зададим горизонтальное положение перед камерой rectangle.position.y = -1; @@ -321,11 +321,11 @@ int main(void) // Текстуры для прямоугольника Texture rectangle_diffuse(TEX_DIFFUSE, "../resources/textures/rekovalev_diffusemap.png"); - rectangle.parts[0].set_texture(rectangle_diffuse); + rectangle.set_texture(rectangle_diffuse); Texture rectangle_normal(TEX_NORMAL, "../resources/textures/rekovalev_normalmap.png"); - rectangle.parts[0].set_texture(rectangle_normal); + rectangle.set_texture(rectangle_normal); Texture rectangle_heights(TEX_HEIGHTS, "../resources/textures/rekovalev_bumpmap.png"); - rectangle.parts[0].set_texture(rectangle_heights); + rectangle.set_texture(rectangle_heights); // Вершины для скайбокса glm::vec3 skybox_verticies[] = {