Skip to content

Commit 69e93ff

Browse files
committed
Draw normals with sphere
1 parent 79d8c3b commit 69e93ff

File tree

4 files changed

+2506
-7
lines changed

4 files changed

+2506
-7
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ StyleCopReport.xml
6868
*_h.h
6969
*.ilk
7070
*.meta
71-
*.obj
7271
*.iobj
7372
*.pch
7473
*.pdb

P4GLSL/scr/main.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ void initOGL()
233233

234234
proj = glm::perspective(glm::radians(60.0f), 1.0f, 1.0f, 50.0f);
235235
view = glm::mat4(1.0f);
236-
view[3].z = -45.0f;
236+
view[3].z = -80.0f;
237237
}
238238

239239

@@ -435,7 +435,7 @@ void initObj()
435435
{
436436

437437
const struct aiScene* scene = NULL;
438-
scene = aiImportFile(R"(../model/teapot.obj)", aiProcess_GenNormals);
438+
scene = aiImportFile(R"(../model/sphere.obj)", aiProcess_GenNormals);
439439
auto scene2 = aiApplyPostProcessing(scene, aiProcess_CalcTangentSpace);
440440
auto mesh = scene2->mMeshes[0];
441441

@@ -681,7 +681,7 @@ void renderFunc()
681681

682682
model = glm::mat4(2.0f);
683683
model[3].w = 1.0f;
684-
model = glm::rotate(model, angle, glm::vec3(1.0f, 1.0f, 0.0f));
684+
//model = glm::rotate(model, angle, glm::vec3(1.0f, 1.0f, 0.0f));
685685
renderCube();
686686
renderCubeNormals();
687687

@@ -794,6 +794,8 @@ void renderCubeNormals()
794794
glm::mat4 modelView = view * model;
795795
glm::mat4 modelViewProj = proj * view * model;
796796
glm::mat4 normal = glm::transpose(glm::inverse(modelView));
797+
glDisable(GL_CULL_FACE);
798+
797799

798800
if (uModelViewMatNormals != -1)
799801
glUniformMatrix4fv(uModelViewMatNormals, 1, GL_FALSE,

0 commit comments

Comments
 (0)