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
Merge "DALi Version 2.1.23" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-scene-loader
/
public-api
/
mesh-definition.h
diff --git
a/dali-scene-loader/public-api/mesh-definition.h
b/dali-scene-loader/public-api/mesh-definition.h
index
cd0ddc9
..
2fe4394
100644
(file)
--- a/
dali-scene-loader/public-api/mesh-definition.h
+++ b/
dali-scene-loader/public-api/mesh-definition.h
@@
-177,7
+177,7
@@
struct DALI_SCENE_LOADER_API MeshDefinition
std::vector<uint16_t> mIndices;
std::vector<Attrib> mAttribs;
std::vector<uint16_t> mIndices;
std::vector<Attrib> mAttribs;
- unsigned int mBlendShapeBufferOffset;
+ unsigned int mBlendShapeBufferOffset
{0}
;
Dali::Vector<float> mBlendShapeUnnormalizeFactor;
PixelData mBlendShapeData;
};
Dali::Vector<float> mBlendShapeUnnormalizeFactor;
PixelData mBlendShapeData;
};
@@
-243,9
+243,11
@@
public: // DATA
Accessor mPositions;
Accessor mNormals; // data can be generated based on positions
Accessor mTexCoords;
Accessor mPositions;
Accessor mNormals; // data can be generated based on positions
Accessor mTexCoords;
+ Accessor mColors;
Accessor mTangents; // data can be generated based on normals and texCoords (the latter isn't mandatory; the results will be better if available)
Accessor mJoints0;
Accessor mWeights0;
Accessor mTangents; // data can be generated based on normals and texCoords (the latter isn't mandatory; the results will be better if available)
Accessor mJoints0;
Accessor mWeights0;
+ Property::Type mTangentType{Property::VECTOR3};
Blob mBlendShapeHeader;
std::vector<BlendShape> mBlendShapes;
Blob mBlendShapeHeader;
std::vector<BlendShape> mBlendShapes;