48e5b948e3
Update ColladaExporter.cpp
...
Some reformattings
2019-04-24 09:03:59 +02:00
5713be615c
[FBX export] fixed ordering of skin indices and weights, to be consistent between systems
2019-04-18 16:55:54 +01:00
c34327b355
use std::isfinite()
...
GCC is more standards compliant than MSVC
2019-04-17 14:30:40 +01:00
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
51be6236a7
Merge branch 'master' into assimpview_unicode
2019-04-17 12:10:14 +01:00
7b6cb57e3b
Merge branch 'collada_metadata'
2019-04-17 12:07:48 +01:00
00f1fd6f7c
Merge branch 'master' into assimpview_unicode
2019-04-17 10:48:37 +01:00
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
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
0b9da72ed8
Merge pull request #5 from assimp/master
...
Rollup FBX material fixes from upstream
2019-04-17 09:44:10 +01:00
9242a12bf5
Qt5 requires cmake 3.1
...
Earlier versions are not supported
2019-04-17 09:32:59 +01:00
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
b6d3cbcb61
Fix "bytes aketrans" issues in Python>=3.1
...
Issue https://github.com/assimp/assimp/issues/2339
2019-04-17 14:19:00 +08:00
1ff10c1ade
Merge branch 'master' into master
2019-04-16 16:38:53 +02:00
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
685a56266b
Merge branch 'master' into fix-fbx-face-material
2019-04-15 09:55:38 +02:00
9b9b2c8339
Fix typo on README.md
...
changing "fascade" to "facade"
2019-04-14 10:13:32 -07:00
5bf096ab6d
Merge pull request #2410 from assimp/fbx_embedded_ascii
...
FBX: add test case
2019-04-11 12:40:13 +02:00
bbaa9f330d
Merge branch 'master' into fbx_embedded_ascii
2019-04-11 10:36:29 +02:00
6ff563ec23
Merge pull request #2420 from assimp/kimkulling-dev-2
...
Update Readme.md
2019-04-11 01:13:20 +02:00
e2025c3dec
Update Readme.md
...
Add info about C4D-importer.
2019-04-10 20:31:23 +02:00
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
2f6f716512
Clarify build instructions
2019-04-10 12:42:19 -04:00
1b0c1139eb
Fix more codacy warnings!
2019-04-10 11:45:30 -04:00
c1f3624f5b
Fix more codacy warnings
2019-04-10 11:06:00 -04:00
24a0aaeb77
Fix Codacy Warning
2019-04-10 11:02:36 -04:00
567a645c4f
* Improve error message for new check on MinGW compiler version
2019-04-10 10:31:57 -04:00
6a373d55c7
* Add notes on MinGW compiler version requirements
...
* Add check on MinGW compiler version to force compliance.
* Closes #2315 ?
2019-04-10 10:07:24 -04:00
f7384dec95
Possible fix for #2406 . Shouldn't affect other compiled files, but have
...
not verified this. Also, if anyone tries to debug StepFileGen1.cpp on MinGW,
the debug info may not be there, but I think this is the best we can do.
2019-04-10 09:45:31 -04:00
9aae110161
* Remove old non-maintained mingw makefile to prevent confusion
...
* Add notes on building with MinGW to Build.md
2019-04-10 09:29:21 -04:00
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
49459435df
Merge branch 'master' into collada_metadata
2019-04-09 12:38:29 +01:00
4507f7cf46
Merge pull request #4 from assimp/master
...
Fast forward
2019-04-09 12:37:38 +01:00
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
dbd0f06d32
Update CMakeLists.txt
...
Make IrrXml dynamic only on BSD
2019-04-08 20:21:20 +02:00
ef209c6eed
Update utColladaExportCamera.cpp
...
Add mising override statement.
2019-04-08 20:10:11 +02:00
e3a397a98d
Merge pull request #3 from assimp/master
...
fast forward to master
2019-04-08 17:57:09 +01:00
d66166675a
first pass at collada metadata
2019-04-08 17:11:50 +01:00
99648b69c3
Merge branch 'master' into fbx_embedded_ascii
2019-04-08 17:38:56 +02:00
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
cbd8b032e7
FBX: add test case
2019-04-08 17:37:40 +02:00
98ed6a2e18
Merge branch 'master' into issue_2336
2019-04-08 16:39:54 +02:00
189bb2a233
Merge pull request #2407 from mlavik1/issue_1957
...
issue 1957: ASCII FBX embedded content
2019-04-08 16:08:55 +02:00
2a3626577f
Merge pull request #2 from assimp/master
...
Update to Assimp Master 0973f50
2019-04-08 14:06:36 +01:00
6dec1346ed
Merge branch 'master' into issue_1957
2019-04-08 14:27:32 +02:00
0973f504b5
Merge pull request #2378 from assimp/issue_1650
...
Issue 1650
2019-04-08 14:25:25 +02:00
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
f7d226768c
Merge branch 'master' into issue_1650
2019-04-08 13:06:30 +02:00
37357515fa
Update irrXML.h
...
FIx export directive for linux.
2019-04-08 12:49:07 +02:00
ddfc140fc3
Added <stdint.h>-include
2019-04-07 00:02:22 +02:00
Kim Kulling
Hugo Pereira
RichardTea
Huarong Chen
Simon Puente
Merwan Achibet
Charlie Gettys
kimkulling
Matias Lavik