v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unused CopyValue

pull/1423/head
Daniel Hritzkiv 2017-09-01 18:29:30 -04:00
parent 63ef19d9ad
commit 2abdbdb55e
No known key found for this signature in database
GPG Key ID: D1D19875679D5CBF
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/glTF2Importer.cpp
View File

@ -136,10 +136,10 @@ static void CopyValue(const glTF2::vec4& v, aiColor4D& out)
out.r = v[0]; out.g = v[1]; out.b = v[2]; out.a = v[3]; out.r = v[0]; out.g = v[1]; out.b = v[2]; out.a = v[3];
} }
static void CopyValue(const glTF2::vec4& v, aiColor3D& out) /*static void CopyValue(const glTF2::vec4& v, aiColor3D& out)
{ {
out.r = v[0]; out.g = v[1]; out.b = v[2]; out.r = v[0]; out.g = v[1]; out.b = v[2];
} }*/
static void CopyValue(const glTF2::vec3& v, aiColor4D& out) static void CopyValue(const glTF2::vec3& v, aiColor4D& out)
{ {
@ -173,14 +173,9 @@ inline void SetMaterialColorProperty(Asset& r, vec4& prop, aiMaterial* mat, cons
inline void SetMaterialColorProperty(Asset& r, vec3& prop, aiMaterial* mat, const char* pKey, unsigned int type, unsigned int idx) inline void SetMaterialColorProperty(Asset& r, vec3& prop, aiMaterial* mat, const char* pKey, unsigned int type, unsigned int idx)
{ {
vec4 prop4; aiColor4D col;
CopyValue(prop, col);
prop4[0] = prop[0]; mat->AddProperty(&col, 1, pKey, type, idx);
prop4[1] = prop[1];
prop4[2] = prop[2];
prop4[3] = 1;
return SetMaterialColorProperty(r, prop4, mat, pKey, type, idx);
} }
inline void SetMaterialTextureProperty(std::vector<int>& embeddedTexIdxs, Asset& r, glTF2::TextureInfo prop, aiMaterial* mat, aiTextureType texType, unsigned int texSlot = 0) inline void SetMaterialTextureProperty(std::vector<int>& embeddedTexIdxs, Asset& r, glTF2::TextureInfo prop, aiMaterial* mat, aiTextureType texType, unsigned int texSlot = 0)