projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build windows binary in the same directory
[laserbrain_demo]
/
src
/
sceneload.cc
diff --git
a/src/sceneload.cc
b/src/sceneload.cc
index
1996663
..
28f5877
100644
(file)
--- a/
src/sceneload.cc
+++ b/
src/sceneload.cc
@@
-68,6
+68,9
@@
bool Scene::load(const char *fname, unsigned int flags)
}
info_log("Loading scene file: %s\n", fname);
}
info_log("Loading scene file: %s\n", fname);
+ if(this->name.empty()) {
+ this->name = std::string(fname);
+ }
const aiScene *aiscn = aiImportFile(fname, ppflags);
if(!aiscn) {
const aiScene *aiscn = aiImportFile(fname, ppflags);
if(!aiscn) {
@@
-332,7
+335,7
@@
static int assimp_textype(aiTextureType type)
case aiTextureType_EMISSIVE:
return MTL_TEX_LIGHTMAP;
case aiTextureType_REFLECTION:
case aiTextureType_EMISSIVE:
return MTL_TEX_LIGHTMAP;
case aiTextureType_REFLECTION:
- return MTL_TEX_ENVMAP;
+ return MTL_TEX_REFLECT;
default:
break;
}
default:
break;
}