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

Apply clangformat

pull/3614/head
RichardTea 2021-01-27 09:55:03 +00:00
parent c6fd1ce996
commit 6ec32b6b78
2 changed files with 54 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/AssetLib/glTF2/glTF2Asset.h
View File

@ -513,7 +513,6 @@ struct BufferView : public Object {
uint8_t *GetPointer(size_t accOffset); uint8_t *GetPointer(size_t accOffset);
}; };
//! A typed view into a BufferView. A BufferView contains raw binary data. //! A typed view into a BufferView. A BufferView contains raw binary data.
//! 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.

39
code/AssetLib/glTF2/glTF2Asset.inl
View File

@ -42,12 +42,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "AssetLib/glTF/glTFCommon.h" #include "AssetLib/glTF/glTFCommon.h"
#include <assimp/MemoryIOWrapper.h>
#include <assimp/StringUtils.h> #include <assimp/StringUtils.h>
#include <assimp/DefaultLogger.hpp> #include <assimp/DefaultLogger.hpp>
#include <assimp/MemoryIOWrapper.h>
#ifdef ASSIMP_ENABLE_DRACO #ifdef ASSIMP_ENABLE_DRACO
#include "draco/draco_features.h"
#include "draco/compression/decode.h" #include "draco/compression/decode.h"
#include "draco/core/decoder_buffer.h" #include "draco/core/decoder_buffer.h"
#ifndef DRACO_MESH_COMPRESSION_SUPPORTED #ifndef DRACO_MESH_COMPRESSION_SUPPORTED
@ -277,8 +276,7 @@ inline void SetDecodedAttributeBuffer_Draco(const draco::Mesh &dracoMesh, uint32
std::unique_ptr<Buffer> decodedAttribBuffer(new Buffer()); std::unique_ptr<Buffer> decodedAttribBuffer(new Buffer());
decodedAttribBuffer->Grow(dracoMesh.num_points() * pDracoAttribute->num_components() * componentBytes); decodedAttribBuffer->Grow(dracoMesh.num_points() * pDracoAttribute->num_components() * componentBytes);
switch(accessor.componentType) switch (accessor.componentType) {
{
case ComponentType_BYTE: GetAttributeForAllPoints_Draco<int8_t>(dracoMesh, *pDracoAttribute, *decodedAttribBuffer); break; case ComponentType_BYTE: GetAttributeForAllPoints_Draco<int8_t>(dracoMesh, *pDracoAttribute, *decodedAttribBuffer); break;
case ComponentType_UNSIGNED_BYTE: GetAttributeForAllPoints_Draco<uint8_t>(dracoMesh, *pDracoAttribute, *decodedAttribBuffer); break; case ComponentType_UNSIGNED_BYTE: GetAttributeForAllPoints_Draco<uint8_t>(dracoMesh, *pDracoAttribute, *decodedAttribBuffer); break;
case ComponentType_SHORT: GetAttributeForAllPoints_Draco<int16_t>(dracoMesh, *pDracoAttribute, *decodedAttribBuffer); break; case ComponentType_SHORT: GetAttributeForAllPoints_Draco<int16_t>(dracoMesh, *pDracoAttribute, *decodedAttribBuffer); break;
@ -527,10 +525,7 @@ inline void Buffer::Read(Value &obj, Asset &r) {
} }
} else { // Local file } else { // Local file
if (byteLength > 0) { if (byteLength > 0) {
std::string dir = !r.mCurrentAssetDir.empty() ? ( std::string dir = !r.mCurrentAssetDir.empty() ? (r.mCurrentAssetDir.back() == '/' ? r.mCurrentAssetDir : r.mCurrentAssetDir + '/') : "";
r.mCurrentAssetDir.back() == '/' ?
r.mCurrentAssetDir : r.mCurrentAssetDir + '/'
) : "";
IOStream *file = r.OpenFile(dir + uri, "rb"); IOStream *file = r.OpenFile(dir + uri, "rb");
if (file) { if (file) {
@ -859,8 +854,7 @@ inline uint8_t *Accessor::GetPointer() {
return basePtr + offset; return basePtr + offset;
} }
inline size_t Accessor::GetStride() inline size_t Accessor::GetStride() {
{
// Decoded buffer is always packed // Decoded buffer is always packed
if (decodedBuffer) if (decodedBuffer)
return GetElementSize(); return GetElementSize();
@ -869,8 +863,7 @@ inline size_t Accessor::GetStride()
return (bufferView && bufferView->byteStride ? bufferView->byteStride : GetElementSize()); return (bufferView && bufferView->byteStride ? bufferView->byteStride : GetElementSize());
} }
inline size_t Accessor::GetMaxByteSize() inline size_t Accessor::GetMaxByteSize() {
{
if (decodedBuffer) if (decodedBuffer)
return decodedBuffer->byteLength; return decodedBuffer->byteLength;
@ -1019,8 +1012,7 @@ inline void Image::Read(Value &obj, Asset &r) {
if (Value *mtype = FindString(obj, "mimeType")) { if (Value *mtype = FindString(obj, "mimeType")) {
this->mimeType = mtype->GetString(); this->mimeType = mtype->GetString();
} }
if (!this->bufferView || this->mimeType.empty()) if (!this->bufferView || this->mimeType.empty()) {
{
throw DeadlyImportError("GLTF2: ", getContextForErrorMessages(id, name), " does not have a URI, so it must have a valid bufferView and mimetype"); throw DeadlyImportError("GLTF2: ", getContextForErrorMessages(id, name), " does not have a URI, so it must have a valid bufferView and mimetype");
} }
@ -1031,9 +1023,7 @@ inline void Image::Read(Value &obj, Asset &r) {
this->mData.reset(new uint8_t[this->mDataLength]); this->mData.reset(new uint8_t[this->mDataLength]);
memcpy(this->mData.get(), buffer->GetPointer() + this->bufferView->byteOffset, this->mDataLength); memcpy(this->mData.get(), buffer->GetPointer() + this->bufferView->byteOffset, this->mDataLength);
} } else {
else
{
throw DeadlyImportError("GLTF2: ", getContextForErrorMessages(id, name), " should have either a URI of a bufferView and mimetype"); throw DeadlyImportError("GLTF2: ", getContextForErrorMessages(id, name), " should have either a URI of a bufferView and mimetype");
} }
} }
@ -1548,16 +1538,13 @@ inline CustomExtension ReadExtensions(const char *name, Value& obj) {
auto &val = it->value; auto &val = it->value;
ret.mValues.value.push_back(ReadExtensions(it->name.GetString(), val)); ret.mValues.value.push_back(ReadExtensions(it->name.GetString(), val));
} }
} } else if (obj.IsArray()) {
else if (obj.IsArray()) {
ret.mValues.value.reserve(obj.Size()); ret.mValues.value.reserve(obj.Size());
ret.mValues.isPresent = true; ret.mValues.isPresent = true;
for (unsigned int i = 0; i < obj.Size(); ++i) for (unsigned int i = 0; i < obj.Size(); ++i) {
{
ret.mValues.value.push_back(ReadExtensions(name, obj[i])); ret.mValues.value.push_back(ReadExtensions(name, obj[i]));
} }
} } else if (obj.IsNumber()) {
else if (obj.IsNumber()) {
if (obj.IsUint64()) { if (obj.IsUint64()) {
ret.mUint64Value.value = obj.GetUint64(); ret.mUint64Value.value = obj.GetUint64();
ret.mUint64Value.isPresent = true; ret.mUint64Value.isPresent = true;
@ -1568,12 +1555,10 @@ inline CustomExtension ReadExtensions(const char *name, Value& obj) {
ret.mDoubleValue.value = obj.GetDouble(); ret.mDoubleValue.value = obj.GetDouble();
ret.mDoubleValue.isPresent = true; ret.mDoubleValue.isPresent = true;
} }
} } else if (obj.IsString()) {
else if (obj.IsString()) {
ReadValue(obj, ret.mStringValue); ReadValue(obj, ret.mStringValue);
ret.mStringValue.isPresent = true; ret.mStringValue.isPresent = true;
} } else if (obj.IsBool()) {
else if (obj.IsBool()) {
ret.mBoolValue.value = obj.GetBool(); ret.mBoolValue.value = obj.GetBool();
ret.mBoolValue.isPresent = true; ret.mBoolValue.isPresent = true;
} }