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

1607 Commits

Author SHA1 Message Date
Hill Ma
79f3368c85 Merge branch 'master' into static 2021-09-17 09:06:16 -07:00
René Martin
e92177cb99 changed use and def attribute check for x3d importer to upper case 
This is how it is specified in the standard.
 2021-09-17 14:24:57 +02:00
Kim Kulling
d0f7200196 Update X3DImporter_Geometry3D.cpp 2021-09-16 21:01:44 +02:00
krishty
8c84afaff0 Merge branch 'master' into const-tokens 2021-09-15 23:31:00 +02:00
Artenuvielle
70dfdb8f9d Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-09-15 14:51:38 +02:00
René Martin
a8a6aa2bd8 fixed some compiling issues 2021-09-15 14:49:46 +02:00
Kim Kulling
880a2f25bb Merge branch 'master' into remove-useless-code 2021-09-14 23:33:34 +02:00
Kim Kulling
8a975549a9 Add missing override 2021-09-14 20:49:20 +02:00
Kim Kulling
0fef0e1101 Move duplicate code to glFT common header. 2021-09-14 20:45:36 +02:00
Kim Kulling
18531e3677 Next iteration for c++11 features. 2021-09-13 22:38:20 +02:00
Artenuvielle
c7e9c6580a Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-09-12 11:45:00 +02:00
René Martin
3f6a371b64 migrated x3d importer to pugixml reader 2021-09-12 11:37:33 +02:00
Krishty
5895c0c22c more const in format detection 
BaseImporter::SearchFileHeaderForToken() expected a pointer to a non-const token list. This was probably an oversight, as nobody would realistically expect the function to change the list. Furthermore, it prevented token lists from being compiled to read-only memory, in some cases even causing the compiler to generate thread-safe initialization.

The list is now const and all callers declare their token lists static const, thus compiling them to read-only memory.
 2021-09-11 23:23:05 +02:00
Krishty
4cf4e7454f removed useless code 
In destructors, zeroing attributes or clearing containers is utterly useless.
 2021-09-11 21:51:20 +02:00
Hill Ma
93edbe883f Use Safe Constants Idioms for ObjFileParser::DEFAULT_MATERIAL. 
Reference: "A static Class Member" in https://abseil.io/tips/140
 2021-09-10 11:56:37 -07:00
Kim Kulling
bc0a2762df Merge branch 'master' into master 2021-09-09 09:16:50 +02:00
René Martin
3001d88172 Merge branch 'master' into x3d_pugi_migration 2021-09-07 15:04:08 +02:00
Kim Kulling
768024d5a0 Merge branch 'master' into master 2021-09-07 11:39:34 +02:00
Kim Kulling
74e8a6a366 Merge branch 'master' into xgl-fix 2021-09-07 09:03:40 +02:00
Max Vollmer (Microsoft Havok)
bf8e36ae28 Fixed typo 2021-09-02 10:07:28 +01:00
Max Vollmer (Microsoft Havok)
72ea80b41f Revert last change (gltf2::Ref type is not a pointer and has a bool() operator) 2021-09-02 10:00:56 +01:00
Kim Kulling
d710d0700f Make nullptr test more explicit. 2021-09-02 10:10:42 +02:00
Max Vollmer (Microsoft Havok)
4c86772091 Added another nullptr safety check 2021-09-02 08:27:03 +01:00
Madrich
9b535d1c15 Fix Double Precision errors/warnings 2021-08-31 12:59:31 +02:00
Kim Kulling
155db25883 Merge branch 'master' into ms-maxvollmer/code_improvements 2021-08-31 08:55:47 +02:00
Doug Roeper
96f0787f51 Fix the -Werror=unused-but-set-parameter warning by removing the skipFirst variable. 2021-08-30 18:15:37 -04:00
Max Vollmer (Microsoft Havok)
51f294c587 Fixes issues our internal compliance and code quality tool found: 
* Adds nullptr checks and asserts to protect certain code paths
* Fixes wrong integer type in a printf call
* Adds const to const values
* Prevents integer overflow with explicit casts
 2021-08-30 14:59:17 +01:00
Viktor Kovacs
82d8c4e849 Merge branch 'master' into compressed_json 2021-08-30 10:11:03 +02:00
Kim Kulling
38c611a02c Update ColladaLoader.cpp 2021-08-30 08:33:35 +02:00
Kim Kulling
e2c2a60c45 Remove not used attribute 2021-08-29 18:41:07 +02:00
Kim Kulling
c9d35b6edc Remove C++14 feature. 2021-08-29 18:35:44 +02:00
Kim Kulling
ceafa95610 Remove unused header 2021-08-29 10:36:02 +02:00
kirillsurkov
5ca2cbb7ae Fix MinGW build 2021-08-28 20:04:37 +03:00
Kim Kulling
c9b76f5255 Decrease xml-serializer complexity 2021-08-28 14:20:12 +02:00
Kim Kulling
df739f00dd Merge branch 'master' into issue_3398 2021-08-28 13:56:50 +02:00
Kim Kulling
69051bbc2c Add missing docu 2021-08-28 13:46:41 +02:00
Kim Kulling
a7bc858698 Fix review finding. 2021-08-28 13:36:57 +02:00
Kim Kulling
3e090b21f5 Fix setup of embedded texture loading 2021-08-28 13:33:25 +02:00
Viktor Kovacs
b9b62d106c Merge branch 'master' into compressed_json 2021-08-27 18:18:28 +02:00
kovacsv
b39f38b73c Add export property for assimp json exporter to write compressed json (without whitespaces). 2021-08-27 18:17:27 +02:00
Kim Kulling
eabfc05bbb Handle empty keys 2021-08-27 10:41:25 +02:00
Kim Kulling
6439305379 Remove dead code 2021-08-24 20:53:55 +02:00
Kim Kulling
61ba320a04 Merge branch 'master' into master 2021-08-24 20:53:04 +02:00
kovacsv
0590a39159 Fix M3D import crash and memory leak. 
The same default material pointer was assigned to all the materials in the scene, so poor destructor tried to free the same pointer multiple times.
 2021-08-24 07:26:20 +02:00
kovacsv
468aa50aed mingw build fix 2021-08-19 13:50:26 +02:00
Kim Kulling
f3903e34a4 Merge branch 'master' into master 2021-08-18 07:32:16 +02:00
Kim Kulling
a486a698e8 Merge branch 'master' into clang13 2021-08-16 21:35:59 +02:00
Kim Kulling
a850f312ac Merge branch 'master' into ms-maxvollmer/crash_fixes_08_2021 2021-08-16 21:00:07 +02:00
Kim Kulling
27231c3f52 Merge branch 'master' into bound 2021-08-16 20:48:17 +02:00
Max Vollmer (Microsoft Havok)
c1e830cf3b The GLTF2 specs aren't very specific about the restrictions of the number of keyframes in sampler input and output. It seems logical that they should be the same, but there is an official sample model from Khronos where output has more keyframes. I thus assume that the GLTF2 standard allows more keyframes in output, but not in input. Fixed the check accordingly. 2021-08-13 17:46:10 +01:00