GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-14 00:15:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix printing accessor.min and accessor.max in loader_example.

Browse Source 
Initial support for printing extensions(no pretty printing at the moment).
Merge branch 'generic_extension_support' of https://github.com/Selmar/tinygltf into Selmar-generic_extension_support
This commit is contained in:
Syoyo Fujita 2018-04-05 15:37:57 +09:00
commit 1e629c8efe
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
loader_example.cc
View File

@ -225,7 +225,7 @@ static std::string PrintParameterMap(const tinygltf::ParameterMap &pmap) {
#endif #endif
static std::string PrintValue(const std::string &name, static std::string PrintValue(const std::string &name,
const tinygltf::Value &value, const int indent) { const tinygltf::Value &value, const int indent, const bool tag = true) {
std::stringstream ss; std::stringstream ss;
if (value.IsObject()) { if (value.IsObject()) {
@ -233,19 +233,45 @@ static std::string PrintValue(const std::string &name,
tinygltf::Value::Object::const_iterator it(o.begin()); tinygltf::Value::Object::const_iterator it(o.begin());
tinygltf::Value::Object::const_iterator itEnd(o.end()); tinygltf::Value::Object::const_iterator itEnd(o.end());
for (; it != itEnd; it++) { for (; it != itEnd; it++) {
ss << PrintValue(name, it->second, indent + 1); ss << PrintValue(it->first, it->second, indent + 1) << std::endl;
} }
} else if (value.IsString()) { } else if (value.IsString()) {
ss << Indent(indent) << name << " : " << value.Get<std::string>() if (tag) {
<< std::endl; ss << Indent(indent) << name << " : " << value.Get<std::string>();
} else {
ss << " " << value.Get<std::string>() << " ";
}
} else if (value.IsBool()) { } else if (value.IsBool()) {
ss << Indent(indent) << name << " : " << value.Get<bool>() << std::endl; if (tag) {
ss << Indent(indent) << name << " : " << value.Get<bool>();
} else {
ss << " " << value.Get<bool>() << " ";
}
} else if (value.IsNumber()) { } else if (value.IsNumber()) {
ss << Indent(indent) << name << " : " << value.Get<double>() << std::endl; if (tag) {
ss << Indent(indent) << name << " : " << value.Get<double>();
} else {
ss << " " << value.Get<double>() << " ";
}
} else if (value.IsInt()) { } else if (value.IsInt()) {
ss << Indent(indent) << name << " : " << value.Get<int>() << std::endl; if (tag) {
ss << Indent(indent) << name << " : " << value.Get<int>();
} else {
ss << " " << value.Get<int>() << " ";
}
} else if (value.IsArray()) {
ss << Indent(indent) << name << " [ ";
for (size_t i = 0; i < value.Size(); i++) {
ss << PrintValue("", value.Get(i), indent + 1, /* tag */false);
if (i != (value.ArrayLen()-1)) {
ss << ", ";
}
}
ss << Indent(indent) << "] ";
} }
// @todo { binary, array }
// @todo { binary }
return ss.str(); return ss.str();
} }
@ -303,10 +329,10 @@ static void DumpPrimitive(const tinygltf::Primitive &primitive, int indent) {
static void DumpExtensions(const tinygltf::ExtensionMap &extension, const int indent) static void DumpExtensions(const tinygltf::ExtensionMap &extension, const int indent)
{ {
// TODO(syoyo): Print extensions // TODO(syoyo): pritty print Value
for (auto &e : extension) { for (auto &e : extension) {
std::cout << Indent(indent) << e.first << std::endl; std::cout << Indent(indent) << e.first << std::endl;
//std::cout << Indent(indent+1) << PrintParameterMap(e.second); std::cout << PrintValue("extensions", e.second, indent+1) << std::endl;
} }
} }
@ -368,7 +394,7 @@ static void Dump(const tinygltf::Model &model) {
std::cout << Indent(2) << "min : ["; std::cout << Indent(2) << "min : [";
for (size_t k = 0; k < accessor.minValues.size(); k++) { for (size_t k = 0; k < accessor.minValues.size(); k++) {
std::cout << accessor.minValues[k] std::cout << accessor.minValues[k]
<< ((i != accessor.minValues.size() - 1) ? ", " : ""); << ((k != accessor.minValues.size() - 1) ? ", " : "");
} }
std::cout << "]" << std::endl; std::cout << "]" << std::endl;
} }
@ -376,7 +402,7 @@ static void Dump(const tinygltf::Model &model) {
std::cout << Indent(2) << "max : ["; std::cout << Indent(2) << "max : [";
for (size_t k = 0; k < accessor.maxValues.size(); k++) { for (size_t k = 0; k < accessor.maxValues.size(); k++) {
std::cout << accessor.maxValues[k] std::cout << accessor.maxValues[k]
<< ((i != accessor.maxValues.size() - 1) ? ", " : ""); << ((k != accessor.maxValues.size() - 1) ? ", " : "");
} }
std::cout << "]" << std::endl; std::cout << "]" << std::endl;
} }

14
tiny_gltf.h
View File

@ -4185,13 +4185,13 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
SerializeExtensionMap(model->extensions, output); SerializeExtensionMap(model->extensions, output);
// LIGHTS as KHR_lights_cmn // LIGHTS as KHR_lights_cmn
json lights; if (model->lights.size()) {
for (unsigned int i = 0; i < model->lights.size(); ++i) { json lights;
json light; for (unsigned int i = 0; i < model->lights.size(); ++i) {
SerializeGltfLight(model->lights[i], light); json light;
lights.push_back(light); SerializeGltfLight(model->lights[i], light);
} lights.push_back(light);
if (model->lights.size() > 0) { }
json khr_lights_cmn; json khr_lights_cmn;
khr_lights_cmn["lights"] = lights; khr_lights_cmn["lights"] = lights;
json ext_j; json ext_j;