Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes for warnings in FBXReader/FBXWriter

Browse source
This commit is contained in:
Stephen Birarda 2017-09-13 08:37:36 -07:00
parent 8a9e4029ae
commit dc86c6fe73
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/baking/CMakeLists.txt
View file

@ -6,5 +6,5 @@ include_hifi_library_headers(gpu)
add_dependency_external_projects(draco) add_dependency_external_projects(draco)
find_package(Draco REQUIRED) find_package(Draco REQUIRED)
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${DRACO_INCLUDE_DIRS}) include_directories(SYSTEM ${DRACO_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARY} ${DRACO_ENCODER_LIBRARY}) target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARY} ${DRACO_ENCODER_LIBRARY})

2
libraries/fbx/CMakeLists.txt
View file

@ -6,5 +6,5 @@ include_hifi_library_headers(gpu image)
add_dependency_external_projects(draco) add_dependency_external_projects(draco)
find_package(Draco REQUIRED) find_package(Draco REQUIRED)
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${DRACO_INCLUDE_DIRS}) include_directories(SYSTEM ${DRACO_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARY} ${DRACO_ENCODER_LIBRARY}) target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARY} ${DRACO_ENCODER_LIBRARY})

6
libraries/fbx/src/FBXReader.cpp
View file

@ -169,7 +169,7 @@ QString getID(const QVariantList& properties, int index = 0) {
} }
/// The names of the joints in the Maya HumanIK rig /// The names of the joints in the Maya HumanIK rig
static const std::array<char*, 16> HUMANIK_JOINTS = { static const std::array<const char*, 16> HUMANIK_JOINTS = {{
"RightHand", "RightHand",
"RightForeArm", "RightForeArm",
"RightArm", "RightArm",
@ -186,7 +186,7 @@ static const std::array<char*, 16> HUMANIK_JOINTS = {
"LeftLeg", "LeftLeg",
"RightFoot", "RightFoot",
"LeftFoot" "LeftFoot"
}; }};
class FBXModel { class FBXModel {
public: public:
@ -512,7 +512,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
QVector<QString> humanIKJointNames; QVector<QString> humanIKJointNames;
for (int i = 0; i < HUMANIK_JOINTS.size(); i++) { for (int i = 0; i < (int) HUMANIK_JOINTS.size(); i++) {
QByteArray jointName = HUMANIK_JOINTS[i]; QByteArray jointName = HUMANIK_JOINTS[i];
humanIKJointNames.append(processID(getString(joints.value(jointName, jointName)))); humanIKJointNames.append(processID(getString(joints.value(jointName, jointName))));
} }

12
libraries/fbx/src/FBXWriter.cpp
View file

@ -143,7 +143,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
break; break;
} }
// TODO Delete? Do we ever use QList instead of QVector? // TODO Delete? Do we ever use QList instead of QVector?
case QVariant::Type::List: case QVariant::Type::List:
{ {
auto list = prop.toList(); auto list = prop.toList();
@ -156,7 +156,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
out << (int32_t)0; out << (int32_t)0;
out << (int32_t)0; out << (int32_t)0;
for (auto& innerProp : list) { for (auto& innerProp : list) {
out << prop.toFloat(); out << innerProp.toFloat();
} }
break; break;
@ -166,7 +166,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
out << (int32_t)0; out << (int32_t)0;
out << (int32_t)0; out << (int32_t)0;
for (auto& innerProp : list) { for (auto& innerProp : list) {
out << prop.toDouble(); out << innerProp.toDouble();
} }
break; break;
@ -176,7 +176,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
out << (int32_t)0; out << (int32_t)0;
out << (int32_t)0; out << (int32_t)0;
for (auto& innerProp : list) { for (auto& innerProp : list) {
out << prop.toLongLong(); out << innerProp.toLongLong();
} }
break; break;
@ -186,7 +186,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
out << (int32_t)0; out << (int32_t)0;
out << (int32_t)0; out << (int32_t)0;
for (auto& innerProp : list) { for (auto& innerProp : list) {
out << prop.toInt(); out << innerProp.toInt();
} }
break; break;
@ -196,7 +196,7 @@ void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
out << (int32_t)0; out << (int32_t)0;
out << (int32_t)0; out << (int32_t)0;
for (auto& innerProp : list) { for (auto& innerProp : list) {
out << prop.toBool(); out << innerProp.toBool();
} }
break; break;
} }