Commit Graph

11752 Commits (980e156251e5b90553c173fa17bf0d1a83a04384)

Author SHA1 Message Date
Kim Kulling f3baab1153
Merge branch 'master' into master 2021-10-20 20:51:43 +02:00
Malcolm Tyrrell 4ba99c1bb0 Comments 2021-10-20 16:15:00 +01:00
Malcolm Tyrrell c644f9d719 Subtract the centroid 2021-10-20 15:08:08 +01:00
Malcolm Tyrrell 4d10f5d133 Move distance initialization to Finalize. 2021-10-20 12:47:44 +01:00
Malcolm Tyrrell 5b13b97f27 Ensure the usage pattern of SpatialSort. 2021-10-19 14:22:28 +01:00
Kim Kulling a83db61289
Merge pull request #4110 from marcappelsmeier/master
Fix a warning about deprecated array comparison
2021-10-19 14:23:45 +02:00
Kim Kulling cff5035b5f
Merge branch 'master' into master 2021-10-19 09:31:19 +02:00
Kim Kulling e157d7550b
Merge pull request #4109 from umlaeute/debian-fixes
Spelling fixes
2021-10-19 09:30:42 +02:00
Kim Kulling 36c937cc19
Merge branch 'master' into debian-fixes 2021-10-18 09:07:47 +02:00
Kim Kulling 6689438696
Merge pull request #4124 from assimp/kimkulling-remove_deprecated_irrxml
Delete fast_atof.h
2021-10-18 00:11:44 +02:00
Kim Kulling e7b9118b96
Delete fast_atof.h 2021-10-17 21:04:18 +02:00
Kim Kulling 11cb1a170f
Merge pull request #4123 from assimp/fix_no_export_build
Fix no export build
2021-10-17 16:00:30 +02:00
Kim Kulling 0e3d058504 Add some exporter macros. 2021-10-17 15:10:25 +02:00
Kim Kulling 4caae783ae Disable dump when export is not supported. 2021-10-17 15:09:44 +02:00
Kim Kulling a82dc887fc
Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-10-14 09:27:07 +02:00
Kim Kulling f678e67974
Merge pull request #4115 from lerppana/fix-missing-include
Added missing include
2021-10-13 14:05:40 +02:00
Lassi Helynranta a01a5b4e3a Added missing include 2021-10-09 20:12:29 +03:00
IOhannes m zmölnig 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
IOhannes m zmölnig 3b8126d26a Fix spelling mistake 2021-10-08 08:48:01 +02:00
Malcolm Tyrrell 5a1bcc6aa5 Fix build and test 2021-10-07 10:01:33 +01:00
Malcolm Tyrrell ceddfe19d8 Add comment with link to schema repo. 2021-10-07 10:01:32 +01:00
Malcolm Tyrrell 7788c1a04e Add a unit test for json schemas. 2021-10-07 10:01:32 +01:00
Malcolm Tyrrell a283a255a5 Allow schema checking of glTF2 file. 2021-10-07 10:01:32 +01:00
diharaw 0fb66f8437 Replaced AI_MATKEY_IOR with AI_MATKEY_REFRACTI. 2021-10-07 09:39:08 +01:00
diharaw b01d008bc0 Revert "Removed KHR_materials_ior support."
This reverts commit 0738742611.
2021-10-07 09:36:53 +01:00
diharaw 0738742611 Removed KHR_materials_ior support. 2021-10-07 09:30:22 +01:00
Marc ad0d945c80
Merge pull request #1 from marcappelsmeier/fixDeprecatedArrayComparision
Fix warning for array comparison
2021-10-05 19:25:08 +02:00
Marc 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
Kim Kulling 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
Davide Pizzolotto ae951fbef9
Fix aiString length in aiProcess_EmbedTextures 2021-10-03 00:41:09 +02:00
Kim Kulling 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
Kim Kulling 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
Kim Kulling 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
Kim Kulling 1f76b2e6b9
Merge branch 'master' into Q1MDLgroup 2021-10-01 13:36:55 +02:00
diharaw 46a7de7a0b Moved KHR_material_volume thickness texture under aiTextureType_TRANSMISSION. 2021-09-30 08:56:16 +01:00
diharaw addd541251 Added gltf2 KHR_materials_ior support. 2021-09-30 08:47:53 +01:00
diharaw d3276de47d Added gltf2 KHR_materials_volume write support. 2021-09-30 08:10:02 +01:00
diharaw 200bf8df7a Added gltf2 KHR_materials_volume import support. 2021-09-29 17:05:17 +01:00
Kim Kulling 96e2f1cd5b
Merge pull request #4078 from krishty/const-tokens
more const in format detection
2021-09-24 13:53:13 +02:00
Kim Kulling 6cb6a6acdd
Merge branch 'master' into const-tokens 2021-09-24 13:37:57 +02:00
Kim Kulling d286aadbdf
Merge pull request #4086 from assimp/kimkulling-obj_refactorings
Update ObjTools.h
2021-09-21 12:53:51 +02:00
Kim Kulling 95263b2e54
Update ObjTools.h 2021-09-21 11:34:58 +02:00
Kim Kulling 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
Kim Kulling 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
Kim Kulling 4fd7330808
Merge pull request #4076 from mahiuchun/static
Use Safe Constants Idioms for ObjFileParser::DEFAULT_MATERIAL.
2021-09-21 09:16:25 +02:00
Hill Ma e6543cbd85
Merge branch 'master' into static 2021-09-20 16:14:35 -07:00
Kim Kulling d814e9067a
Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-09-20 21:14:20 +02:00
Kim Kulling 95d1232922
Merge pull request #4083 from markoffline/patch-1
including <exception>
2021-09-20 21:13:41 +02:00
Hill Ma 79f3368c85
Merge branch 'master' into static 2021-09-17 09:06:16 -07:00
René Martin 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