Commit Graph

12465 Commits (ebd4963b90b45dbdbdb645d2491c0b18bed8516e)

Author SHA1 Message Date
Steve M ebd4963b90 Merge branch 'master' into integrate-tinyusdz 2024-04-07 20:52:57 -07:00
Steve M 72559747de Update to tinyusdz "dev" branch commit 3240ab0 2024-04-07 20:36:26 -07:00
Kim Kulling 8b9ed34eaa
Update CMakeLists.txt (#5531)
* Update CMakeLists.txt

* Update Version.cpp

* Update CMakeLists.txt

Update minimum version of cmake

* Update utVersion.cpp

Adapt unittest
2024-04-07 23:14:12 +02:00
Kim Kulling b41ffa5561
Remove default destructor definitions from cpp files (#5528) 2024-04-07 21:42:52 +02:00
mosfet80 4a3e0e46ac
updated json (#5501)
fix https://github.com/Tencent/rapidjson/issues/1448

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-04-07 21:24:57 +02:00
Tom Heaton 1f920ee1fe
Update matrix4x4.h (#5507)
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-04-07 20:16:48 +02:00
mosfet80 778ce90a04
Update hunter into CMakeLists.txt (#5505)
Update 'CURL' to v8.5.0 
Update 'xxHash' to v0.8.2 
Update 're2' to v2023.03.01 
docs: Add SHA1 calculation onliner and fix sums 
docs: fix URLs for FunctionalPlus and PocoCpp 
ceres-solver: update to 2.2.0-p2 with SuiteSparse v7.5.1-1 
SuiteSparse: update to v7.5.1-1

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-04-07 16:49:55 +02:00
Steve M caf3051c67 Update to tinyusdz "dev" branch commit f8f9bb8 2024-04-06 17:24:24 -07:00
Steve M 0bba1aa5b5 Update to tinyusdz "dev" branch commit b622782 2024-04-06 16:13:50 -07:00
Alejandro González 790aad4b62
Add macOS support to C4D importer (#5516)
The latest Cineware SDK explicitly asserts macOS support in its
documentation, but Assimp's C4D importer only works with Windows MSVC
targets. Let's improve its portability by refactoring importer code to
not depend on MSVC-only data types and quirks, and add support for linking
against the universal macOS static libraries provided in the Cineware
SDK.

Note that the C4D importer still cannot support Linux platforms because
Maxon does not provide the necessary precompiled Cineware libraries for
that platform. Windows MinGW targets are also out of the question as the
MinGW toolchain uses compiled libraries in a different format.

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-04-07 00:25:46 +02:00
RoboSchmied 52c2b6896a
Fix 16 typos (#5518)
Signed-off-by: RoboSchmied <github@roboschmie.de>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-04-06 21:26:32 +02:00
Oleg Ivanov 9d11b220eb
Fix utDefaultIOStream test under MinGW (#5525) 2024-04-06 12:48:28 +02:00
Steve M 47ed2f5b29 Nascent embedded texture parsing
Untested since tinyusdz doesn't yet fully support embedded textures
2024-04-05 19:58:25 -07:00
Steve M f232e45846 Introduce crude android logging
(cherry picked from commit e427beca05b62b0f7c33ed7fc95dece5adb9a113)
2024-04-04 19:57:08 -07:00
Steve M 75c3857c0b Add material colors 2024-04-04 19:52:44 -07:00
Steve M fb84d91350 Nascent normals, materials 2024-04-04 18:51:49 -07:00
Steve M c28b73a571 Update header 2024-04-02 20:02:09 -07:00
Steve M 5c25947792 Add model name param for logging 2024-04-02 19:59:03 -07:00
Steve M a844fd8610 Add model name param for logging 2024-04-02 19:56:05 -07:00
Julian Knodt 39ce0c0456
Respect merge identical vertices in ObjExporter (#5521)
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-04-02 18:31:19 +02:00
Steve M 86f6c617e0 Remove option ASSIMP_TINYUSDZ_ENABLED 2024-04-01 12:14:35 -07:00
Steve M 64b510e412 Ignore unused (in case -Werror set) 2024-04-01 12:13:28 -07:00
Steve M f42d8ad109 Add count vars 2024-03-31 20:53:52 -07:00
Steve M 6459418a6b Pare down unused tinyusdz files 2024-03-31 20:40:30 -07:00
Steve M 8fa6e8ef0f Add functions for inspecting render_scene 2024-03-31 19:01:44 -07:00
Steve M 475a60298a Introduce logging support 2024-03-31 07:46:29 -07:00
Steve M be6248ad43 Introduce nascent USD unit test 2024-03-30 22:03:32 -07:00
Steve M 76a3580bd3 Improve docs 2024-03-30 21:59:21 -07:00
Steve M 919fe7283a Introduce README, sort C++ files 2024-03-30 21:44:04 -07:00
Steve M dbea6d0cb2 Remove unused 2024-03-30 21:32:13 -07:00
Steve M fe5cbad587 Add mesh name
TODO: mesh name always blank for models tested against so far
2024-03-30 20:14:21 -07:00
Steve M 1e6bc0ce93 Nascent material setup 2024-03-30 18:50:43 -07:00
Steve M 4be5bed039 Nascent normals from model 2024-03-30 14:42:32 -07:00
Steve M 2767cc8e95 Attempt improve UV conversion
TODO: still not right, also normals completely messed up
2024-03-30 14:05:14 -07:00
Steve M d890384452 Add nascent uvs 2024-03-30 12:11:03 -07:00
Steve M 51ddcbe5a4 Extract function for mesh faces setup 2024-03-30 10:52:34 -07:00
Steve M 54f0673686 Add texture files 2024-03-30 10:36:37 -07:00
Steve M 825f81b180 Add additional test usda/usdc models (copied from tinyusdz/models) 2024-03-30 10:34:44 -07:00
Steve M 1285d90c11 Introduce USD test model (copied from tinyusdz/models) 2024-03-30 10:28:57 -07:00
Steve M 84ed4fe711 Fix faces; suzanne.usdc loads and renders correctly 2024-03-30 10:16:27 -07:00
Steve M 8e9f3f533e Sign 'o life: simple usdc cube loads
TODO: faces incorrect
2024-03-30 09:36:29 -07:00
Steve M 847859e47d Introduce intermediate function 2024-03-30 09:33:40 -07:00
Steve M b1bd8d700a Nascent vertices for mesh 2024-03-30 08:34:11 -07:00
Steve M 1afc1d90e7 Nascent valid assimp scenePtr (but meshes have zero vertices) 2024-03-30 08:06:04 -07:00
Steve M ed42e4dc6d Add crude extension detectors for usdz, usd files 2024-03-30 08:00:11 -07:00
Steve M 08da18f4d3 Nascent decouple private impl 2024-03-29 21:36:20 -07:00
Steve M 021bf76518 Introduce common utils 2024-03-29 21:35:12 -07:00
Steve M 8b2d7775d9 Add namespace to tinyusdz texture classes
TODO: w/o namespace assimp build will break (if building tinyusdz standalone, would need to update source files w/namespace)
2024-03-29 21:04:20 -07:00
Steve M ed9dafc3c1 Add nascent USD importer 2024-03-29 21:02:36 -07:00
Steve M dc123acc63 Add tinyusdz source files if option enabled 2024-03-29 20:49:29 -07:00