gltf2 import sparse accessor
parent
578dc09810
commit
e9b67cdb89
|
@ -367,6 +367,7 @@ struct Object {
|
||||||
//! An accessor provides a typed view into a BufferView or a subset of a BufferView
|
//! An accessor provides a typed view into a BufferView or a subset of a BufferView
|
||||||
//! similar to how WebGL's vertexAttribPointer() defines an attribute in a buffer.
|
//! similar to how WebGL's vertexAttribPointer() defines an attribute in a buffer.
|
||||||
struct Accessor : public Object {
|
struct Accessor : public Object {
|
||||||
|
struct Sparse;
|
||||||
Ref<BufferView> bufferView; //!< The ID of the bufferView. (required)
|
Ref<BufferView> bufferView; //!< The ID of the bufferView. (required)
|
||||||
size_t byteOffset; //!< The offset relative to the start of the bufferView in bytes. (required)
|
size_t byteOffset; //!< The offset relative to the start of the bufferView in bytes. (required)
|
||||||
ComponentType componentType; //!< The datatype of components in the attribute. (required)
|
ComponentType componentType; //!< The datatype of components in the attribute. (required)
|
||||||
|
@ -374,6 +375,7 @@ struct Accessor : public Object {
|
||||||
AttribType::Value type; //!< Specifies if the attribute is a scalar, vector, or matrix. (required)
|
AttribType::Value type; //!< Specifies if the attribute is a scalar, vector, or matrix. (required)
|
||||||
std::vector<double> max; //!< Maximum value of each component in this attribute.
|
std::vector<double> max; //!< Maximum value of each component in this attribute.
|
||||||
std::vector<double> min; //!< Minimum value of each component in this attribute.
|
std::vector<double> min; //!< Minimum value of each component in this attribute.
|
||||||
|
std::unique_ptr<Sparse> sparse;
|
||||||
|
|
||||||
unsigned int GetNumComponents();
|
unsigned int GetNumComponents();
|
||||||
unsigned int GetBytesPerComponent();
|
unsigned int GetBytesPerComponent();
|
||||||
|
@ -423,6 +425,21 @@ struct Accessor : public Object {
|
||||||
|
|
||||||
Accessor() {}
|
Accessor() {}
|
||||||
void Read(Value &obj, Asset &r);
|
void Read(Value &obj, Asset &r);
|
||||||
|
|
||||||
|
//sparse
|
||||||
|
struct Sparse {
|
||||||
|
size_t count;
|
||||||
|
ComponentType indicesType;
|
||||||
|
Ref<BufferView> indices;
|
||||||
|
size_t indicesByteOffset;
|
||||||
|
Ref<BufferView> values;
|
||||||
|
size_t valuesByteOffset;
|
||||||
|
|
||||||
|
std::vector<uint8_t> data; //!< Actual data, which may be defaulted to an array of zeros or the original data, with the sparse buffer view applied on top of it.
|
||||||
|
|
||||||
|
void PopulateData(size_t numBytes, uint8_t *bytes);
|
||||||
|
void PatchData(unsigned int elementSize);
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
//! A buffer points to binary geometry, animation, or skins.
|
//! A buffer points to binary geometry, animation, or skins.
|
||||||
|
@ -555,6 +572,7 @@ struct BufferView : public Object {
|
||||||
BufferViewTarget target; //! The target that the WebGL buffer should be bound to.
|
BufferViewTarget target; //! The target that the WebGL buffer should be bound to.
|
||||||
|
|
||||||
void Read(Value &obj, Asset &r);
|
void Read(Value &obj, Asset &r);
|
||||||
|
uint8_t *GetPointer(size_t accOffset);
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Camera : public Object {
|
struct Camera : public Object {
|
||||||
|
|
|
@ -550,9 +550,62 @@ inline void BufferView::Read(Value &obj, Asset &r) {
|
||||||
byteStride = MemberOrDefault(obj, "byteStride", 0u);
|
byteStride = MemberOrDefault(obj, "byteStride", 0u);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline uint8_t *BufferView::GetPointer(size_t accOffset) {
|
||||||
|
if (!buffer) return 0;
|
||||||
|
uint8_t *basePtr = buffer->GetPointer();
|
||||||
|
if (!basePtr) return 0;
|
||||||
|
|
||||||
|
size_t offset = accOffset + byteOffset;
|
||||||
|
if (buffer->EncodedRegion_Current != nullptr) {
|
||||||
|
const size_t begin = buffer->EncodedRegion_Current->Offset;
|
||||||
|
const size_t end = begin + buffer->EncodedRegion_Current->DecodedData_Length;
|
||||||
|
if ((offset >= begin) && (offset < end))
|
||||||
|
return &buffer->EncodedRegion_Current->DecodedData[offset - begin];
|
||||||
|
}
|
||||||
|
|
||||||
|
return basePtr + offset;
|
||||||
|
}
|
||||||
//
|
//
|
||||||
// struct Accessor
|
// struct Accessor
|
||||||
//
|
//
|
||||||
|
inline void Accessor::Sparse::PopulateData(size_t numBytes, uint8_t *bytes) {
|
||||||
|
if (bytes) {
|
||||||
|
data.assign(bytes, bytes + numBytes);
|
||||||
|
} else {
|
||||||
|
data.resize(numBytes, 0x00);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void Accessor::Sparse::PatchData(unsigned int elementSize) {
|
||||||
|
uint8_t *pIndices = indices->GetPointer(indicesByteOffset);
|
||||||
|
const unsigned int indexSize = int(ComponentTypeSize(indicesType));
|
||||||
|
uint8_t *indicesEnd = pIndices + count * indexSize;
|
||||||
|
|
||||||
|
uint8_t *pValues = values->GetPointer(valuesByteOffset);
|
||||||
|
while (pIndices != indicesEnd) {
|
||||||
|
size_t offset;
|
||||||
|
switch (indicesType) {
|
||||||
|
case ComponentType_UNSIGNED_BYTE:
|
||||||
|
offset = *pIndices;
|
||||||
|
break;
|
||||||
|
case ComponentType_UNSIGNED_SHORT:
|
||||||
|
offset = *reinterpret_cast<uint16_t *>(pIndices);
|
||||||
|
break;
|
||||||
|
case ComponentType_UNSIGNED_INT:
|
||||||
|
offset = *reinterpret_cast<uint32_t *>(pIndices);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// have fun with float and negative values from signed types as indices.
|
||||||
|
throw DeadlyImportError("Unsupported component type in index.");
|
||||||
|
}
|
||||||
|
|
||||||
|
offset *= elementSize;
|
||||||
|
std::memcpy(data.data() + offset, pValues, elementSize);
|
||||||
|
|
||||||
|
pValues += elementSize;
|
||||||
|
pIndices += indexSize;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
inline void Accessor::Read(Value &obj, Asset &r) {
|
inline void Accessor::Read(Value &obj, Asset &r) {
|
||||||
|
|
||||||
|
@ -566,6 +619,40 @@ inline void Accessor::Read(Value &obj, Asset &r) {
|
||||||
|
|
||||||
const char *typestr;
|
const char *typestr;
|
||||||
type = ReadMember(obj, "type", typestr) ? AttribType::FromString(typestr) : AttribType::SCALAR;
|
type = ReadMember(obj, "type", typestr) ? AttribType::FromString(typestr) : AttribType::SCALAR;
|
||||||
|
|
||||||
|
if (Value *sparseValue = FindObject(obj, "sparse")) {
|
||||||
|
sparse.reset(new Sparse);
|
||||||
|
// count
|
||||||
|
ReadMember(*sparseValue, "count", sparse->count);
|
||||||
|
|
||||||
|
// indices
|
||||||
|
if (Value *indicesValue = FindObject(*sparseValue, "indices")) {
|
||||||
|
//indices bufferView
|
||||||
|
Value *indiceViewID = FindUInt(*indicesValue, "bufferView");
|
||||||
|
sparse->indices = r.bufferViews.Retrieve(indiceViewID->GetUint());
|
||||||
|
//indices byteOffset
|
||||||
|
sparse->indicesByteOffset = MemberOrDefault(*indicesValue, "byteOffset", size_t(0));
|
||||||
|
//indices componentType
|
||||||
|
sparse->indicesType = MemberOrDefault(*indicesValue, "componentType", ComponentType_BYTE);
|
||||||
|
}
|
||||||
|
|
||||||
|
// value
|
||||||
|
if (Value *valuesValue = FindObject(*sparseValue, "values")) {
|
||||||
|
//value bufferView
|
||||||
|
Value *valueViewID = FindUInt(*valuesValue, "bufferView");
|
||||||
|
sparse->values = r.bufferViews.Retrieve(valueViewID->GetUint());
|
||||||
|
//value byteOffset
|
||||||
|
sparse->valuesByteOffset = MemberOrDefault(*valuesValue, "byteOffset", size_t(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
// indicesType
|
||||||
|
sparse->indicesType = MemberOrDefault(*sparseValue, "componentType", ComponentType_UNSIGNED_SHORT);
|
||||||
|
|
||||||
|
const unsigned int elementSize = GetElementSize();
|
||||||
|
const size_t dataSize = count * elementSize;
|
||||||
|
sparse->PopulateData(dataSize, bufferView ? bufferView->GetPointer(byteOffset) : 0);
|
||||||
|
sparse->PatchData(elementSize);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
inline unsigned int Accessor::GetNumComponents() {
|
inline unsigned int Accessor::GetNumComponents() {
|
||||||
|
@ -581,6 +668,9 @@ inline unsigned int Accessor::GetElementSize() {
|
||||||
}
|
}
|
||||||
|
|
||||||
inline uint8_t *Accessor::GetPointer() {
|
inline uint8_t *Accessor::GetPointer() {
|
||||||
|
if (sparse)
|
||||||
|
return sparse->data.data();
|
||||||
|
|
||||||
if (!bufferView || !bufferView->buffer) return 0;
|
if (!bufferView || !bufferView->buffer) return 0;
|
||||||
uint8_t *basePtr = bufferView->buffer->GetPointer();
|
uint8_t *basePtr = bufferView->buffer->GetPointer();
|
||||||
if (!basePtr) return 0;
|
if (!basePtr) return 0;
|
||||||
|
@ -634,8 +724,7 @@ void Accessor::ExtractData(T *&outData)
|
||||||
|
|
||||||
const size_t targetElemSize = sizeof(T);
|
const size_t targetElemSize = sizeof(T);
|
||||||
ai_assert(elemSize <= targetElemSize);
|
ai_assert(elemSize <= targetElemSize);
|
||||||
|
ai_assert(count * stride <= (bufferView ? bufferView->byteLength : sparse->data.size()));
|
||||||
ai_assert(count * stride <= bufferView->byteLength);
|
|
||||||
|
|
||||||
outData = new T[count];
|
outData = new T[count];
|
||||||
if (stride == elemSize && targetElemSize == elemSize) {
|
if (stride == elemSize && targetElemSize == elemSize) {
|
||||||
|
|
Loading…
Reference in New Issue