Skip to content

Commit 50b992e

Browse files
committed
Mostly done
1 parent e3883a3 commit 50b992e

File tree

7 files changed

+2387
-16
lines changed

7 files changed

+2387
-16
lines changed

P4GLSL/scr/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ void initOGL()
273273

274274
proj = glm::perspective(glm::radians(60.0f), 1.0f, 1.0f, 50.0f);
275275
view = glm::mat4(1.0f);
276-
view[3].z = -40.0f;
276+
view[3].z = -2.0f;
277277
}
278278

279279

@@ -644,7 +644,7 @@ void initObj()
644644
{
645645

646646
const struct aiScene* scene = NULL;
647-
scene = aiImportFile(R"(../model/teapot.obj)", aiProcess_GenNormals);
647+
scene = aiImportFile(R"(../model/teapot2.obj)", aiProcess_GenNormals);
648648
auto scene2 = aiApplyPostProcessing(scene, aiProcess_CalcTangentSpace);
649649
auto mesh = scene2->mMeshes[0];
650650

0 commit comments

Comments
 (0)