Commit Graph

12783 Commits

Author SHA1 Message Date
Kim Kulling
9b1759dcc2 Merge branch 'master' into migenius-migenius-rsws53-mig-2 2020-04-22 19:59:53 +02:00
Kim Kulling
ca70b44e44 Merge branch 'migenius-rsws53-mig-2' of https://github.com/migenius/assimp into migenius-migenius-rsws53-mig-2 2020-04-22 19:58:41 +02:00
Kim Kulling
76f2e783c3 Merge branch 'master' into ps-devel-fix-contrib-zlib-static-compile-001 2020-04-21 20:59:46 +02:00
Kim Kulling
e3256303f5 Merge pull request #3085 from napina/optimized_bonelimits
Optimized LimitBoneWeightsProcess.
2020-04-21 19:52:36 +02:00
Kim Kulling
2471ae9fcc Merge branch 'master' into optimized_bonelimits 2020-04-21 19:31:54 +02:00
Kim Kulling
92cb3402ab Merge pull request #3161 from assimp/kimkulling-installerupdate
Update to 5.0.1
2020-04-21 19:31:05 +02:00
Kim Kulling
c36b028412 fix type error for template deduction. 2020-04-21 16:39:18 +02:00
Kim Kulling
232761be02 Fix another typo 2020-04-21 16:09:11 +02:00
Kim Kulling
32de8737b7 Update to 5.0.1 2020-04-21 16:07:58 +02:00
Kim Kulling
435f898ffa Update to 5.0.1 2020-04-21 16:06:52 +02:00
Kim Kulling
843ca6e386 Fix typo 2020-04-21 15:50:17 +02:00
Kim Kulling
428b91154a Adapt smallvector
- Add doc ( public header )
- Fix type error
2020-04-21 08:59:40 +02:00
Kim Kulling
788f2f244e Adapt code
- Reformatting based on clang-format rules
- Add usage of size_t instead of unsigned int for sizes
- Fix typo in naming
2020-04-21 08:50:51 +02:00
Kim Kulling
c91d3764ca Merge branch 'master' into optimized_bonelimits 2020-04-21 08:45:50 +02:00
Trevor David Black
cb88210c62 Completed scene wide rendering output 2020-04-20 12:23:22 -07:00
Trevor David Black
1045fb7798 Got 90 percent solution for exporting camera data 2020-04-20 11:55:46 -07:00
Kim Kulling
69bdebf3ac Merge pull request #3149 from timuber/master
Add support for glTF2 targetNames
2020-04-20 14:52:53 +02:00
Kim Kulling
f71b332ed1 Update glTF2Asset.inl
fix VS-compiler warning.
2020-04-19 21:14:47 +02:00
Kim Kulling
e3563212d7 Merge branch 'master' into master 2020-04-19 21:13:12 +02:00
Kim Kulling
e0f6eb09e6 Merge branch 'master' into optimized_bonelimits 2020-04-17 20:37:28 +02:00
Kim Kulling
8219b7c362 Merge pull request #3155 from Zalewa/libsuffix-import-prefix
Erase the remaining _INSTALL_PREFIX and LIBSUFFIX in CMake files
2020-04-17 20:36:59 +02:00
Trevor David Black
f9f2d617a2 Added a very basic camera. Still work to do 2020-04-17 10:42:13 -07:00
Kim Kulling
1567652e60 Merge branch 'master' into libsuffix-import-prefix 2020-04-17 19:22:50 +02:00
Kim Kulling
6daecdcc5a Merge pull request #3158 from Hehongyuanlove/master
3MF fix
2020-04-17 19:19:21 +02:00
Kim Kulling
c67f97e956 Merge branch 'master' into master 2020-04-17 16:37:09 +02:00
Kim Kulling
e299f71cfe Adapt the formatting 2020-04-17 16:16:28 +02:00
Kim Kulling
f4b7a98131 Merge pull request #3131 from malortie/sample-simpletextureddirectx11-nullptr
Replaced NULL with nullptr for pointers in sample SimpleTexturedDirectx11.
2020-04-17 14:54:08 +02:00
Kim Kulling
966b5f4330 Merge branch 'master' into sample-simpletextureddirectx11-nullptr 2020-04-17 14:43:20 +02:00
Hehongyuanlove
9c52fd7633 Update D3MFExporter.cpp 2020-04-17 12:58:41 +08:00
Hehongyuanlove
f80bdc5b71 Update StringUtils.h 2020-04-17 12:57:33 +08:00
Hehongyuanlove
59e32a5ad9 Update StringUtils.h 2020-04-17 12:51:18 +08:00
Hehongyuanlove
cc3760aff1 Update StringUtils.h 2020-04-17 12:50:49 +08:00
Hehongyuanlove
e9a72a5053 repair formate 3MF 2020-04-17 12:38:07 +08:00
Hehongyuanlove
3bbc8e76bd Rgba2Hex to repair rgba(1,1,1,1) 2020-04-17 12:34:05 +08:00
Hehongyuanlove
3154cec79c Rgba2Hex add 2020-04-17 12:31:07 +08:00
Robikz
379d59bcbd Erase the remaining _INSTALL_PREFIX and LIBSUFFIX in CMake files
These seem to have survived from the migration to GNUInstallDirs in
9fb81c3be6

_INSTALL_PREFIX was not set anywhere and resolved to empty value, which
in turn caused some paths in the installed lib config CMake files to
start from '/', effectively causing the failure of the "do the installed
files exist" checks.

After complete replacement of all uses of the _INSTALL_PREFIX with
GNUInstallDirs equivalents, the LIBSUFFIX variable has become unused
and can be removed too.
2020-04-16 16:02:34 +02:00
Kim Kulling
4314fc0521 Merge pull request #3070 from ms-maxvollmer/GLTF2_recursive_references_fix
GLTF2: Detect and abort recursive references
2020-04-16 11:47:39 +02:00
Kim Kulling
c0dc26de8e Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-16 11:29:37 +02:00
Kim Kulling
1e74fe85bf Merge pull request #3068 from ms-maxvollmer/GLTF2_invalid_buffer_fix
GLTF2: ExtractData now throws exception instead of returning false if data is invalid
2020-04-16 11:28:38 +02:00
Kim Kulling
996abd3fbe Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-16 11:08:29 +02:00
Kim Kulling
e5786bbd8d Merge pull request #3049 from Nimer-88/ifdef_export_defines
ifdef the exporters as specifying stricter linker flags than what's in default CMake causes linking issues
2020-04-16 11:07:49 +02:00
Kim Kulling
d12e938a70 Merge branch 'master' into ifdef_export_defines 2020-04-16 10:24:23 +02:00
Kim Kulling
e341eadfd9 Fix typo 2020-04-16 10:23:50 +02:00
Kim Kulling
5feb3628e3 Merge pull request #3036 from malortie/sample-simpleopengl-minor-improvements
Minor fixes and improvements in sample SimpleOpenGL.
2020-04-16 08:42:31 +02:00
Kim Kulling
20c125218d Merge branch 'master' into sample-simpleopengl-minor-improvements 2020-04-16 08:30:30 +02:00
Kim Kulling
4b544f8984 Merge pull request #3035 from maquefel/cmake_targets_determine_lib_path
[RFC] cmake: targets: check lib or lib64 path
2020-04-16 08:25:06 +02:00
Kim Kulling
2d4eab6db0 Merge branch 'master' into cmake_targets_determine_lib_path 2020-04-16 08:08:37 +02:00
Kim Kulling
c530635c03 Merge pull request #3147 from malortie/add-tests-to-c-api-2
Added tests to C API missing functionalities in #3091
2020-04-15 22:34:54 +02:00
jess
0f32f59dc3 Add Open Collective
Hi, I'm making updates for Open Collective. Either you or another core contributor signed this repository up for Open Collective. This pull request adds financial contributors from your Open Collective https://opencollective.com/assimp ❤️

  What it does:
  - adds a badge to show the latest number of financial contributors
  - adds a banner displaying contributors to the project on GitHub
  - adds a banner displaying all individuals contributing financially on Open Collective
  - adds a section displaying all organizations contributing financially on Open Collective, with their logo and a link to their website

P.S: As with any pull request, feel free to comment or suggest changes.

  Thank you for your great contribution to the Open Source community. You are awesome! 🙌
  And welcome to the Open Collective community! 😊

  Come chat with us in the #opensource channel on https://slack.opencollective.com - great place to ask questions and share best practices with other Open Source sustainers!
2020-04-15 13:24:22 -07:00
Kim Kulling
5377d740e8 fix the build 2020-04-15 21:52:21 +02:00