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

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

Browse Source
This commit is contained in:
Syoyo Fujita
2023-05-17 19:57:35 +09:00
parent f1bd5bc9c0 da3b390084
commit 4d8683d45d
10 changed files with 233 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/app/build.gradle
View File

@@ -28,6 +28,7 @@ android {
//version "3.18.1"
}
}
namespace 'com.example.hellotinyusdz'
}
dependencies {

3
android/app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.hellotinyusdz">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

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

@@ -4,6 +4,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/prim-types.cc
${PROJECT_SOURCE_DIR}/../../../../../src/ascii-parser.cc
${PROJECT_SOURCE_DIR}/../../../../../src/ascii-parser-basetype.cc
@@ -28,9 +29,15 @@ set(TINYUSDZ_SOURCES
${PROJECT_SOURCE_DIR}/../../../../../src/usdGeom.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/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)

4
android/build.gradle
View File

@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.40'
ext.kotlin_version = '1.6.21'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.android.tools.build:gradle:8.0.1'
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

5
android/gradle.properties
View File

@@ -16,4 +16,7 @@ org.gradle.jvmargs=-Xmx1536m
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useAndroidX=true
android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists