Commit Graph

45 Commits

Author SHA1 Message Date
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
tobspr 0fcfb8e372 New file headers, new comment style 2016-02-17 17:47:48 +01:00
Mitchell Stokes 1df9be6fc0 Assimp: Support skeletons with unconnected bones
We needed to detect islands of bones and create anims and parts for them.
2016-01-01 19:36:03 -08:00
rdb ad238ad995 Replace crash in assimp with assertion 2016-01-02 01:00:03 +01:00
Mitchell Stokes e2c5214f39 Assimp: Add initial support for skeletal mesh animations 2016-01-01 15:21:35 -08:00
rdb 956097b632 Merge branch 'release/1.9.x'
Conflicts:
	pandatool/src/assimp/pandaLogger.h
2015-12-03 16:14:07 +01:00
rdb 946c1e986d Fix Assimp compile warning 2015-11-28 15:51:51 +01:00
rdb db3ab953e4 Remove ppremake, genPyCode, and all hacks created to support them 2015-11-09 19:06:49 +01:00
Mitchell Stokes 45e1f4d25e Assimp: Cleanup skeletal mesh code.
* Use pmap instead of phash_map
  * Remove PT() in create_joint() function header
2015-10-06 20:41:16 -07:00
Mitchell Stokes 43958e820c Assimp: Add support for skinned meshes (no animations yet). 2015-10-05 21:02:14 -07:00
rdb f22cc71995 Fix double-precision build blibli 2015-07-29 14:07:06 +02:00
rdb 41b44683b6 Compile with older versions of Assimp 2015-07-03 19:38:10 +02:00
rdb 179b10ca83 Assimp loader now handles aiLightSource_AMBIENT lights 2015-06-19 21:57:29 +02:00
rdb 945d3c4035 Fix compiler errors and crashes with Assimp loader 2015-06-19 21:18:28 +02:00
Mitchell Stokes 5f735b4e50 Changes to makepanda to compile with Assimp
This includes updating header files for Assimp 3.
2015-06-03 23:43:02 -07:00
rdb a387909cf2 fix compilation issue 2011-12-23 12:42:07 +00:00
David Rose c5c21a566a UnalignedLVecBase etc, remove lerp etc, moving towards Eigen on win32 2011-12-18 16:30:31 +00:00
David Rose 622c047344 several USE_PACKAGES oopses 2011-12-12 22:53:39 +00:00
David Rose dfe16c64f6 rename all Panda-built libraries to begin with libp3 or libpanda 2011-12-06 02:39:21 +00:00
David Rose 501470169f stdfloat_double 2011-10-10 05:25:10 +00:00
rdb 70f6605442 some fixes to PandaIOStream 2011-05-24 12:11:00 +00:00
rdb 19e73932d2 add assimp stuff 2011-05-22 15:47:20 +00:00