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

Disambiguate Get methods

pull/1423/head
Daniel Hritzkiv 2017-08-25 16:09:07 -04:00
parent f814acf33a
commit 47c7c3cf50
No known key found for this signature in database
GPG Key ID: D1D19875679D5CBF
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/glTF2Asset.h
View File

@ -1046,9 +1046,9 @@ namespace glTF2
LazyDict(Asset& asset, const char* dictId, const char* extId = 0); LazyDict(Asset& asset, const char* dictId, const char* extId = 0);
~LazyDict(); ~LazyDict();
Ref<T> Get(const char* id); Ref<T> Retrieve(unsigned int i);
Ref<T> Get(unsigned int i); Ref<T> Get(unsigned int i);
Ref<T> Get(const std::string& pID) { return Get(pID.c_str()); }
Ref<T> Create(const char* id); Ref<T> Create(const char* id);
Ref<T> Create(const std::string& id) Ref<T> Create(const std::string& id)

59
code/glTF2Asset.inl
View File

@ -194,6 +194,14 @@ inline void LazyDict<T>::DetachFromDocument()
template<class T> template<class T>
Ref<T> LazyDict<T>::Get(unsigned int i) Ref<T> LazyDict<T>::Get(unsigned int i)
{
return Ref<T>(mObjs, i);
}
template<class T>
Ref<T> LazyDict<T>::Retrieve(unsigned int i)
{ {
std::string id = std::string(mDictId) + "[" + std::to_string(i) + "]"; std::string id = std::string(mDictId) + "[" + std::to_string(i) + "]";
@ -442,7 +450,7 @@ inline void BufferView::Read(Value& obj, Asset& r)
{ {
if (Value* bufferVal = FindUInt(obj, "buffer")) { if (Value* bufferVal = FindUInt(obj, "buffer")) {
buffer = r.buffers.Get(bufferVal->GetUint()); buffer = r.buffers.Retrieve(bufferVal->GetUint());
} }
byteOffset = MemberOrDefault(obj, "byteOffset", 0u); byteOffset = MemberOrDefault(obj, "byteOffset", 0u);
@ -457,7 +465,7 @@ inline void Accessor::Read(Value& obj, Asset& r)
{ {
if (Value* bufferViewVal = FindUInt(obj, "bufferView")) { if (Value* bufferViewVal = FindUInt(obj, "bufferView")) {
bufferView = r.bufferViews.Get(bufferViewVal->GetUint()); bufferView = r.bufferViews.Retrieve(bufferViewVal->GetUint());
} }
byteOffset = MemberOrDefault(obj, "byteOffset", 0u); byteOffset = MemberOrDefault(obj, "byteOffset", 0u);
@ -615,7 +623,7 @@ inline void Image::Read(Value& obj, Asset& r)
ReadMember(*ext, "mimeType", mimeType); ReadMember(*ext, "mimeType", mimeType);
if (Value* bufferViewVal = FindUInt(*ext, "bufferView")) { if (Value* bufferViewVal = FindUInt(*ext, "bufferView")) {
Ref<BufferView> bv = r.bufferViews.Get(bufferViewVal->GetUint()); Ref<BufferView> bv = r.bufferViews.Retrieve(bufferViewVal->GetUint());
if (bv) { if (bv) {
mDataLength = bv->byteLength; mDataLength = bv->byteLength;
mData = new uint8_t[mDataLength]; mData = new uint8_t[mDataLength];
@ -690,11 +698,11 @@ inline void Sampler::SetDefaults()
inline void Texture::Read(Value& obj, Asset& r) inline void Texture::Read(Value& obj, Asset& r)
{ {
if (Value* sourceVal = FindUInt(obj, "source")) { if (Value* sourceVal = FindUInt(obj, "source")) {
source = r.images.Get(sourceVal->GetUint()); source = r.images.Retrieve(sourceVal->GetUint());
} }
if (Value* samplerVal = FindUInt(obj, "sampler")) { if (Value* samplerVal = FindUInt(obj, "sampler")) {
sampler = r.samplers.Get(samplerVal->GetUint()); sampler = r.samplers.Retrieve(samplerVal->GetUint());
} }
} }
@ -704,7 +712,7 @@ namespace {
//@TODO: update this format //@TODO: update this format
if (Value* prop = FindMember(vals, propName)) { if (Value* prop = FindMember(vals, propName)) {
if (prop->IsUint()) { if (prop->IsUint()) {
out.texture = r.textures.Get(prop->GetUint()); out.texture = r.textures.Retrieve(prop->GetUint());
} }
else { else {
ReadValue(*prop, out.color); ReadValue(*prop, out.color);
@ -820,7 +828,7 @@ inline void Mesh::Read(Value& pJSON_Object, Asset& pAsset_Root)
if (Value* attrs = FindObject(primitive, "attributes")) { if (Value* attrs = FindObject(primitive, "attributes")) {
for (Value::MemberIterator it = attrs->MemberBegin(); it != attrs->MemberEnd(); ++it) { for (Value::MemberIterator it = attrs->MemberBegin(); it != attrs->MemberEnd(); ++it) {
if (!it->value.IsString()) continue; if (!it->value.IsUint()) continue;
const char* attr = it->name.GetString(); const char* attr = it->name.GetString();
// Valid attribute semantics include POSITION, NORMAL, TEXCOORD, COLOR, JOINT, JOINTMATRIX, // Valid attribute semantics include POSITION, NORMAL, TEXCOORD, COLOR, JOINT, JOINTMATRIX,
// and WEIGHT.Attribute semantics can be of the form[semantic]_[set_index], e.g., TEXCOORD_0, TEXCOORD_1, etc. // and WEIGHT.Attribute semantics can be of the form[semantic]_[set_index], e.g., TEXCOORD_0, TEXCOORD_1, etc.
@ -831,17 +839,17 @@ inline void Mesh::Read(Value& pJSON_Object, Asset& pAsset_Root)
if (GetAttribVector(prim, attr, vec, undPos)) { if (GetAttribVector(prim, attr, vec, undPos)) {
size_t idx = (attr[undPos] == '_') ? atoi(attr + undPos + 1) : 0; size_t idx = (attr[undPos] == '_') ? atoi(attr + undPos + 1) : 0;
if ((*vec).size() <= idx) (*vec).resize(idx + 1); if ((*vec).size() <= idx) (*vec).resize(idx + 1);
(*vec)[idx] = pAsset_Root.accessors.Get(it->value.GetUint()); (*vec)[idx] = pAsset_Root.accessors.Retrieve(it->value.GetUint());
} }
} }
} }
if (Value* indices = FindUInt(primitive, "indices")) { if (Value* indices = FindUInt(primitive, "indices")) {
prim.indices = pAsset_Root.accessors.Get(indices->GetUint()); prim.indices = pAsset_Root.accessors.Retrieve(indices->GetUint());
} }
if (Value* material = FindUInt(primitive, "material")) { if (Value* material = FindUInt(primitive, "material")) {
prim.material = pAsset_Root.materials.Get(material->GetUint()); prim.material = pAsset_Root.materials.Retrieve(material->GetUint());
} }
} }
} }
@ -992,9 +1000,9 @@ inline void Node::Read(Value& obj, Asset& r)
this->children.reserve(children->Size()); this->children.reserve(children->Size());
for (unsigned int i = 0; i < children->Size(); ++i) { for (unsigned int i = 0; i < children->Size(); ++i) {
Value& child = (*children)[i]; Value& child = (*children)[i];
if (child.IsNumber()) { if (child.IsUint()) {
// get/create the child node // get/create the child node
Ref<Node> chn = r.nodes.Get(child.GetUint()); Ref<Node> chn = r.nodes.Retrieve(child.GetUint());
if (chn) this->children.push_back(chn); if (chn) this->children.push_back(chn);
} }
} }
@ -1010,22 +1018,21 @@ inline void Node::Read(Value& obj, Asset& r)
ReadMember(obj, "rotation", rotation); ReadMember(obj, "rotation", rotation);
} }
if (Value* meshes = FindArray(obj, "meshes")) { if (Value* mesh = FindUInt(obj, "mesh")) {
unsigned numMeshes = (unsigned)meshes->Size(); //unsigned numMeshes = (unsigned)meshes->Size();
unsigned numMeshes = 1;
std::vector<unsigned int> meshList; //std::vector<unsigned int> meshList;
this->meshes.reserve(numMeshes); this->meshes.reserve(numMeshes);
for (unsigned i = 0; i < numMeshes; ++i) {
if ((*meshes)[i].IsNumber()) { Ref<Mesh> meshRef = r.meshes.Retrieve((*mesh).GetUint());
Ref<Mesh> mesh = r.meshes.Get((*meshes)[i].GetUint());
if (mesh) this->meshes.push_back(mesh); if (meshRef) this->meshes.push_back(meshRef);
}
}
} }
if (Value* camera = FindUInt(obj, "camera")) { if (Value* camera = FindUInt(obj, "camera")) {
this->camera = r.cameras.Get(camera->GetUint()); this->camera = r.cameras.Retrieve(camera->GetUint());
if (this->camera) if (this->camera)
this->camera->id = this->id; this->camera->id = this->id;
} }
@ -1037,7 +1044,7 @@ inline void Node::Read(Value& obj, Asset& r)
if (Value* ext = FindObject(*extensions, "KHR_materials_common")) { if (Value* ext = FindObject(*extensions, "KHR_materials_common")) {
if (Value* light = FindUInt(*ext, "light")) { if (Value* light = FindUInt(*ext, "light")) {
this->light = r.lights.Get(light->GetUint()); this->light = r.lights.Retrieve(light->GetUint());
} }
} }
@ -1049,8 +1056,8 @@ inline void Scene::Read(Value& obj, Asset& r)
{ {
if (Value* array = FindArray(obj, "nodes")) { if (Value* array = FindArray(obj, "nodes")) {
for (unsigned int i = 0; i < array->Size(); ++i) { for (unsigned int i = 0; i < array->Size(); ++i) {
if (!(*array)[i].IsNumber()) continue; if (!(*array)[i].IsUint()) continue;
Ref<Node> node = r.nodes.Get((*array)[i].GetUint()); Ref<Node> node = r.nodes.Retrieve((*array)[i].GetUint());
if (node) if (node)
this->nodes.push_back(node); this->nodes.push_back(node);
} }
@ -1201,7 +1208,7 @@ inline void Asset::Load(const std::string& pFile, bool isBinary)
if (Value* scene = FindUInt(doc, "scene")) { if (Value* scene = FindUInt(doc, "scene")) {
unsigned int sceneIndex = scene->GetUint(); unsigned int sceneIndex = scene->GetUint();
Ref<Scene> s = scenes.Get(sceneIndex); Ref<Scene> s = scenes.Retrieve(sceneIndex);
this->scene = s; this->scene = s;
} }