Commit Graph

71 Commits

Author SHA1 Message Date
rdb b7fa25f8f4 assimp: Disable loading .glb and .gltf via Assimp by default
Fixes #1537
2023-10-22 12:08:09 +02:00
rdb 3833a35fa9 Merge branch 'release/1.10.x' 2023-10-22 12:06:18 +02:00
rdb 0121e74aa4 assimp: Add assimp-disable-extensions config var (for #1537)
This can be used to disable certain extensions from being loaded via Assimp

Also makes the `get_additional_extensions()` method a bit more efficient by having it avoid string concatenation, using a temporary buffer instead
2023-10-22 11:59:30 +02:00
rdb 9bd66baa1c Merge branch 'release/1.10.x' 2022-11-21 19:02:50 +01:00
rdb d893b21f2b assimp: Fix assert loading meshes with multiple primitive types 2022-11-19 13:12:14 +01:00
rdb 37f7dc285b assimp: Set assimp-collapse-dummy-root-node to true by default
See #366
2022-11-03 13:45:22 +01:00
rdb 2a9a32fea9 assimp: Drop support for older versions of Assimp
We now require at least Assimp 4, I believe.
2022-11-03 13:45:22 +01:00
rdb e75aae62f0 Merge branch 'release/1.10.x' 2022-11-03 13:45:05 +01:00
rdb db6ea00967 assimp: Add assimp-collapse-dummy-root-node option
This is false for now, but will be true in the future.

See #366
2022-11-03 13:18:49 +01:00
rdb 1fd2e124cf assimp: Fix unprotected debug statements 2022-11-03 13:14:07 +01:00
rdb 2044861597 assimp: Support custom object properties as tags 2022-11-02 23:02:33 +01:00
rdb ffe2137680 assimp: Support reading additional texture maps, as well as PBR 2022-11-02 23:02:21 +01:00
rdb 286cf0d286 assimp: Improve performance of loading geometry 2022-11-02 23:02:21 +01:00
rdb 162a7b2c34 assimp: Support reading tangents and binormals 2022-11-02 23:02:21 +01:00
rdb 5a483e3899 assimp: Fix a typo in a config var description 2022-11-02 23:02:21 +01:00
rdb 6e636f5ca0 assimp: Fix issues reading external files 2022-11-02 23:02:20 +01:00
rdb b254e5b7ba assimp: Support importing alpha mode from glTF files 2022-11-02 23:02:20 +01:00
rdb 9248182a0b assimp: Support texture transforms 2022-11-02 23:02:20 +01:00
rdb 2226f8de9e assimp: Add support for texture wrapping modes 2022-11-02 19:35:10 +01:00
rdb 09a81e0d68 assimp: Fix memory corruption in load_texture_stage() 2022-11-02 19:34:39 +01:00
rdb c62d2319e0 CMake: Add --exclude-libs flags to static thirdparty libraries
Matching makepanda, this avoids symbol conflicts and may have optimization benefits.

This is a temporary hack until CMake 3.24 is released, which offers a cleaner way of doing this.
2022-03-09 16:23:37 +01:00
rdb 5de31c6293 Merge branch 'release/1.10.x' 2021-12-04 21:57:35 +01:00
Daniel 80892ede94 assimp: Support compilation with Assimp 5.x
Closes #1212
2021-12-04 20:44:21 +01:00
rdb 0c5fedfc9b Merge branch 'release/1.10.x' 2021-07-02 16:03:41 +02:00
rdb 14e95eec72 assimp: Load normal column as C_normal instead of C_vector
Fixes #1163
2021-07-02 15:45:56 +02:00
Stephen Imhoff 18873ffbf1 Add use of TransformState::make_pos_quat() in some places (#1116)
Fixes #1116
2021-02-22 20:06:26 +01:00
Sam Edwards dbe7a2f94b Merge branch 'master' into cmake 2019-09-06 04:05:12 -06:00
Sam Edwards b86332376c CMake: Move Assimp plugin to its own install component 2019-09-06 01:51:51 -06:00
rdb 35135ea0e1 Merge branch 'release/1.10.x' 2019-09-01 21:54:57 +02:00
rdb 4d254177ba general: Fix missing notifyCategoryProxy.h includes 2019-09-01 21:44:42 +02:00
Sam Edwards 19ed9f6b47 Merge branch 'master' into cmake 2019-08-24 18:07:12 -06:00
rdb 5e7e64179b cleanup: fix a host of unprotected debug/spam messages 2019-08-23 18:58:57 +02:00
Sam Edwards c16092fe8a CMake: Workaround for some export errors when doing a static build
This refuses to export/install the p3assimp/p3ptloader/p3txafile
libraries when building statically, because they depend on libraries
that are never installed, and static linkage would require all of the
dependencies to be available.

A more proper fix would involve installing these base libraries, but
only when doing a static build. I suspect nobody will ask for that,
so I haven't done it.
2019-08-19 18:50:53 -06:00
rdb 42d112d08d assimp: fix some issues with importing rigged characters 2019-07-25 20:48:03 +02:00
Sam Edwards f8161cc529 Merge branch 'master' into cmake 2019-03-12 02:03:16 -06:00
rdb 92e8b77344 assimp: remove no longer used AssimpLoader pointer 2019-02-20 23:12:06 +01:00
rdb 8ba6a0d844 assimp: don't reuse Importer object when loading multiple models
This works around a crash in v4.1.0 when loading multiple .ply files in sequence.  (I have not reproduced the crash with the latest Assimp master.)
2019-02-19 21:23:37 +01:00
tc e1e5b907c1 add aiProcess_GenNormals + aiProcess_GenSmoothNormals 2019-01-11 00:07:17 +01:00
Sam Edwards 99fee1a64d CMake: Assign COMPONENT and EXPORT to all targets 2018-12-06 17:48:44 -07:00
Sam Edwards df805bd02b Merge branch 'master' into cmake 2018-11-28 21:54:58 -07:00
Sam Edwards 940ef456ff CMake: Only link PRIVATEly against libraries not installed 2018-11-28 14:06:05 -07:00
rdb 97d4e32a06 general: use nassert_raise instead of nassertv(false) et al
Even a brief error message in the assertion is infinitely more useful to a user who is not at home in the source code, especially for assertions that may reasonably be triggered by honest user mistakes.
2018-11-28 17:35:20 +01:00
Sam Edwards 1ae736f881 CMake: Detect and build support for Assimp 2018-11-12 15:49:08 -07:00
Sam Edwards 29beb0f043 assimp: Update include path
This changes the Assimp include path to point to the
directory containing assimp/ instead of inside assimp/
directly. This is for consistency with how the Assimp
project defines their "include path" and keeps the actual
inclusions themselves unambiguous (since Assimp's headers
have fairly generic filenames).
2018-11-10 18:00:09 -07:00
rdb 00b5c9d168 assimp: add various config variables, change default winding order 2018-08-12 22:37:39 +02:00
Sam Edwards b2bfb31114 general: Remove `using std::*` from headers
Also remove most `using namespace std;` statements. The only one that remains is in py_panda.h.

Closes #350
Closes #335
2018-06-14 16:04:49 +02:00
Sam Edwards 7790f8429d general: Fully qualify header references into the std namespace
Closes #341
2018-06-07 10:35:12 +02:00
Sam Edwards e2b4353800 general: Replace NULL (and 0 as pointer) with C++11 nullptr
Exceptions to this replacement are:
- .c files
- Headers included by a .c file
- stb_image.h
- dr_flac.h
- Strings
- Comments
2018-06-03 16:35:13 -06:00
rdb 758cd523e2 Don't use assimp/ prefix when including assimp files 2016-10-27 12:37:00 +02:00
rdb dc09e28ed9 Also accept a .gz wherever a .pz file is accepted 2016-04-29 16:54:25 +02:00