Commit Graph

6671 Commits (ebd4963b90b45dbdbdb645d2491c0b18bed8516e)

Author SHA1 Message Date
Steve M ebd4963b90 Merge branch 'master' into integrate-tinyusdz 2024-04-07 20:52:57 -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
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
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 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 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 919fe7283a Introduce README, sort C++ files 2024-03-30 21:44:04 -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 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 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
Kristjan Skutta feb861f17b
Fix duplicate degrees to radians conversion in fbx importer. (#5427)
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-03-22 00:01:57 +01:00
Kim Kulling fcb1444b84
Add correction of fbx model rotation (#5494) 2024-03-17 17:46:28 +01:00
Laura Hermanns 727774f181
Fix compilation for MSVC14. (#5490)
- std::min/max were not defined in StackAllocator.inl; Also added explicit template arguments to break macro expansion if Windows.h is included prior and NOMINMAX macro is not present.
- Made static_assert statements compatible with C++11 in ProcessHelper.cpp.
- Removed unused string_view include in ObjFileParser.cpp.
2024-03-11 09:09:23 +01:00
sSsA01 f95050e7aa
Append a setting "AI_CONFIG_EXPORT_FBX_TRANSPARENCY_FACTOR_REFER_TO_OPACITY". (#5450)
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-27 20:26:13 +01:00
Kim Kulling 01231d0e60
Add 2024 to copyright infos (#5475) 2024-02-23 22:30:05 +01:00
Kim Kulling 4d6dd80257
Add correct double zero check (#5471)
* Add correct double zero check

* Use std::fpclassify
2024-02-22 13:58:25 +01:00
Adam Mizerski 4b9f46dbda
ColladaParser: check values length (#5462)
* ColladaParser: check values length

fixes: #4286

* Refactor calculation of size for data

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-15 13:07:00 +01:00
fvbj 2d98f6a880
Fix identity matrix check (#5445)
* Fix identity matrix check

Adds an extra epsilon value to check the matrix4x4 identity. The method is also used to export to GLTF/GLTF2 format to check node transformation matrices. The epsilon value can be set using AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON with the default value set to 10e-3f for backward compatibility of legacy code.

* Fix type of float values in the unit test

* Update matrix4x4.inl

Fix typo

* Update matrix4x4.inl

Remove dead code.

* Add isIdentity-Test

* Update AssimpAPITest_aiMatrix4x4.cpp

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-06 21:24:41 +01:00
Julian Knodt c877a15140
`Blendshape`->`Geometry` in FBX Export (#5419)
When loading a mesh exported from assimp into Blender, it warns that it has an incorrect class.
While debugging, I traced it back to this being `Blendshape` where `Geometry` was expected. This
is likely because this node describes a `Geometry`, which is used as a blendshape. I'm not sure
if any other DCC tools or places to import it expect `Blendshape` instead (i.e. was this code
ever tested?), but it fixes its use in Blender.

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-05 16:55:00 +01:00
Florian Born f59a5fab1a
More GLTF loading hardening (#5415)
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-04 21:23:31 +01:00
Galen Xiao b7b6601a75
feat:1.add 3mf vertex color read 2.fix 3mf read texture bug (#5361)
* feat:1.add 3mf vertex color read 2.fix 3mf read texture bug

* fix checks failed

* Trigger CI

---------

Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-04 20:23:07 +01:00
Steve M 005399a671
Fix X importer breakage introduced in commit f844c33 (#5372)
* Update XFileImporter.cpp

Comment out boneIdx conditional which caused massive breakage

* Update XFileImporter.cpp

Fix typo

* Update XFileImporter.cpp

Dummy whitespace change to attempt to re-trigger failing CI tests

---------

Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-02-04 10:38:07 +01:00
Kim Kulling 3990ec80a1
Kimkulling/fix bahavior of remove redundat mats issue 5438 (#5451)
* Fix crash in viewer

* Fix bevavior when material was not referenced
2024-02-01 21:27:04 +01:00
Kim Kulling 3476c79801
Static code analysis fixes (#5447)
* Static code analysis fixes

- Fix warning in LOW

* Fix possible out of bound access.

* Add default to class declaration
2024-01-31 09:30:54 +01:00
Kim Kulling c08e3b4abb
Add bounds checks to the parsing utilities. (#5421)
* Add bounds checks to the parsing utilities.

* Fix merge conflicts in ACLoader.

* Fix loaders

* Fix unittest of AC-Loader.

* Remove dead code.

* Md5Parser fixes

* Fix md5-parsing

* Fix Merge conflict

* Fix merge conflicts.

* Md5: Fix warning: missing return statement.
2024-01-30 14:32:41 +01:00
tigertang a02085ea98 Update StbCommon.h to stay up-to-date with stb_image.h.
This enables C++ API users to statically link Assimp into their projects along with stb_image.
2024-01-29 13:52:54 +01:00