Merge branch 'dev' of github.com:syoyo/tinyusdz into dev

lighttransport · Oct 14, 2023 · 6e181a2 · 6e181a2
2 parents ce2a632 + 4992dd1
commit 6e181a2
Show file tree

Hide file tree

Showing 14 changed files with 414 additions and 151 deletions.
diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt
@@ -7,6 +7,7 @@ option(TINYUSDZ_USE_USDOBJ "Build with built-in .obj support" On)
 set(TINYUSDZ_SOURCES
         ${PROJECT_SOURCE_DIR}/../../../../../src/tinyusdz.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/asset-resolution.cc
+        ${PROJECT_SOURCE_DIR}/../../../../../src/composition.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/prim-types.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/ascii-parser.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/ascii-parser-basetype.cc
@@ -29,19 +30,23 @@ set(TINYUSDZ_SOURCES
         ${PROJECT_SOURCE_DIR}/../../../../../src/image-loader.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/usda-writer.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/usdGeom.cc
+        ${PROJECT_SOURCE_DIR}/../../../../../src/usdSkel.cc
+        ${PROJECT_SOURCE_DIR}/../../../../../src/usdShade.cc
+        ${PROJECT_SOURCE_DIR}/../../../../../src/usdMtlx.cc
+        ${PROJECT_SOURCE_DIR}/../../../../../src/usdLux.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/xform.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/stage.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/str-util.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/path-util.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/image-util.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/image-writer.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/linear-algebra.cc
+        ${PROJECT_SOURCE_DIR}/../../../../../src/tydra/facial.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/tydra/scene-access.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/tydra/render-data.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/tydra/prim-apply.cc
         ${PROJECT_SOURCE_DIR}/../../../../../src/tydra/shader-network.cc
         )
-
 if (TINYUSDZ_USE_USDOBJ)
     list(APPEND TINYUSDZ_SOURCES
             ${PROJECT_SOURCE_DIR}/../../../../../src/usdObj.cc)

diff --git a/android/build.gradle b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/examples/openglviewer/CMakeLists.txt b/examples/openglviewer/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
 
 set(BUILD_TARGET "usdz_glview")
 
-project(${BUILD_TARGET} CXX)
+project(${BUILD_TARGET} CXX C)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED On)