b01d008bc0
Revert "Removed KHR_materials_ior support."
...
This reverts commit 0738742611
2021-10-07 09:36:53 +01:00
0738742611
Removed KHR_materials_ior support.
2021-10-07 09:30:22 +01:00
ad0d945c80
Merge pull request #1 from marcappelsmeier/fixDeprecatedArrayComparision
...
Fix warning for array comparison
2021-10-05 19:25:08 +02:00
656b0b25d8
Fix warning for array comparison
...
The code previously compared two float arrays with the != operator. This is deprecated in Visual Studio 2019 and results in a warning that leads to an error when compiling with warnings as errors. Small fix to make the build work.
2021-10-05 19:24:42 +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
46a7de7a0b
Moved KHR_material_volume thickness texture under aiTextureType_TRANSMISSION.
2021-09-30 08:56:16 +01:00
addd541251
Added gltf2 KHR_materials_ior support.
2021-09-30 08:47:53 +01:00
d3276de47d
Added gltf2 KHR_materials_volume write support.
2021-09-30 08:10:02 +01:00
200bf8df7a
Added gltf2 KHR_materials_volume import support.
2021-09-29 17:05:17 +01: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
d814e9067a
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-20 21:14:20 +02: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
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
d0f7200196
Update X3DImporter_Geometry3D.cpp
2021-09-16 21:01:44 +02:00
65173df9d9
fixed x3d importer test
2021-09-16 13:45:56 +02:00
8c84afaff0
Merge branch 'master' into const-tokens
2021-09-15 23:31:00 +02:00
70dfdb8f9d
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-15 14:51:38 +02:00
a8a6aa2bd8
fixed some compiling issues
2021-09-15 14:49:46 +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
8ba4d30d7c
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-14 08:24:44 +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
c7e9c6580a
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-12 11:45:00 +02:00
dfb0d66437
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-12 11:44:14 +02:00
3f6a371b64
migrated x3d importer to pugixml reader
2021-09-12 11:37:33 +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
diharaw
Marc
Kim Kulling
Davide Pizzolotto
Hill Ma
René Martin
krishty
Mark's Offline
Kim Kulling
Ingo Wald
Krishty
Hill Ma