projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for object loader not handling flags correctly.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
model3d-view
/
obj-loader.h
diff --git
a/dali-toolkit/internal/controls/model3d-view/obj-loader.h
b/dali-toolkit/internal/controls/model3d-view/obj-loader.h
index
b9d8a6a
..
0a9ea25
100644
(file)
--- a/
dali-toolkit/internal/controls/model3d-view/obj-loader.h
+++ b/
dali-toolkit/internal/controls/model3d-view/obj-loader.h
@@
-112,12
+112,23
@@
public:
void ClearArrays();
void ClearArrays();
+ bool IsTexturePresent();
+ bool IsDiffuseMapPresent();
+ bool IsNormalMapPresent();
+ bool IsSpecularMapPresent();
+
private:
BoundingVolume mSceneAABB;
bool mSceneLoaded;
bool mMaterialLoaded;
private:
BoundingVolume mSceneAABB;
bool mSceneLoaded;
bool mMaterialLoaded;
+ bool mHasTexturePoints;
+
+ //Material file properties.
+ bool mHasDiffuseMap;
+ bool mHasNormalMap;
+ bool mHasSpecularMap;
Dali::Vector<Vector3> mPoints;
Dali::Vector<Vector2> mTextures;
Dali::Vector<Vector3> mPoints;
Dali::Vector<Vector2> mTextures;