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

1150 Commits

Author SHA1 Message Date
Adam Beili
c9177b7811 Merge branch 'master' into refactor/KHR_material_specular 2023-03-24 21:47:19 +01:00
Urs Hanselmann
8fb83af079 Merge branch 'master' into master 2023-03-07 19:45:45 +01:00
Kim Kulling
4f48348af8 Fix: Move c++ include to c++ section 2023-03-07 18:55:18 +01:00
Kim Kulling
c089f11768 Update utf82utf16. 2023-03-06 19:56:11 +01:00
Urs Hanselmann
011382424b remove debug message from MemoryIOStream (used by public Importer::ReadFileFromMemory method) 2023-03-03 19:31:50 +01:00
Kim Kulling
1092f0d94e Fix:Use correct encoding 2023-03-01 21:40:45 +01:00
Kim Kulling
65b0553b8d Merge branch 'master' into kimkulling/skeleton_update_doc 2023-02-21 09:50:27 +01:00
Kim Kulling
3ad67771fe Add missing pod types. 2023-02-18 17:09:14 +01:00
Kim Kulling
9898138516 Update mesh.h 2023-02-15 21:02:03 +01:00
Kim Kulling
779912e84e Merge branch 'master' into kimkulling/skeleton-doc 2023-02-13 21:29:32 +01:00
Kim Kulling
156a393b84 Fix a typo 2023-02-10 08:07:09 +01:00
Kim Kulling
bde9a6a3c3 Update mesh.h 2023-02-09 22:36:06 +01:00
Kim Kulling
7b3f70a08b Add skeleton doc 2023-02-09 21:12:21 +01:00
jiannanya
2390822baf Fix: the member function 'Flush()' of class 'MemoryIOStream' need to be marked as override for msvc clang compiling 2023-02-09 21:30:48 +08:00
Kim Kulling
b7d08fc8f2 Fix review findings. 2023-02-08 21:48:55 +01:00
Kim Kulling
b170370e5c Fix: Fix memleak when exiting method by exception 2023-02-08 21:29:54 +01:00
Kim Kulling
e9c95d484e Update IOStreamBuffer.h 2023-02-04 18:36:36 +01:00
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
Adam Beili
3b5e34ab30 Merge branch 'master' into refactor/KHR_material_specular 2022-11-18 16:10:39 +02:00
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
Adam
ffaf378ee6 fixed misnamed matkey 2022-11-10 20:37:46 +02:00
Adam Beili
ce7a52fd19 Merge branch 'master' into refactor/KHR_material_specular 2022-11-10 20:21:30 +02:00
Adam
822b240694 Support both pbrSpecGlos and materials_specular 2022-11-08 23:09:50 +02: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