Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-02 10:01:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1123 from ctrlaltdavid/fix/gltf-vertex-colors

Browse source 
Fix glTF vertex colors
This commit is contained in:
Kalila 2021-03-30 17:56:07 -04:00 committed by GitHub
commit edf835e48f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -1863,7 +1863,7 @@ void GLTFSerializer::setHFMMaterial(HFMMaterial& hfmMat, const GLTFMaterial& mat
template<typename T, typename L> template<typename T, typename L>
bool GLTFSerializer::readArray(const hifi::ByteArray& bin, int byteOffset, int count, bool GLTFSerializer::readArray(const hifi::ByteArray& bin, int byteOffset, int count,
QVector<L>& outarray, int accessorType) { QVector<L>& outarray, int accessorType, bool normalized) {
QDataStream blobstream(bin); QDataStream blobstream(bin);
blobstream.setByteOrder(QDataStream::LittleEndian); blobstream.setByteOrder(QDataStream::LittleEndian);
@ -1899,12 +1899,22 @@ bool GLTFSerializer::readArray(const hifi::ByteArray& bin, int byteOffset, int c
blobstream.setDevice(nullptr); blobstream.setDevice(nullptr);
return false; return false;
} }
float scale = 1.0f; // Normalized output values should always be floats.
if (normalized) {
scale = (float)(std::numeric_limits<T>::max)();
}
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
for (int j = 0; j < bufferCount; ++j) { for (int j = 0; j < bufferCount; ++j) {
if (!blobstream.atEnd()) { if (!blobstream.atEnd()) {
T value; T value;
blobstream >> value; blobstream >> value;
outarray.push_back(value); if (normalized) {
outarray.push_back(std::max((float)value / scale, -1.0f));
} else {
outarray.push_back(value);
}
} else { } else {
blobstream.setDevice(nullptr); blobstream.setDevice(nullptr);
return false; return false;
@ -1917,24 +1927,24 @@ bool GLTFSerializer::readArray(const hifi::ByteArray& bin, int byteOffset, int c
} }
template<typename T> template<typename T>
bool GLTFSerializer::addArrayOfType(const hifi::ByteArray& bin, int byteOffset, int count, bool GLTFSerializer::addArrayOfType(const hifi::ByteArray& bin, int byteOffset, int count,
QVector<T>& outarray, int accessorType, int componentType) { QVector<T>& outarray, int accessorType, int componentType, bool normalized) {
switch (componentType) { switch (componentType) {
case GLTFAccessorComponentType::BYTE: {} case GLTFAccessorComponentType::BYTE: {}
case GLTFAccessorComponentType::UNSIGNED_BYTE: { case GLTFAccessorComponentType::UNSIGNED_BYTE: {
return readArray<uchar>(bin, byteOffset, count, outarray, accessorType); return readArray<uchar>(bin, byteOffset, count, outarray, accessorType, normalized);
} }
case GLTFAccessorComponentType::SHORT: { case GLTFAccessorComponentType::SHORT: {
return readArray<short>(bin, byteOffset, count, outarray, accessorType); return readArray<short>(bin, byteOffset, count, outarray, accessorType, normalized);
} }
case GLTFAccessorComponentType::UNSIGNED_INT: { case GLTFAccessorComponentType::UNSIGNED_INT: {
return readArray<uint>(bin, byteOffset, count, outarray, accessorType); return readArray<uint>(bin, byteOffset, count, outarray, accessorType, normalized);
} }
case GLTFAccessorComponentType::UNSIGNED_SHORT: { case GLTFAccessorComponentType::UNSIGNED_SHORT: {
return readArray<ushort>(bin, byteOffset, count, outarray, accessorType); return readArray<ushort>(bin, byteOffset, count, outarray, accessorType, normalized);
} }
case GLTFAccessorComponentType::FLOAT: { case GLTFAccessorComponentType::FLOAT: {
return readArray<float>(bin, byteOffset, count, outarray, accessorType); return readArray<float>(bin, byteOffset, count, outarray, accessorType, normalized);
} }
} }
return false; return false;
@ -1951,11 +1961,11 @@ bool GLTFSerializer::addArrayFromAccessor(GLTFAccessor& accessor, QVector<T>& ou
int accBoffset = accessor.defined["byteOffset"] ? accessor.byteOffset : 0; int accBoffset = accessor.defined["byteOffset"] ? accessor.byteOffset : 0;
success = addArrayOfType(buffer.blob, bufferview.byteOffset + accBoffset, accessor.count, outarray, accessor.type, success = addArrayOfType(buffer.blob, bufferview.byteOffset + accBoffset, accessor.count, outarray, accessor.type,
accessor.componentType); accessor.componentType, accessor.normalized);
} else { } else {
for (int i = 0; i < accessor.count; ++i) { for (int i = 0; i < accessor.count; ++i) {
T value; T value;
memset(&value, 0, sizeof(T)); // Make sure the dummy array is initalised to zero. memset(&value, 0, sizeof(T)); // Make sure the dummy array is initialized to zero.
outarray.push_back(value); outarray.push_back(value);
} }
} }
@ -1971,7 +1981,7 @@ bool GLTFSerializer::addArrayFromAccessor(GLTFAccessor& accessor, QVector<T>& ou
success = addArrayOfType(sparseIndicesBuffer.blob, sparseIndicesBufferview.byteOffset + accSIBoffset, success = addArrayOfType(sparseIndicesBuffer.blob, sparseIndicesBufferview.byteOffset + accSIBoffset,
accessor.sparse.count, out_sparse_indices_array, GLTFAccessorType::SCALAR, accessor.sparse.count, out_sparse_indices_array, GLTFAccessorType::SCALAR,
accessor.sparse.indices.componentType); accessor.sparse.indices.componentType, false);
if (success) { if (success) {
QVector<T> out_sparse_values_array; QVector<T> out_sparse_values_array;
@ -1981,7 +1991,8 @@ bool GLTFSerializer::addArrayFromAccessor(GLTFAccessor& accessor, QVector<T>& ou
int accSVBoffset = accessor.sparse.values.defined["byteOffset"] ? accessor.sparse.values.byteOffset : 0; int accSVBoffset = accessor.sparse.values.defined["byteOffset"] ? accessor.sparse.values.byteOffset : 0;
success = addArrayOfType(sparseValuesBuffer.blob, sparseValuesBufferview.byteOffset + accSVBoffset, success = addArrayOfType(sparseValuesBuffer.blob, sparseValuesBufferview.byteOffset + accSVBoffset,
accessor.sparse.count, out_sparse_values_array, accessor.type, accessor.componentType); accessor.sparse.count, out_sparse_values_array, accessor.type, accessor.componentType,
accessor.normalized);
if (success) { if (success) {
for (int i = 0; i < accessor.sparse.count; ++i) { for (int i = 0; i < accessor.sparse.count; ++i) {

6
libraries/fbx/src/GLTFSerializer.h
View file

@ -527,7 +527,7 @@ struct GLTFAccessor {
int componentType; //required int componentType; //required
int count; //required int count; //required
int type; //required int type; //required
bool normalized{ false }; bool normalized { false };
QVector<double> max; QVector<double> max;
QVector<double> min; QVector<double> min;
GLTFAccessorSparse sparse; GLTFAccessorSparse sparse;
@ -832,11 +832,11 @@ private:
template<typename T, typename L> template<typename T, typename L>
bool readArray(const hifi::ByteArray& bin, int byteOffset, int count, bool readArray(const hifi::ByteArray& bin, int byteOffset, int count,
QVector<L>& outarray, int accessorType); QVector<L>& outarray, int accessorType, bool normalized);
template<typename T> template<typename T>
bool addArrayOfType(const hifi::ByteArray& bin, int byteOffset, int count, bool addArrayOfType(const hifi::ByteArray& bin, int byteOffset, int count,
QVector<T>& outarray, int accessorType, int componentType); QVector<T>& outarray, int accessorType, int componentType, bool normalized);
template <typename T> template <typename T>
bool addArrayFromAccessor(GLTFAccessor& accessor, QVector<T>& outarray); bool addArrayFromAccessor(GLTFAccessor& accessor, QVector<T>& outarray);