Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,007 Commits 19 Branches 43 Tags
1ff10c1adecb5e76df8a8bcb10bfcd9d4906f4e7
Commit Graph

3885 Commits

Author SHA1 Message Date
Kim Kulling
685a56266b Merge branch 'master' into fix-fbx-face-material 2019-04-15 09:55:38 +02:00
Merwan Achibet
c92ae50e4f Fix FBX face materials not being properly loaded if the face count mismatches the material count 2019-04-10 19:16:42 +02:00
kimkulling
cbd8b032e7 FBX: add test case 2019-04-08 17:37:40 +02:00
Kim Kulling
6dec1346ed Merge branch 'master' into issue_1957 2019-04-08 14:27:32 +02:00
Kim Kulling
f7d226768c Merge branch 'master' into issue_1650 2019-04-08 13:06:30 +02:00
Matias Lavik
ddfc140fc3 Added <stdint.h>-include 2019-04-07 00:02:22 +02:00
Matias Lavik
fac392d6cb Added missing include and fixed a mistake 2019-04-06 23:44:14 +02:00
Matias Lavik
015e960d0e Merge branch 'master' into issue_1957 2019-04-06 22:22:05 +02:00
Matias Lavik
b3177a2a9a issue 1957: Added support for reading embedded content (textures) in ASCII FBX. In ASCII FBX embedded content is encoded in Base64 and is surrounded by double quotation marks. The decoding functions are based on those used in the glTF importer. 2019-04-06 19:31:56 +02:00
Kim Kulling
c321fb6a44 Update FBXConverter.cpp 
FBX: Add missind initializers.
 2019-04-06 08:59:30 +02:00
Matias Lavik
d0ad03d653 Merge branch 'master' into issue_2390 2019-04-05 13:16:29 +02:00
Matias Lavik
898e59d8ee Merge branch 'master' into issue_2043 2019-04-04 16:36:44 +02:00
Matias
20acce1c5e Suggested fix for issue : If available, use "Scaling" and "Translation" instead of "ModelUVScaling" and "ModelUVTranslation". This seems to be what 3DS Max and FBX SDK use. 2019-04-04 16:31:34 +02:00
Matias Lavik
3abb494dd6 Merge branch 'master' into issue_2390 2019-04-04 13:08:27 +02:00
Kim Kulling
010afeb1d8 Merge branch 'master' into issue_1650 2019-04-04 12:42:21 +02:00
Matias Lavik
e63b9d4cd8 Merge branch 'master' into issue_2390 2019-04-03 21:17:38 +02:00
Matias Lavik
6d1514dd10 replaced "typedef" with "using" (I didn't notice Kim Kulling's previous commit until now) 2019-04-03 20:19:44 +02:00
Kim Kulling
f10e759db6 Merge branch 'issue_2398' of https://github.com/assimp/assimp into issue_2398 2019-04-03 20:16:24 +02:00
Kim Kulling
42608c0260 Fix small review findings. 2019-04-03 20:15:55 +02:00
Kim Kulling
287924a7d6 Merge branch 'master' into issue_2398 2019-04-03 20:03:07 +02:00
Matias Lavik
0251633ea2 Merge branch 'master' into issue_2393 2019-04-03 12:46:11 +02:00
Matias
4884cf2172 issue_2393: Added TransparencyFactor material key 2019-04-03 12:35:09 +02:00
Matias Lavik
fa37018e08 Merge branch 'master' into issue_2390 2019-04-03 12:26:06 +02:00
Matias
0505dd7266 issue 2390: FBXConverter::GetUniqueName now uses a map for keeping track of duplicate node name count and a set for registering names that have been taken.This is required because the model might contain a several nodes called "nodename" and another one called "nodename001". In that case we can't add "001" to the second node called "nodename". 2019-04-03 12:19:23 +02:00
Kim Kulling
930af2da44 closes https://github.com/assimp/assimp/issues/2398: fix the build. 2019-04-02 20:43:03 +02:00
Charlie Gettys
9d5a71e4af Merge branch 'master' into fix-more-lgtm-alerts 2019-04-01 11:23:33 -04:00
Charlie Gettys
f15f37634d BlenderDNA.h: 
* Fix rethrow that would crash the program.
* QUESTION: am I throwing the right exception here.

COBLoader:
* catch exception by const ref
* fix equality checks using strncmp taht weren't actually checking equality

FBXMaterial: Catch exception by const ref (+ Debug log that it's done so)

FBXConverter: Rename local variables to avoid shadowing parameter

ImageExtractor: Remove duplicated/unreachable code

FBXConverter: Another shadowed variable fix

MD5Loader: 2 shadowed variables

IRRLoader: shadowed parameter

StepFileReader.cpp: Shadowed parameter

IRRLoader: remove empty else statement

STLExporter: Throw error instead of silently ignoring unimplemented option

Misc empty blocks removed or debug logging added
 2019-03-30 16:08:25 -04:00
Kim Kulling
89b3de9473 Update FBXConverter.h 
Introduce using instead of typedef.
 2019-03-29 16:24:45 +01:00
Marco Di Benedetto
d314afaebc added casts for rapidjson in gltf asset writer. 2019-03-29 12:19:39 +01:00
Marco Di Benedetto
faf12c6f5f Merge https://github.com/assimp/assimp 2019-03-29 11:55:21 +01:00
Kim Kulling
d129259ae4 Merge branch 'master' into issue_2390 2019-03-29 10:51:35 +01:00
Charlie Gettys
4efa3736ba Actually fix cmake this time 2019-03-27 12:03:39 -04:00
Charlie Gettys
d718793163 Fix change to CMakeLists.txt 
change CMakeLists.txt to use add_definitions instead of add_compile_definitions on old versions of cmake
 2019-03-27 11:43:21 -04:00
Charlie Gettys
769dd42b73 Add compile definition to fix issue 
defines MINIZ_USE_UNALIGNED_LOADS_AND_STORES to be 0 to override default of 1 for x86 platforms.
 2019-03-27 11:29:40 -04:00
Matias
ca08c4a209 FBX: Fix for loading taking a very long time on models with many duplicate names (issue_2390) 2019-03-27 11:20:16 +01:00
Kim Kulling
22f4667932 Merge branch 'master' into select_exporters 2019-03-17 23:44:35 +01:00
Kim Kulling
718b5b266b Merge branch 'master' into fix_vs107_warnings 2019-03-16 18:41:54 +01:00
Andy Maloney
df6d257633 Fix 3MF importer 2019-03-16 11:55:16 -04:00
Andy Maloney
5ccd7d8c39 Adds a way to select which exporters you want to compile 
Mimics the ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT / ASSIMP_BUILD_XXX_IMPORTER code but for exporters.

This works exactly the same way with one exception - ASSIMP_NO_EXPORT still overrides everything and turns off all exporting.

Fixes #2377
 2019-03-16 11:40:17 -04:00
Kim Kulling
581d06a7b7 Merge branch 'master' into issue_1650 2019-03-16 16:22:47 +01:00
Kim Kulling
64bcf56101 Merge branch 'master' into issue_1650 2019-03-16 16:13:52 +01:00
Kim Kulling
a0c797a29e Merge branch 'master' into fix_vs107_warnings 2019-03-16 16:09:14 +01:00
Kim Kulling
64a7a46406 Update MD3Loader.cpp 
Fix typo.
 2019-03-16 16:08:03 +01:00
Kim Kulling
ba6a7383b2 closes https://github.com/assimp/assimp/issues/1650: build irrXml as shared lib. 2019-03-16 09:45:21 +01:00
Tomas Maly
9a533d826a fix loading 3D uvs from obj 2019-03-15 22:43:12 +01:00
kimkulling
61ffe017e8 Fix some coverity findings. 2019-03-14 17:37:28 +01:00
Aidmx
170549559e fix: change ScaleProcess priority 2019-03-14 21:50:50 +08:00
Kim Kulling
04025f09cf Merge branch 'master' into issue_934 2019-03-13 22:27:23 +01:00
Kim Kulling
145c3d1589 add missing changes. 2019-03-13 19:35:36 +01:00
kkulling
650fadebe9 Fix compiler warnings: var declarations hides other var. 2019-03-13 16:58:18 +01:00