Mirrors/tinyusdz
0
0
Fork 0
mirror of https://github.com/lighttransport/tinyusdz.git synced 2026-01-18 01:11:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build of sdlviewer example.

Browse Source 
Fix ReconstructGeomMesh in USDC parser.
This commit is contained in:
Syoyo Fujita
2022-04-18 02:23:35 +09:00
parent a4dbcbf850
commit e06a784b7f
6 changed files with 144 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
examples/sdlviewer/CMakeLists.txt
View File

@@ -219,12 +219,28 @@ list(APPEND SOURCES
# tinyusdz
../../src/tinyusdz.cc
../../src/io-util.cc
../../src/integerCoding.cpp
../../src/pxrLZ4/lz4.cpp
../../src/lz4-compression.cc
../../src/prim-types.cc
../../src/pprinter.cc
../../src/primvar.cc
../../src/usda-parser.cc
../../src/usda-writer.cc
../../src/image-loader.cc
../../src/usdObj.cc
#../../src/integerCoding.cpp
#../../src/pxrLZ4/lz4.cpp
#../../src/lz4-compression.cc
)
set(TINYUSDZ_DEP_SOURCES
../../src/integerCoding.cpp
../../src/lz4-compression.cc
../../src/pxrLZ4/lz4.cpp
../../src/external/fpng.cpp
../../src/external/staticstruct.cc
../../src/external/ryu/ryu/s2d.c
../../src/external/ryu/ryu/s2f.c)
set(GUI_SOURCES
../common/trackball.cc
../common/matrix.cc
@@ -236,7 +252,7 @@ set(GUI_SOURCES
../common/imgui_sdl/imgui_sdl.cpp
)
add_executable(${BUILD_TARGET} ${SOURCES} ${GUI_SOURCES})
add_executable(${BUILD_TARGET} ${SOURCES} ${GUI_SOURCES} ${TINYUSDZ_DEP_SOURCES})
add_sanitizers(${BUILD_TARGET})
target_compile_options(${BUILD_TARGET} PRIVATE ${EXT_COMPILE_OPTIONS})
@@ -250,6 +266,11 @@ target_include_directories(${BUILD_TARGET} PRIVATE "${PROJECT_SOURCE_DIR}/../com
# tinyusdz dir
target_include_directories(${BUILD_TARGET} PRIVATE "${PROJECT_SOURCE_DIR}/../../src/")
# ryu
target_include_directories(${BUILD_TARGET}
PRIVATE ${PROJECT_SOURCE_DIR}/../../src/external/ryu/)
#target_include_directories(${BUILD_TARGET} PRIVATE "${PROJECT_SOURCE_DIR}/../common/SDL2-2.0.12/include"
if (USDVIEW_USE_NATIVEFILEDIALOG)

11
examples/sdlviewer/simple-render.cc
View File

@@ -107,24 +107,27 @@ bool ConvertToRenderMesh(const tinyusdz::GeomSphere& sphere, DrawGeomMesh* dst)
}
bool ConvertToRenderMesh(const tinyusdz::GeomMesh& mesh, DrawGeomMesh* dst) {
#if 0
// Trianglate mesh
// vertex points should be vec3f
if (dst->vertices.size() != (mesh.GetNumPoints() * 3)) {
std::cerr << "The number of vertices mismatch. " << dst->vertices.size()
<< " must be equal to " << mesh.GetNumPoints() * 3 << "\n";
std::cerr << __func__ << ":The number of vertices mismatch. " << dst->vertices.size()
<< " must be equal to mesh.GetNumPoints() * 3: " << mesh.GetNumPoints() * 3 << "\n";
return false;
}
#endif
dst->vertices.resize(mesh.points.size() * 3);
memcpy(dst->vertices.data(), mesh.points.data(), dst->vertices.size() * sizeof(float));
std::cout << __func__ << ": mesh.points = " << mesh.points.size() * 3 << "\n";
std::vector<float> facevarying_normals;
if (!mesh.GetFacevaryingNormals(&facevarying_normals)) {
std::cout << "Warn: failed to retrieve facevarying normals\n";
std::cout << __func__ << ":Warn: failed to retrieve facevarying normals\n";
}
std::vector<float> facevarying_texcoords;
if (!mesh.GetFacevaryingTexcoords(&facevarying_texcoords)) {
std::cout << "Warn: failed to retrieve facevarying texcoords\n";
std::cout << __func__ << ":Warn: failed to retrieve facevarying texcoords\n";
}
std::cout << "# of facevarying normals = " << facevarying_normals.size() / 3

33
src/pprinter.cc
View File

@@ -200,6 +200,39 @@ std::string to_string(tinyusdz::SpecType ty) {
return "SpecTypeInvalid";
}
std::string to_string(tinyusdz::Specifier s) {
if (s == tinyusdz::Specifier::Def) {
return "\"def\"";
} else if (s == tinyusdz::Specifier::Over) {
return "\"over\"";
} else if (s == tinyusdz::Specifier::Class) {
return "\"class\"";
} else {
return "\"[[SpecifierInvalid]]\"";
}
}
std::string to_string(tinyusdz::Permission s) {
if (s == tinyusdz::Permission::Public) {
return "\"public\"";
} else if (s == tinyusdz::Permission::Private) {
return "\"private\"";
} else {
return "\"[[PermissionInvalid]]\"";
}
}
std::string to_string(tinyusdz::Variability v) {
if (v == tinyusdz::Variability::Varying) {
return "\"varying\"";
} else if (v == tinyusdz::Variability::Uniform) {
return "\"uniform\"";
} else if (v == tinyusdz::Variability::Config) {
return "\"config\"";
} else {
return "\"[[VariabilityInvalid]]\"";
}
}
std::string to_string(tinyusdz::Extent e) {
std::stringstream ss;

2
src/prim-types.hh
View File

@@ -1653,7 +1653,7 @@ struct GeomMesh {
// Predefined attribs.
//
std::vector<primvar::point3f> points; // point3f
PrimAttrib normals; // float3f[]
PrimAttrib normals; // normal3f[]
//
// Utility functions

119
src/tinyusdz.cc
View File

@@ -729,7 +729,7 @@ static bool DecodeImage(const uint8_t *bytes, const size_t size,
#ifdef TINYUSDZ_LOCAL_DEBUG_PRINT
float to_float(uint16_t h) {
float16 f;
f.u = h;
f = h;
return half_to_float(f);
}
#endif
@@ -3006,8 +3006,8 @@ bool Parser::_UnpackValueRep(const ValueRep &rep, Value *value) {
#ifdef TINYUSDZ_LOCAL_DEBUG_PRINT
for (size_t i = 0; i < v.size(); i++) {
std::cout << "Quatf[" << i << "] = " << v[i][0] << ", " << v[i][1]
<< ", " << v[i][2] << "\n";
std::cout << "Quatf[" << i << "] = " << v[i].v[0] << ", " << v[i].v[1]
<< ", " << v[i].v[2] << ", " << v[i].v[3] << "\n";
}
#endif
value->SetQuatfArray(v.data(), v.size());
@@ -3021,8 +3021,8 @@ bool Parser::_UnpackValueRep(const ValueRep &rep, Value *value) {
}
#ifdef TINYUSDZ_LOCAL_DEBUG_PRINT
std::cout << "value.quatf = " << v[0] << ", " << v[1] << ", " << v[2]
<< ", " << v[3] << "\n";
std::cout << "value.quatf = " << v.v[0] << ", " << v.v[1] << ", " << v.v[2]
<< ", " << v.v[3] << "\n";
#endif
value->SetQuatf(v);
}
@@ -3925,6 +3925,7 @@ bool Parser::_ParseAttribute(const FieldValuePairVector &fvs, PrimAttrib *attr,
std::cout << "fv.second.GetTypeName = " << fv.second.GetTypeName()
<< "\n";
#endif
if (fv.second.GetTypeName() == "Float") {
float value;
@@ -3932,6 +3933,7 @@ bool Parser::_ParseAttribute(const FieldValuePairVector &fvs, PrimAttrib *attr,
_err += "Failed to decode Float value.";
return false;
}
attr->var.set_scalar(value);
success = true;
} else if (fv.second.GetTypeName() == "Bool") {
@@ -3941,7 +3943,7 @@ bool Parser::_ParseAttribute(const FieldValuePairVector &fvs, PrimAttrib *attr,
return false;
}
//attr->var = boolVal;
attr->var.set_scalar(boolVal);
success = true;
} else if (fv.second.GetTypeName() == "Int") {
@@ -3951,12 +3953,12 @@ bool Parser::_ParseAttribute(const FieldValuePairVector &fvs, PrimAttrib *attr,
return false;
}
//attr->var = value;
attr->var.set_scalar(value);
success = true;
} else if (fv.second.GetTypeName() == "Vec3f") {
Vec3f value = *reinterpret_cast<const Vec3f*>(fv.second.GetData().data());
(void)value;
//attr->var = value;
attr->var.set_scalar(value);
attr->variability = variability;
attr->interpolation = interpolation;
@@ -3966,7 +3968,7 @@ bool Parser::_ParseAttribute(const FieldValuePairVector &fvs, PrimAttrib *attr,
std::vector<float> value;
value.resize(fv.second.GetData().size() / sizeof(float));
memcpy(value.data(), fv.second.GetData().data(), fv.second.GetData().size());
//attr->var = value;
attr->var.set_scalar(value);
attr->variability = variability;
attr->interpolation = interpolation;
@@ -3975,18 +3977,34 @@ bool Parser::_ParseAttribute(const FieldValuePairVector &fvs, PrimAttrib *attr,
std::vector<Vec2f> value;
value.resize(fv.second.GetData().size() / sizeof(Vec2f));
memcpy(value.data(), fv.second.GetData().data(), fv.second.GetData().size());
//attr->var = value;
attr->var.set_scalar(value);
attr->variability = variability;
attr->interpolation = interpolation;
success = true;
} else if (fv.second.GetTypeName() == "Vec3fArray") {
std::vector<Vec3f> value;
value.resize(fv.second.GetData().size() / sizeof(Vec3f));
memcpy(value.data(), fv.second.GetData().data(), fv.second.GetData().size());
//attr->var = value;
// role-type?
if (attr->type_name == "point3f[]") {
std::vector<primvar::point3f> value;
value.resize(fv.second.GetData().size() / sizeof(Vec3f));
memcpy(value.data(), fv.second.GetData().data(),
fv.second.GetData().size());
attr->var.set_scalar(value);
} else if (attr->type_name == "normal3f[]") {
std::vector<primvar::normal3f> value;
value.resize(fv.second.GetData().size() / sizeof(Vec3f));
memcpy(value.data(), fv.second.GetData().data(),
fv.second.GetData().size());
attr->var.set_scalar(value);
} else {
std::vector<Vec3f> value;
value.resize(fv.second.GetData().size() / sizeof(Vec3f));
memcpy(value.data(), fv.second.GetData().data(),
fv.second.GetData().size());
attr->var.set_scalar(value);
}
attr->variability = variability;
attr->interpolation = interpolation;
success = true;
@@ -3996,6 +4014,7 @@ bool Parser::_ParseAttribute(const FieldValuePairVector &fvs, PrimAttrib *attr,
value.resize(fv.second.GetData().size() / sizeof(Vec4f));
memcpy(value.data(), fv.second.GetData().data(), fv.second.GetData().size());
attr->var.set_scalar(value);
attr->variability = variability;
attr->interpolation = interpolation;
success = true;
@@ -4005,6 +4024,7 @@ bool Parser::_ParseAttribute(const FieldValuePairVector &fvs, PrimAttrib *attr,
value.resize(fv.second.GetData().size() / sizeof(int));
memcpy(value.data(), fv.second.GetData().data(), fv.second.GetData().size());
attr->var.set_scalar(value);
attr->variability = variability;
attr->interpolation = interpolation;
success = true;
@@ -4012,20 +4032,20 @@ bool Parser::_ParseAttribute(const FieldValuePairVector &fvs, PrimAttrib *attr,
std::cout << "IntArray"
<< "\n";
const int32_t *ptr =
reinterpret_cast<const int32_t *>(attr->buffer.data.data());
for (size_t i = 0; i < attr->buffer.GetNumElements(); i++) {
std::cout << "[" << i << "] = " << ptr[i] << "\n";
}
//const int32_t *ptr =
// reinterpret_cast<const int32_t *>(attr->buffer.data.data());
//for (size_t i = 0; i < attr->buffer.GetNumElements(); i++) {
// std::cout << "[" << i << "] = " << ptr[i] << "\n";
//}
#endif
} else if (fv.second.GetTypeName() == "Token") {
#ifdef TINYUSDZ_LOCAL_DEBUG_PRINT
std::cout << "bbb: token: " << fv.second.GetToken() << "\n";
#endif
//attr->var = fv.second.GetToken();
// attr->variability = variability;
// attr->facevarying = facevarying;
attr->var.set_scalar(fv.second.GetToken());
attr->variability = variability;
//attr->interpolation = interpolation;
success = true;
}
}
@@ -4399,25 +4419,31 @@ bool Parser::_ReconstructGeomMesh(
#ifdef TINYUSDZ_LOCAL_DEBUG_PRINT
std::cout << "got point\n";
#endif
auto p = attr.var.get_value<std::vector<primvar::point3f>>();
if (p) {
mesh->points = (*p);
} else {
_err += "`points` must be point3[] type, but got " +
primvar::GetTypeName(attr.var.type_id());
return false;
}
//if (auto p = primvar::as_vector<Vec3f>(&attr.var)) {
// mesh->points = (*p);
//}
} else if (prop_name == "doubleSided") {
//if (auto p = primvar::as_basic<bool>(&attr.var)) {
// mesh->doubleSided = (*p);
//}
auto p = attr.var.get_value<bool>();
if (p) {
mesh->doubleSided = (*p);
}
} else if (prop_name == "extent") {
// vec3f[2]
//if (auto p = primvar::as_vector<Vec3f>(&attr.var)) {
// if (p->size() == 2) {
// mesh->extent.value.lower = (*p)[0];
// mesh->extent.value.upper = (*p)[1];
// }
//}
auto p = attr.var.get_value<std::vector<Vec3f>>();
if (p && p->size() == 2) {
mesh->extent.value.lower = (*p)[0];
mesh->extent.value.upper = (*p)[1];
}
} else if (prop_name == "normals") {
//if (auto p = primvar::as_vector<Vec3f>(&attr.var)) {
// mesh->normals = std::move(attr);
//}
mesh->normals = attr;
} else if ((prop_name == "primvars:UVMap") &&
(attr.type_name == "texCoord2f[]")) {
// Explicit UV coord attribute.
@@ -4432,23 +4458,26 @@ bool Parser::_ReconstructGeomMesh(
// mesh->st.variability = attr.variability;
//}
} else if (prop_name == "faceVertexCounts") {
//if (auto p = primvar::as_vector<int>(&attr.var)) {
// mesh->faceVertexCounts = (*p);
auto p = attr.var.get_value<std::vector<int>>();
if (p) {
mesh->faceVertexCounts = (*p);
}
#ifdef TINYUSDZ_LOCAL_DEBUG_PRINT
// // aaa: typeName: int[]
// std::cout << "got faceVertexCounts. num = "
// << p->size() << "\n";
// std::cout << " num = " << mesh->faceVertexCounts.size() << "\n";
std::cout << "got faceVertexCounts. \n";
std::cout << " num = " << mesh->faceVertexCounts.size() << "\n";
#endif
//}
} else if (prop_name == "faceVertexIndices") {
//if (auto p = primvar::as_vector<int>(&attr.var)) {
// mesh->faceVertexIndices = (*p);
auto p = attr.var.get_value<std::vector<int>>();
if (p) {
mesh->faceVertexIndices = (*p);
}
#ifdef TINYUSDZ_LOCAL_DEBUG_PRINT
// aaa: typeName: int[]
// std::cout << "got faceVertexIndices\n";
// std::cout << " num = " << mesh->faceVertexIndices.size() << "\n";
std::cout << "got faceVertexIndices\n";
std::cout << " num = " << mesh->faceVertexIndices.size() << "\n";
#endif
//}
@@ -4939,7 +4968,7 @@ bool Parser::_ReconstructSceneRecursively(
const Spec &spec = _specs[spec_index];
#ifdef TINYUSDZ_LOCAL_DEBUG_PRINT
std::cout << IndentStr(level)
<< " specTy = " << GetSpecTypeString(spec.spec_type) << "\n";
<< " specTy = " << tinyusdz::to_string(spec.spec_type) << "\n";
std::cout << IndentStr(level)
<< " fieldSetIndex = " << spec.fieldset_index.value << "\n";
#endif
@@ -5282,7 +5311,7 @@ bool Parser::ReadSpecs() {
for (size_t i = 0; i != num_specs; ++i) {
std::cout << "spec[" << i << "].pathIndex = " << _specs[i].path_index.value
<< ", fieldset_index = " << _specs[i].fieldset_index.value
<< ", spec_type = " << _specs[i].spec_type << "\n";
<< ", spec_type = " << tinyusdz::to_string(_specs[i].spec_type) << "\n";
std::cout << "spec[" << i
<< "] string_repr = " << GetSpecString(Index(uint32_t(i)))
<< "\n";

4
tests/unit/unit-pxr-compat-api.cc
View File

@@ -1,3 +1,7 @@
#ifdef _MSC_VER
#define NOMINMAX
#endif
#define TEST_NO_MAIN
#include "acutest.h"