Skip to content
Snippets Groups Projects
Commit 5af6d9f0 authored by Woohyung Choi's avatar Woohyung Choi
Browse files

Merge branch 'master' of http://git.ajou.ac.kr/Choi/1

parents a0915a55 e4bb765e
No related branches found
No related tags found
No related merge requests found
Images/wooden_house/roof/roofTextureNo8703_1024x768_normal.png

1.02 MiB

Images/wooden_house/roof/roofTextureNo8703_1024x768_roughness.png

1.02 MiB

Images/wooden_house/wall/WoodPlanksOld0199_2_seamless_S.jpg

573 KiB

Images/wooden_house/window/WindowsHouseOld0418_1_M.jpg

1.34 MiB

Images/wooden_house/woodplank/Wooden_planks_05_1K_Base_Color.png

1.56 MiB

Images/wooden_house/woodplank/Wooden_planks_05_1K_Normal.png

2.13 MiB

Images/wooden_house/woodplank/Wooden_planks_05_1K_Roughness.png

795 KiB

......@@ -206,12 +206,14 @@ bool openObj(const std::string fileName, std::vector<glm::vec3> &vertices, std::
log_warn(infoLog, fileName + " : " + "faceVertexNormalIndices.size() : " + std::to_string(faceVertexNormalIndicies.size()));
}
}
}
ifs.close();
return true;
}
Image *load_Image(std::string fileName, int *width, int *height, int *nrChannels)
{
fileName = "../Images/" + fileName;
......
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment