Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,786 Commits 19 Branches 43 Tags
feature/allocator_interface
Commit Graph

6878 Commits

Author SHA1 Message Date
Kim Kulling
5af71feef2 Merge branch 'master' into MalcolmTyrrell/spatialSortImprovements 2021-10-27 17:20:47 +02:00
Kim Kulling
e01b488075 Remove dead code. 2021-10-26 22:06:10 +02:00
Malcolm Tyrrell
2239442c64 Merge branch 'master' into MalcolmTyrrell/spatialSortImprovements 2021-10-21 08:55:11 +01:00
Malcolm Tyrrell
db0127859a CalculateDistance method 2021-10-21 08:39:44 +01:00
Kim Kulling
791cb195be Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-10-20 21:14:43 +02:00
Kim Kulling
f3baab1153 Merge branch 'master' into master 2021-10-20 20:51:43 +02: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
cff5035b5f Merge branch 'master' into master 2021-10-19 09:31:19 +02:00
Kim Kulling
36c937cc19 Merge branch 'master' into debian-fixes 2021-10-18 09:07:47 +02:00
Kim Kulling
0e3d058504 Add some exporter macros. 2021-10-17 15:10:25 +02:00
Kim Kulling
a82dc887fc Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-10-14 09:27:07 +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
ceddfe19d8 Add comment with link to schema repo. 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
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
Davide Pizzolotto
ae951fbef9 Fix aiString length in aiProcess_EmbedTextures 2021-10-03 00:41:09 +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
1f76b2e6b9 Merge branch 'master' into Q1MDLgroup 2021-10-01 13:36:55 +02: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
6cb6a6acdd Merge branch 'master' into const-tokens 2021-09-24 13:37:57 +02:00
Kim Kulling
95263b2e54 Update ObjTools.h 2021-09-21 11:34:58 +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
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
Kim Kulling
d0f7200196 Update X3DImporter_Geometry3D.cpp 2021-09-16 21:01:44 +02:00
krishty
8c84afaff0 Merge branch 'master' into const-tokens 2021-09-15 23:31:00 +02:00
Artenuvielle
70dfdb8f9d Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-09-15 14:51:38 +02:00
René Martin
a8a6aa2bd8 fixed some compiling issues 2021-09-15 14:49:46 +02:00
Kim Kulling
880a2f25bb Merge branch 'master' into remove-useless-code 2021-09-14 23:33:34 +02:00
Kim Kulling
8a975549a9 Add missing override 2021-09-14 20:49:20 +02:00
Kim Kulling
0fef0e1101 Move duplicate code to glFT common header. 2021-09-14 20:45:36 +02:00
Kim Kulling
18531e3677 Next iteration for c++11 features. 2021-09-13 22:38:20 +02:00
Artenuvielle
c7e9c6580a Merge branch 'master' into x3d_pugi_migration_artenuvielle 2021-09-12 11:45:00 +02:00
René Martin
3f6a371b64 migrated x3d importer to pugixml reader 2021-09-12 11:37:33 +02:00
Krishty
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
Krishty
4cf4e7454f removed useless code 
In destructors, zeroing attributes or clearing containers is utterly useless.
 2021-09-11 21:51:20 +02:00
Hill Ma
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
Kim Kulling
0dabce2754 Merge branch 'master' into cleanup_public_header 2021-09-09 20:18:01 +02:00
Kim Kulling
bc0a2762df Merge branch 'master' into master 2021-09-09 09:16:50 +02:00
Kim Kulling
f47479aba4 Rework format + introdule missing C++11 features 2021-09-08 23:19:10 +02:00
René Martin
3001d88172 Merge branch 'master' into x3d_pugi_migration 2021-09-07 15:04:08 +02:00