Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,663 Commits 19 Branches 43 Tags
db72c6ee38e5a87f4aaf255197eb49da2b1fa651
Commit Graph

1129 Commits

Author SHA1 Message Date
Matthias Möller
db72c6ee38 When "getNextBlock" was called after "getNextLine", the pointer could still on the newline. 
The pointer to a newline could not advance enough, when the line ended with \r\n. The resulting buffer was correct, as the buffer range went from <start> until \r, but that the pointer increased by just 1 could lead to the problem that the next pointer points at \n, which is still part of the newline and therefore, "getNextBlock" got 1 byte too much.

Refs Issue #4871
 2023-02-04 15:16:22 +01:00
krishty
df28e7830f Merge branch 'master' into fix-build-without-armaturepopulate-post-process 2023-01-29 01:14:33 +01:00
Steve M
eff13f6a40 Update morph mesh documentation now that gltf known to work 2023-01-25 20:52:25 -08:00
Kim Kulling
f830d7998e Merge branch 'master' into clean-up-ctors-dtors 2023-01-23 21:21:34 +01:00
Krishty
36305cf987 Tidy Up Constructors and Destructors 
This commit does not add or remove c’tors or d’tors, so it is *not* ABI-breaking.

If a c’tor/d’tor does nothing else than the default behavior, this commit replaces it with “= default”.

If an initializer list entry does nothing else than the default behavior, this commit removes it. First and foremost, remove default c’tor calls of base classes (always called by the compiler if no other base c’tor is explicitly called) and c’tor calls of members with complex types (e.g. “std::vector”).

In a few instances, user-defined copy c’tors / move c’tors / assignment operators / move assignment operators were replaced with “= default”, too. I only did this if I had a clear understanding of what’s going on.
 2023-01-16 21:47:11 +01:00
Krishty
3d3e856925 Trim Trailing Whitespace 2023-01-16 09:12:35 +01:00
Krishty
793284a766 Fix Build Without ArmaturePopulate Post Process Step 
This post process step introduced new attributes into `aiSkeletonBone`. Said attributes are only defined with the process enabled, i.e. when the `ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS` macro has not been defined.

Some code, however, accessed the variables unconditionally, leading to build failures if `ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS` was defined.

This commit adds the missing checks.
 2023-01-16 08:42:50 +01:00
Steve M
b2672c082d Change mMethod type to enum aiMorphingMethod 
Address sanitizer warning
 2023-01-12 12:35:28 -08:00
Kim Kulling
b393132b58 Merge branch 'master' into spelling 2023-01-08 17:43:55 +01:00
Kim Kulling
df8a9bb2b8 Fix: Fix signed unsigned mismatch 
- closes https://github.com/assimp/assimp/issues/4854
 2023-01-03 21:11:09 +01:00
Andy Maloney
e893248e7c Fix several spelling mistakes & a comment 2023-01-01 13:31:48 -05:00
Kim Kulling
a8e50be781 Refactoring: Move asserthandler header to include 2022-12-23 16:19:39 +01:00
Kim Kulling
76de8ba1f4 Update material.inl 2022-12-19 08:58:45 +01:00
RKJ
6743274b31 illegal token on right-side-of ::Windows 
Error without:
```
assimp\material.inl(101,47): message : error recovery skipped: ') ?'
```

Reference : https://stackoverflow.com/questions/2561368/illegal-token-on-right-side-of
 2022-12-19 04:06:36 +05:30
Kim Kulling
3c51eafaf4 Add missing headerh will be needed on Ubuntu 
- closes https://github.com/assimp/assimp/issues/4720
 2022-11-18 11:39:51 +01:00
Kim Kulling
b717b1cd3e Retrigger the build 
Fix review findings
 2022-11-08 13:39:56 +01:00
Aaron Gokaslan
8da3d277c7 add missing std moves 2022-11-03 12:35:10 -04:00
Kim Kulling
07aef23d24 Fix: Add missing ahndling for double export in json 2022-10-18 19:05:04 +02:00
Kim Kulling
4ac3b1fef5 FIX: Use correct epsilon 2022-10-15 16:11:02 +02:00
Kim Kulling
0dd5cfe3bf Fix config documentation for STL pointcloud export 2022-09-12 18:32:28 +02:00
Chris
4b0e38e44f Fix aiBone.mOffsetMatrix documentation 
Fixed the comment on the `mOffsetMatrix` property to be correct.
See https://assimp-docs.readthedocs.io/en/latest/API/API-Documentation.html#_CPPv46aiBone
See also https://stackoverflow.com/a/73603994
 2022-09-05 11:00:57 -05:00
Aaron Gokaslan
e3b01e10db apply fixes to more headers 2022-09-01 12:28:45 -04:00
Kim Kulling
f527e56f22 Merge branch 'master' into explicitly-default-dtors 2022-08-30 22:21:06 +02:00
Kim Kulling
14186bcd6b Code cleanup and some new unittests for edgecases. 2022-08-27 14:07:45 +02:00
Aaron Gokaslan
e93fa6699a Manually fix up 100 more instances where it should be defaulted 2022-08-25 12:20:13 -04:00
Kim Kulling
0db8b3daae Use default destructor. 2022-07-06 20:59:17 +02:00
Kim Kulling
9063216893 Fix a memory leak 2022-07-02 21:21:31 +02:00
Kim Kulling
39a4627519 Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 2022-06-02 21:47:29 +02:00
Kim Kulling
c623a363a6 Add unittest to reproduce undefined behaviour: left shift on negative value 2022-05-17 20:48:35 +02:00
IOhannes m zmölnig
1d3d5c4bb6 Rename TextureTypeToString() to aiTextureTypeToString() 
Closes: https://github.com/assimp/assimp/issues/4493
 2022-05-01 13:27:42 +02:00
Kim Kulling
64a6968254 Add skeleton generation to aiScene 2022-04-28 21:43:02 +02:00
Kim Kulling
6cdd1d3cc6 Generate container for skeleton during FBX-Import 2022-04-28 21:12:26 +02:00
Kim Kulling
e5747dad9b First concepts 2022-04-05 20:07:22 +02:00
xiaohunqupo
b08c04b87a Fix compile errro in VC140 2022-03-31 15:08:12 +08:00
Danny许
f985fe12cc Fix compile error 
When enable macro ASSIMP_DOUBLE_PRECISION
 2022-03-31 11:20:18 +08:00
Kim Kulling
5e69517742 Merge branch 'master' into update_ai_texture_type_max 2022-03-10 11:37:46 +01:00
Kim Kulling
7aa87a9765 Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 2022-03-08 19:10:53 +01:00
RichardTea
8a6a1fc2df Update AI_TEXTURE_TYPE_MAX 
Must be equal to the largest aiTextureType_XXX enum
 2022-03-01 12:12:07 +00:00
RichardTea
d704824be3 Merge branch 'master' into deprecated_gltfpbr_macros 2022-03-01 10:01:43 +00:00
Kim Kulling
94178df61b Merge branch 'master' into master 2022-02-24 19:31:31 +01:00
Kim Kulling
0dc24ab3a7 Fix declaration of offset 2022-02-24 17:04:39 +01:00
Kim Kulling
cf96639119 Fix possible negative array access 
- Return when the calculated offset gets negative
- closes https://github.com/assimp/assimp/issues/4414
 2022-02-24 16:49:35 +01:00
Terence Russell
4ddacdb5df Expose the original OBJ illum model as a material property. 2022-02-22 17:55:41 -07:00
Terence Russell
17123ed4a1 Add support for bump -bm (bump/normal multiplier) 2022-02-17 22:10:46 -07:00
Kim Kulling
9e23d771bc Fix invalid initialization of constexpr. 2022-02-16 21:19:17 +01:00
Kim Kulling
76a7614c4b Adapt ai_epsilon to code 2022-02-16 20:07:27 +01:00
Kim Kulling
50d7e6fc61 Add definition for skeleton 2022-02-16 00:18:32 +01:00
Kim Kulling
067c5d9ec4 Refactoring: add usage of ai_epsilon to fbx. 2022-02-16 00:17:26 +01:00
Kim Kulling
9335cc30ab INtroduce compression class to encapsulate compression via zlib 2022-02-06 20:42:58 +01:00
Kim Kulling
4141260fc9 Merge branch 'master' into master 2022-02-02 21:21:01 +01:00