projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow materials to not have some properties
[opengl.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index fd6159dcd3cf665ff0a822f52137646ed6b8c275..aa78a224281b54efff84c3012daaa587b6add1fb 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-205,7
+205,8
@@
void init() {
pbrProg = new Program("pbrvert.glsl", "pbrfrag.glsl");
glUseProgram(pbrProg->progId);
pbrProg = new Program("pbrvert.glsl", "pbrfrag.glsl");
glUseProgram(pbrProg->progId);
- const aiScene *scene = importer.ReadFile("models/newtonsCradle.glb", aiProcess_Triangulate | aiProcess_CalcTangentSpace | aiProcess_GenNormals | aiProcess_FlipUVs);
+ const std::string scenePath = "models/ik.glb";
+ const aiScene *scene = importer.ReadFile(scenePath, aiProcess_Triangulate | aiProcess_CalcTangentSpace | aiProcess_GenNormals | aiProcess_FlipUVs);
if (!scene) {
std::cerr << importer.GetErrorString() << std::endl;
exit(1);
if (!scene) {
std::cerr << importer.GetErrorString() << std::endl;
exit(1);