dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch FbxDouble4 uses to FbxVector4, clean up.

This commit is contained in:
Par Winzell 2017-11-03 21:48:41 -07:00
parent 0fcd00cb5b
commit 14150269a0
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Fbx2Raw.cpp
View File

@ -92,13 +92,13 @@ class FbxMaterialAccess
{ {
struct FbxMaterialProperties { struct FbxMaterialProperties {
FbxFileTexture *texAmbient {}; FbxFileTexture *texAmbient {};
FbxDouble4 colAmbient {}; FbxVector4 colAmbient {};
FbxFileTexture *texSpecular {}; FbxFileTexture *texSpecular {};
FbxDouble4 colSpecular {}; FbxVector4 colSpecular {};
FbxFileTexture *texDiffuse {}; FbxFileTexture *texDiffuse {};
FbxDouble4 colDiffuse {}; FbxVector4 colDiffuse {};
FbxFileTexture *texEmissive {}; FbxFileTexture *texEmissive {};
FbxDouble4 colEmissive {}; FbxVector4 colEmissive {};
FbxFileTexture *texNormal {}; FbxFileTexture *texNormal {};
FbxFileTexture *texShininess {}; FbxFileTexture *texShininess {};
FbxDouble shininess {}; FbxDouble shininess {};
@ -129,7 +129,7 @@ public:
// four properties are on the same structure and follow the same rules // four properties are on the same structure and follow the same rules
auto handleBasicProperty = [&](const char *colName, const char *facName) { auto handleBasicProperty = [&](const char *colName, const char *facName) {
FbxFileTexture *colTex, *facTex; FbxFileTexture *colTex, *facTex;
FbxDouble4 vec; FbxVector4 vec;
std::tie(vec, colTex, facTex) = getSurfaceValues(colName, facName); std::tie(vec, colTex, facTex) = getSurfaceValues(colName, facName);
if (colTex) { if (colTex) {
@ -157,7 +157,7 @@ public:
std::tie(res.shininess, res.texShininess) = getSurfaceScalar(FbxSurfaceMaterial::sShininess); std::tie(res.shininess, res.texShininess) = getSurfaceScalar(FbxSurfaceMaterial::sShininess);
// for transparency we just want a constant vector value; // for transparency we just want a constant vector value;
FbxDouble4 transparency; FbxVector4 transparency;
// extract any existing textures only so we can warn that we're throwing them away // extract any existing textures only so we can warn that we're throwing them away
FbxFileTexture *colTex, *facTex; FbxFileTexture *colTex, *facTex;
std::tie(transparency, colTex, facTex) = std::tie(transparency, colTex, facTex) =
@ -204,7 +204,7 @@ public:
return std::make_tuple(val, tex); return std::make_tuple(val, tex);
} }
std::tuple<FbxDouble4, FbxFileTexture *, FbxFileTexture *> getSurfaceValues(const char *colName, const char *facName) const std::tuple<FbxVector4, FbxFileTexture *, FbxFileTexture *> getSurfaceValues(const char *colName, const char *facName) const
{ {
const FbxProperty colProp = fbxMaterial->FindProperty(colName); const FbxProperty colProp = fbxMaterial->FindProperty(colName);
const FbxProperty facProp = fbxMaterial->FindProperty(facName); const FbxProperty facProp = fbxMaterial->FindProperty(facName);
@ -227,7 +227,7 @@ public:
factorVal = facProp.Get<FbxDouble>(); factorVal = facProp.Get<FbxDouble>();
} }
auto val = FbxDouble4( auto val = FbxVector4(
colorVal[0] * factorVal, colorVal[0] * factorVal,
colorVal[1] * factorVal, colorVal[1] * factorVal,
colorVal[2] * factorVal, colorVal[2] * factorVal,
@ -552,7 +552,7 @@ static void ReadMesh(RawModel &raw, FbxScene *pScene, FbxNode *pNode, const std:
std::fill_n(textures, RAW_TEXTURE_USAGE_MAX, -1); std::fill_n(textures, RAW_TEXTURE_USAGE_MAX, -1);
FbxString shadingModel, materialName; FbxString shadingModel, materialName;
FbxDouble4 ambient, specular, diffuse, emissive; FbxVector4 ambient, specular, diffuse, emissive;
FbxDouble shininess; FbxDouble shininess;
if (fbxMaterial == nullptr) { if (fbxMaterial == nullptr) {
@ -588,13 +588,10 @@ static void ReadMesh(RawModel &raw, FbxScene *pScene, FbxNode *pNode, const std:
maybeAddTexture(matProps.texShininess, RAW_TEXTURE_USAGE_SHININESS); maybeAddTexture(matProps.texShininess, RAW_TEXTURE_USAGE_SHININESS);
} }
auto toVec3 = [](FbxDouble4 vec4) { return Vec3f(vec4[0], vec4[1], vec4[2]); };
auto toVec4 = [](FbxDouble4 vec4) { return Vec4f(vec4[0], vec4[1], vec4[2], vec4[3]); };
const RawMaterialType materialType = GetMaterialType(raw, textures, skinning.IsSkinned()); const RawMaterialType materialType = GetMaterialType(raw, textures, skinning.IsSkinned());
const int rawMaterialIndex = raw.AddMaterial( const int rawMaterialIndex = raw.AddMaterial(
materialName, shadingModel, materialType, textures, materialName, shadingModel, materialType, textures,
toVec3(ambient), toVec4(diffuse), toVec3(specular), toVec3(emissive), shininess); toVec3f(ambient), toVec4f(diffuse), toVec3f(specular), toVec3f(emissive), shininess);
RawVertex rawVertices[3]; RawVertex rawVertices[3];
for (int vertexIndex = 0; vertexIndex < 3; vertexIndex++, polygonVertexIndex++) { for (int vertexIndex = 0; vertexIndex < 3; vertexIndex++, polygonVertexIndex++) {

4
src/mathfu.h
View File

@ -75,6 +75,10 @@ static inline Vec3f toVec3f(const FbxVector4 &v) {
return Vec3f((float) v[0], (float) v[1], (float) v[2]); return Vec3f((float) v[0], (float) v[1], (float) v[2]);
} }
static inline Vec4f toVec4f(const FbxVector4 &v) {
return Vec4f((float) v[0], (float) v[1], (float) v[2], (float) v[3]);
}
static inline Mat4f toMat4f(const FbxAMatrix &m) { static inline Mat4f toMat4f(const FbxAMatrix &m) {
auto result = Mat4f(); auto result = Mat4f();
for (int row = 0; row < 4; row ++) { for (int row = 0; row < 4; row ++) {