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

Browse Source 
Fix android cmakelist.
This commit is contained in:
Syoyo Fujita
2023-11-29 08:48:12 +09:00
parent 4fa3db7851
commit 8be9dcbb89
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/cpp/CMakeLists.txt
View File

@@ -63,7 +63,7 @@ set(TINYUSDZ_DEP_SOURCES
#${PROJECT_SOURCE_DIR}/../../../../../src/external/string_id/error.cpp
${PROJECT_SOURCE_DIR}/../../../../../src/external/fpng.cpp
#${PROJECT_SOURCE_DIR}/../../../../../src/external/staticstruct.cc
${PROJECT_SOURCE_DIR}/../../../../../src/external/tinyxml2/tinyxml2.cpp
#${PROJECT_SOURCE_DIR}/../../../../../src/external/tinyxml2/tinyxml2.cpp
)
# Reuse files from sdlviewer

13
src/usdShade.cc
View File

@@ -13,6 +13,19 @@
namespace tinyusdz {
std::string to_string(const MaterialBindingStrength strength) {
switch (strength) {
case MaterialBindingStrength::WeakerThanDescendants: {
return kWeaderThanDescendants;
}
case MaterialBindingStrength::StrongerThanDescendants: {
return kStrongerThanDescendants;
}
}
return "[[Invalid MaterialBindingStrength]]";
}
bool UsdShadePrim::has_sdr_metadata(const std::string &key) {
if (!metas().sdrMetadata.has_value()) {
return false;

13
src/usdShade.hh
View File

@@ -48,18 +48,7 @@ enum class MaterialBindingStrength
};
// TODO: Move to pprinter.hh?
static std::string to_string(const MaterialBindingStrength strength) {
switch (strength) {
case MaterialBindingStrength::WeakerThanDescendants: {
return kWeaderThanDescendants;
}
case MaterialBindingStrength::StrongerThanDescendants: {
return kStrongerThanDescendants;
}
}
return "[[Invalid MaterialBindingStrength]]";
}
std::string to_string(const MaterialBindingStrength strength);
// TODO: Inherit from Prim?
struct UsdShadePrim {