36c937cc19
Merge branch 'master' into debian-fixes
2021-10-18 09:07:47 +02:00
6689438696
Merge pull request #4124 from assimp/kimkulling-remove_deprecated_irrxml
...
Delete fast_atof.h
2021-10-18 00:11:44 +02:00
e7b9118b96
Delete fast_atof.h
2021-10-17 21:04:18 +02:00
11cb1a170f
Merge pull request #4123 from assimp/fix_no_export_build
...
Fix no export build
2021-10-17 16:00:30 +02:00
0e3d058504
Add some exporter macros.
2021-10-17 15:10:25 +02:00
4caae783ae
Disable dump when export is not supported.
2021-10-17 15:09:44 +02:00
f678e67974
Merge pull request #4115 from lerppana/fix-missing-include
...
Added missing include
2021-10-13 14:05:40 +02:00
a01a5b4e3a
Added missing include
2021-10-09 20:12:29 +03:00
1a9403e787
Fix spelling error in comment in exported Pbrt file
...
See https://github.com/assimp/assimp/pull/4109#issuecomment-934747675
for a discussion that this is really a comment in the exported file,
and thus the fix should be harmless.
2021-10-08 08:55:02 +02:00
3b8126d26a
Fix spelling mistake
2021-10-08 08:48:01 +02:00
babf3b8e3d
Merge pull request #4108 from davidepi/fix-aistring-embedtextures
...
Fix aiString length not updated in the EmbedTextures postprocess task
2021-10-04 15:22:49 +02:00
ae951fbef9
Fix aiString length in aiProcess_EmbedTextures
2021-10-03 00:41:09 +02:00
3e4cca4d2f
Merge pull request #4106 from assimp/kimkulling-issues-3726
...
Add support for normal maps, the classic way
2021-10-01 14:58:19 +02:00
ac6b8988df
Add support for normal maps, the classic way
...
- get compiant to tinyobjloader and other importers
- closes https://github.com/assimp/assimp/issues/3726
2021-10-01 14:24:40 +02:00
2f5a31110c
Merge pull request #3743 from Garux/Q1MDLgroup
...
Fix Q1 MDL group frame loading, e.g. Q1 progs/flame2.mdl
2021-10-01 14:03:08 +02:00
1f76b2e6b9
Merge branch 'master' into Q1MDLgroup
2021-10-01 13:36:55 +02:00
96e2f1cd5b
Merge pull request #4078 from krishty/const-tokens
...
more const in format detection
2021-09-24 13:53:13 +02:00
6cb6a6acdd
Merge branch 'master' into const-tokens
2021-09-24 13:37:57 +02:00
d286aadbdf
Merge pull request #4086 from assimp/kimkulling-obj_refactorings
...
Update ObjTools.h
2021-09-21 12:53:51 +02:00
95263b2e54
Update ObjTools.h
2021-09-21 11:34:58 +02:00
590307dba9
Merge pull request #4085 from assimp/kimkulling-issue_3442
...
Fix possible nullptr dereferencing in material parsing
2021-09-21 11:19:49 +02:00
fb5b5e9d40
Fix possible nullptr dereferencing in material parsing
...
* Return 0.0f for empty buffer
* closes https://github.com/assimp/assimp/issues/3442
2021-09-21 11:06:18 +02:00
4fd7330808
Merge pull request #4076 from mahiuchun/static
...
Use Safe Constants Idioms for ObjFileParser::DEFAULT_MATERIAL.
2021-09-21 09:16:25 +02:00
e6543cbd85
Merge branch 'master' into static
2021-09-20 16:14:35 -07:00
95d1232922
Merge pull request #4083 from markoffline/patch-1
...
including <exception>
2021-09-20 21:13:41 +02:00
79f3368c85
Merge branch 'master' into static
2021-09-17 09:06:16 -07:00
8c84afaff0
Merge branch 'master' into const-tokens
2021-09-15 23:31:00 +02:00
1eb0d18371
Including <exception>
...
Assimp wasn't compiling on GNU/Linux
2021-09-15 05:17:16 -05:00
71a87b653c
Merge pull request #4077 from krishty/remove-useless-code
...
removed useless code
2021-09-15 10:57:46 +02:00
880a2f25bb
Merge branch 'master' into remove-useless-code
2021-09-14 23:33:34 +02:00
9553894c3b
Merge pull request #4072 from assimp/cleanup_public_header
...
Rework format + introdule missing C++11 features
2021-09-14 21:00:58 +02:00
8a975549a9
Add missing override
2021-09-14 20:49:20 +02:00
113217790b
Merge branch 'master' into cleanup_public_header
2021-09-14 20:46:22 +02:00
0fef0e1101
Move duplicate code to glFT common header.
2021-09-14 20:45:36 +02:00
002cdcdd7f
Merge pull request #4081 from ingowald/master
...
fixed incorrect/misleading comment at end of scene.h
2021-09-14 08:24:08 +02:00
e9d03f3379
fixed wrong comment
2021-09-13 15:10:48 -06:00
18531e3677
Next iteration for c++11 features.
2021-09-13 22:38:20 +02:00
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
4cf4e7454f
removed useless code
...
In destructors, zeroing attributes or clearing containers is utterly useless.
2021-09-11 21:51:20 +02:00
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
0dabce2754
Merge branch 'master' into cleanup_public_header
2021-09-09 20:18:01 +02:00
d34cd103f4
Merge pull request #4054 from kirillsurkov/master
...
Fix MinGW build
2021-09-09 09:39:24 +02:00
bc0a2762df
Merge branch 'master' into master
2021-09-09 09:16:50 +02:00
f47479aba4
Rework format + introdule missing C++11 features
2021-09-08 23:19:10 +02:00
be0ab89afe
Merge pull request #4070 from assimp/kimkulling-patch-1
...
Add patreon
2021-09-08 08:59:27 +02:00
dfd95633a4
Add patreon
2021-09-08 08:31:33 +02:00
9834dc7fc0
Merge pull request #4012 from Spectrum76/master
...
Update .gitignore
2021-09-07 15:59:20 +02:00
2acfdbe0c5
Merge branch 'master' into master
2021-09-07 15:43:59 +02:00
e70b05b41a
Merge pull request #4057 from Madrich/master
...
Double Precision Issue
2021-09-07 12:49:04 +02:00
768024d5a0
Merge branch 'master' into master
2021-09-07 11:39:34 +02:00
Kim Kulling
Kim Kulling
Lassi Helynranta
IOhannes m zmölnig
Davide Pizzolotto
Hill Ma
krishty
Mark's Offline
Ingo Wald
Krishty
Hill Ma