Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,660 Commits 19 Branches 43 Tags
083ebdbc2ece2f4dd071e5439ab848ffade8a3c2
Commit Graph

8660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RichardTea
083ebdbc2e Collada Export: More unique Ids 
Nodes, Materials, Animations, Lights, Cameras, Bones
 2020-04-30 18:28:06 +01:00
RichardTea
ff9f3b8608 Collada: Ensure <geometry> has unique id 
Use the "id" for mesh names by default.
Set option AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES to use the mesh "name" instead
 2020-04-29 17:17:46 +01:00
RichardTea
2c6ac23a4e Apply Assimp clangformat to touched Collada files 2020-04-29 14:21:17 +01:00
RichardTea
a52b66f10d Merge remote-tracking branch 'upstream/master' 2020-04-28 15:23:20 +01:00
Kim Kulling
dafff4da5d Merge pull request #3173 from lukka/master 
Enable gcc on Linux on CI, fix warnings
 2020-04-28 10:03:05 +02:00
Kim Kulling
efa046366e Retrigger build 2020-04-28 09:14:53 +02:00
Kim Kulling
3672f714f3 Merge branch 'master' into master 2020-04-28 08:58:05 +02:00
luca
4488e3e745 build on Linux with gcc and clang; warning as error only for 'assimp' target 2020-04-27 23:38:33 -07:00
luca
7db73182b0 enable gcc build on Linux 2020-04-27 09:51:02 -07:00
Kim Kulling
0a66a2c670 Merge pull request #3168 from lukka/master 
Use clang on Unix, msvc on Windows, Use Ninja everywhere
 2020-04-27 10:22:02 +02:00
luca
d98787f35b CI: use clang on Unix, msvc on Windows;Remove explicit flags in CMakeLists.txt; 2020-04-26 12:50:42 -07:00
Kim Kulling
2273160f2c Merge pull request #3167 from assimp/iisue_3165 
Iisue 3165
 2020-04-26 19:38:31 +02:00
Kim Kulling
6c1e21d754 fix formatting. 2020-04-26 19:14:30 +02:00
Kim Kulling
bafb8e3189 closes https://github.com/assimp/assimp/issues/3165: remove deprecated code whch causes compiler warning. 2020-04-26 08:59:52 +02:00
Kim Kulling
02ef435d55 Merge pull request #3116 from assimp/issue_3103 
closes https://github.com/assimp/assimp/issues/3103: always enable wa…
 2020-04-24 09:06:46 +02:00
Kim Kulling
9fc2b2f168 Merge branch 'master' into issue_3103 2020-04-23 21:22:12 +02:00
Kim Kulling
7f9a1887f3 Merge pull request #3164 from assimp/migenius-migenius-rsws53-mig-2 
Migenius migenius rsws53 mig 2
 2020-04-23 21:20:45 +02:00
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
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
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
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