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

7031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RichardTea
e8bcf162dd OBJ coerce invalid nan or inf texture coords to 0 
Some exporters (eg Vectorworks 2019) may export texture coordinate components as "nan".

While this is invalid, it's better to coerce these values to 0 rather than reject the entire file.
 2019-04-17 13:55:08 +01:00
RichardTea
51be6236a7 Merge branch 'master' into assimpview_unicode 2019-04-17 12:10:14 +01:00
RichardTea
7b6cb57e3b Merge branch 'collada_metadata' 2019-04-17 12:07:48 +01:00
RichardTea
00f1fd6f7c Merge branch 'master' into assimpview_unicode 2019-04-17 10:48:37 +01:00
RichardTea
b515f04ce6 assimp_view is ANSI (MBCS) only 
It should really be ported to UNICODE at some point, however I do not have the DirectX9 SDK so cannot confirm whether such a port is working.
 2019-04-17 10:48:14 +01:00
RichardTea
692927a8a1 Default CMAKE_DEBUG_POSTFIX to 'd' on multiconfig 
When the generator is multi config (eg MSVC, xcode) always set the debug postfix to 'd'
 2019-04-17 10:03:18 +01:00
RichardTea
0b9da72ed8 Merge pull request #5 from assimp/master 
Rollup FBX material fixes from upstream
 2019-04-17 09:44:10 +01:00
RichardTea
9242a12bf5 Qt5 requires cmake 3.1 
Earlier versions are not supported
 2019-04-17 09:32:59 +01:00
RichardTea
836801d37e CMake updates for VS2015/cmake 3.12 onwards 
cmake 3.12 adds MSVC_TOOLSET_VERSION to define the version of MSVC toolchain in use
Use that if present instead of if-elseif chain
 2019-04-17 09:32:24 +01:00
Kim Kulling
36bce5fa00 Merge pull request #2419 from merwaaan/fix-fbx-face-material 
Fix FBX face materials not being properly loaded if the face count mi…
 2019-04-16 11:03:14 +02:00
Kim Kulling
685a56266b Merge branch 'master' into fix-fbx-face-material 2019-04-15 09:55:38 +02:00
Kim Kulling
5bf096ab6d Merge pull request #2410 from assimp/fbx_embedded_ascii 
FBX: add test case
 2019-04-11 12:40:13 +02:00
Kim Kulling
bbaa9f330d Merge branch 'master' into fbx_embedded_ascii 2019-04-11 10:36:29 +02:00
Kim Kulling
6ff563ec23 Merge pull request #2420 from assimp/kimkulling-dev-2 
Update Readme.md
 2019-04-11 01:13:20 +02:00
Kim Kulling
e2025c3dec Update Readme.md 
Add info about C4D-importer.
 2019-04-10 20:31:23 +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
RichardTea
1f55bdd9a7 Save/Load Collada 1.4 Root Asset Metadata 
Add Collada 1.4 <asset/> metadata to export and import.
Can store in the Scene or the Root Node for export, will be loaded into the Scene during Import
 2019-04-09 16:28:15 +01:00
RichardTea
49459435df Merge branch 'master' into collada_metadata 2019-04-09 12:38:29 +01:00
RichardTea
4507f7cf46 Merge pull request #4 from assimp/master 
Fast forward
 2019-04-09 12:37:38 +01:00
Kim Kulling
d72c8e9c22 Merge pull request #2414 from assimp/kimkulling-dev-2 
closes https://github.com/assimp/assimp/issues/2411: Revert parts of dynamic ixxxml linkage
 2019-04-08 21:24:28 +02:00
Kim Kulling
dbd0f06d32 Update CMakeLists.txt 
Make IrrXml dynamic only on BSD
 2019-04-08 20:21:20 +02:00
Kim Kulling
ef209c6eed Update utColladaExportCamera.cpp 
Add mising override statement.
 2019-04-08 20:10:11 +02:00
RichardTea
e3a397a98d Merge pull request #3 from assimp/master 
fast forward to master
 2019-04-08 17:57:09 +01:00
RichardTea
d66166675a first pass at collada metadata 2019-04-08 17:11:50 +01:00
Kim Kulling
99648b69c3 Merge branch 'master' into fbx_embedded_ascii 2019-04-08 17:38:56 +02:00
Kim Kulling
d3d98a7ec0 Merge pull request #2409 from assimp/issue_2336 
closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 …
 2019-04-08 17:38:40 +02:00
kimkulling
cbd8b032e7 FBX: add test case 2019-04-08 17:37:40 +02:00
Kim Kulling
98ed6a2e18 Merge branch 'master' into issue_2336 2019-04-08 16:39:54 +02:00
Kim Kulling
189bb2a233 Merge pull request #2407 from mlavik1/issue_1957 
issue 1957: ASCII FBX embedded content
 2019-04-08 16:08:55 +02:00
RichardTea
2a3626577f Merge pull request #2 from assimp/master 
Update to Assimp Master 0973f50
 2019-04-08 14:06:36 +01:00
Kim Kulling
6dec1346ed Merge branch 'master' into issue_1957 2019-04-08 14:27:32 +02:00
Kim Kulling
0973f504b5 Merge pull request #2378 from assimp/issue_1650 
Issue 1650
 2019-04-08 14:25:25 +02:00
kimkulling
79f62b0174 closes https://github.com/assimp/assimp/issues/2336: use new cmp_048 policy even for zlib in the assimp build. 2019-04-08 14:24:33 +02:00
Kim Kulling
f7d226768c Merge branch 'master' into issue_1650 2019-04-08 13:06:30 +02:00
Kim Kulling
37357515fa Update irrXML.h 
FIx export directive for linux.
 2019-04-08 12:49:07 +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
03bd8905f5 Merge pull request #2391 from mlavik1/issue_2390 
FBX: Fix for loading taking a very long time on models with duplicate names
 2019-04-06 09:34:43 +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
Kim Kulling
225b6fa166 Merge pull request #2404 from mlavik1/issue_2043 
Suggested fix for issue 2043
 2019-04-05 10:41:15 +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
Kim Kulling
01d4b10f14 Merge pull request #2399 from assimp/issue_2398 
closes https://github.com/assimp/assimp/issues/2398: fix the build.
 2019-04-04 12:40:54 +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