Marco Feuerstein
8b005eaa83
Add missing header.
2023-07-07 14:28:05 +02:00
Tomas Maly
5d3f3281f4
fix incorrect default for material::get with aiColor3D
2023-06-27 12:40:27 +02:00
Kim Kulling
e947471549
Merge branch 'master' into refactor/KHR_material_specular
2023-05-22 09:49:01 +02:00
Kim Kulling
1243325f10
Merge branch 'master' into kimkulling/refactoring_geoutils
2023-05-04 21:10:00 +02:00
Kim Kulling
75d024c91b
Reafctoring: Add GeoUtils usage
2023-05-04 20:57:20 +02:00
Kim Kulling
d58201a579
Refactoring: Reuse code from GeometryUtils
2023-05-04 00:00:52 +02:00
Kim Kulling
71366fff8e
Merge branch 'master' into msvc-clang-inconsistent-missing-destructor-override
2023-04-26 09:31:55 +02:00
Kim Kulling
1ecb8e9196
Merge branch 'master' into msvc-clang-missing-noreturn
2023-04-25 23:56:39 +02:00
Kim Kulling
fd59a2209b
Update fast_atof.h
2023-04-17 22:07:49 +02:00
Kim Kulling
d51f033e20
Fix: Avoid integer overflow in inversion op
...
- closes https://github.com/assimp/assimp/issues/3424
2023-04-17 21:30:47 +02:00
Kim Kulling
5d841ec9a5
Refactoring: Cleanup post-processing steps.
2023-04-16 18:20:14 +02:00
Adam Beili
e193220ad8
Merge branch 'master' into refactor/KHR_material_specular
2023-04-06 02:42:18 +02:00
Jackie9527
7df4efea44
Fix warning related to inconsistent-missing-destructor-override.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 21:49:38 +08:00
Jackie9527
87c309566f
Fix warning related to missing-noreturn.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 18:46:12 +08:00
Jackie9527
94067994cc
Fix warning related to format-non-iso.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 12:29:42 +08:00
Adam Beili
83053f3d56
Made usePbrSpecGloss a exportproperty, fixed mat_specular to spec
2023-03-26 16:55:38 +02:00
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
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
IOhannes m zmölnig (Debian/GNU)
ed6b6cd65c
use fully qualified namespace in byteswap macros
...
Closes: https://github.com/assimp/assimp/issues/4358
2022-01-31 14:42:59 +01:00
Tomas Maly
3976f9a092
fix compilation with clangcl on windows
2022-01-30 22:04:41 +01:00
Kim Kulling
8b1d94d6b1
Merge branch 'master' into deprecated_gltfpbr_macros
2022-01-23 12:16:49 +01:00
Kim Kulling
17d5633a5b
Add missing SImpleExtensionCheck
2022-01-19 21:42:14 +01:00
Kim Kulling
6ad7505376
Merge branch 'master' into krishty-new-file-detection
2022-01-16 20:43:57 +01:00
Kim Kulling
05746acb07
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection
2022-01-16 20:41:24 +01:00
Kim Kulling
f8253c3e3c
Update Base64.hpp
2022-01-16 13:21:01 +01:00
Viktor Kovacs
c8ab39dd04
Merge branch 'master' into common_base64
2022-01-15 23:42:56 +01:00
Kim Kulling
d3e24196c0
Merge branch 'master' into so-unloading
2022-01-13 20:19:23 +01:00
Viktor Kovacs
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
Viktor Kovacs
6b9732721a
Merge branch 'assimp:master' into common_base64
2022-01-10 21:15:31 +01:00
Kim Kulling
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
Kim Kulling
a591944c04
Add link to used enum for a better understandability for the mesh morphing method.
2022-01-04 17:32:18 +01:00