Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,786 Commits 19 Branches 43 Tags
feature/allocator_interface
Commit Graph

6878 Commits

Author SHA1 Message Date
ywang
9bab475302 export min max for sparse accessor 2021-02-03 15:05:58 -08:00
Kim Kulling
bb21ec9423 trigger build 2021-02-03 21:17:57 +01:00
Kim Kulling
2391432523 fix overflow 2021-02-03 21:07:28 +01:00
Kim Kulling
e6b8ae44cb Fix unittests: skip newline at begin of matrix token. 2021-02-03 20:54:48 +01:00
xiaohunqupo
c43a1ed886 Fix Step Expoter Error. 
Fix Step Expoter Error.
 2021-02-03 16:26:02 +08:00
thomasbiang
d08acb85e7 Merge branch 'master' into master 2021-02-02 14:48:41 -08:00
Kim Kulling
faf53b8e0f Fix broken autocorrect fix 2021-02-02 23:33:02 +01:00
Kim Kulling
6ee1a32fb2 fix compile issue: replace std::make_unique 2021-02-02 22:54:20 +01:00
Kim Kulling
50fd5127ef Some review findings. 2021-02-02 22:34:30 +01:00
ywang
793bd44cee fix issue: 3482: invalid gltf2 properties 2021-02-02 13:19:57 -08:00
Kim Kulling
fa2354ebc3 Fix incorrect xml-parsing in collada importer. 2021-02-02 22:06:33 +01:00
contriteobserver
65bc86e181 Merge branch 'master' into ColladaAnimationFix 2021-02-01 16:58:01 -08:00
RichardTea
aa10b56bc2 Fix draco linking for Hunter/Normal 2021-02-01 14:29:24 +00:00
Kim Kulling
5fbbba2fac Merge branch 'master' into issue_2195_draco 2021-01-31 16:02:57 +01:00
Kim Kulling
f2543ee608 Merge branch 'master' into ColladaSubmeshFix 2021-01-29 22:11:07 +01:00
Kim Kulling
de827b2fec Merge branch 'master' into develop 2021-01-29 21:46:42 +01:00
Kim Kulling
79eb9ecc86 Update all minimum cmake req to 3.10 2021-01-29 21:05:46 +01:00
Kim Kulling
db8e9eb556 Merge branch 'master' into develop 2021-01-29 19:20:38 +01:00
Kim Kulling
8d4b816dfe Merge branch 'master' into master 2021-01-29 18:16:04 +01:00
contriteobserver
e33b69a428 Collada importer now identifies animations 
addresses issue #3584
 2021-01-28 13:06:02 -08:00
Kim Kulling
706d636c63 Merge branch 'master' into master 2021-01-28 18:25:39 +01:00
RichardTea
48bcbbefdd use nullptr and float constants 2021-01-27 10:56:57 +00:00
RichardTea
150514fc8b Move draco warning suppression 
Should be around the include for portability, not template instantiation
Fix clang pragma typos
 2021-01-27 10:42:28 +00:00
RichardTea
5e7281dac6 Merge branch 'master' into issue_2195_draco 2021-01-27 10:26:16 +00:00
RichardTea
6ec32b6b78 Apply clangformat 2021-01-27 09:55:03 +00:00
RichardTea
c6fd1ce996 glTF2 Minor cleanup 2021-01-27 09:42:49 +00:00
RichardTea
5b9d06c2fc Disable draco clang/gcc warnings via pragma 
draco templated functions also throw warnings
 2021-01-27 09:19:35 +00:00
Kim Kulling
1e38f84c3a fix typo 2021-01-27 09:40:19 +01:00
Kim Kulling
ac0f1f2cab Update FBXMaterial.cpp 2021-01-27 09:37:35 +01:00
Kim Kulling
c02ad323a5 Fix VS compiler warning: convertig int to char 2021-01-27 09:22:59 +01:00
thomasbiang
4ed9f3c2f4 Merge branch 'master' into master 2021-01-26 13:55:40 -08:00
Kim Kulling
4471c36c08 Fix compiler bug for VS2019 
- Check https://developercommunity.visualstudio.com/content/problem/1223143/visual-studio-2019-c-program-crash-with-stdstring.html for more details
- closes https://github.com/assimp/assimp/issues/3572
 2021-01-26 20:59:21 +01:00
RichardTea
d79e0c0ba9 Avoid std::make_unique 
Assimp is still C++11
 2021-01-26 17:33:10 +00:00
RichardTea
fe97ff6474 Draco platform libraries have different names 
On Windows it's draco.dll/lib
On Linux/macOS draco_shared.dylib & draco_static.lib
 2021-01-26 17:19:41 +00:00
RichardTea
c917e6513f Merge branch 'master' into issue_2195_draco 2021-01-26 16:43:46 +00:00
RichardTea
f39ba8ddb2 Add compile error for bad error draco config 
KHR_draco_mesh_compression requires
DRACO_MESH_COMPRESSION_SUPPORTED
 2021-01-26 16:24:18 +00:00
RichardTea
dde7605158 Implement draco decoding 2021-01-26 16:08:12 +00:00
RichardTea
3a7d0f5656 Add Draco to cmakelists 
Initial pass. Not yet used.
Add Draco library to assimp build and link
 2021-01-26 15:58:14 +00:00
contriteobserver
d7bf513250 renaming iterator to avoid any possibility of scop collisions 2021-01-26 01:36:12 -08:00
contriteobserver
69fc809307 size_t is not the same as unsigned int on some systems 2021-01-26 01:01:59 -08:00
contriteobserver
f92a34e0b7 Merge branch 'master' into ColladaSubmeshFix 2021-01-26 00:38:37 -08:00
Kim Kulling
243d017463 Add missing skip 
- closes https://github.com/assimp/assimp/issues/3601
- Fix some format issues
 2021-01-24 18:47:50 +01:00
Kim Kulling
a2b889ab09 Fix typo in collada parser 
closes https://github.com/assimp/assimp/issues/3599
 2021-01-24 18:21:46 +01:00
Ville Voutilainen
6ebae5e67c GCC 11 build fixes 2021-01-24 11:04:46 +02:00
contriteobserver
338abded12 ColladaLoader now assigns individual materials to submeshes as needed 
Optional assignment of individual materials to submeshes, addresses #3606
 2021-01-23 02:20:58 -08:00
Bart Sekura
5f50e42535 added missing return 2021-01-23 09:56:35 +09:00
Bart Sekura
f8c512acd7 changed morph anim error to warning when validating 2021-01-23 09:52:46 +09:00
thomasbiang
91dc904ed1 Merge branch 'master' into master 2021-01-22 13:25:31 -08:00
Kim Kulling
e792455d66 Remove redundant statement in if 
- closes https://github.com/assimp/assimp/issues/3180
 2021-01-22 14:22:34 +01:00
Kim Kulling
dc4514de82 Update COBLoader.cpp 
Fix cppcheck finding
 2021-01-22 13:23:39 +01:00