Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,581 Commits 19 Branches 43 Tags
3859cd692f00175bb2c049060553b93916a91596
Commit Graph

4581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
3859cd692f Merge branch 'master' of https://github.com/assimp/assimp 2017-07-18 19:02:47 +02:00
Kim Kulling
5e98898dca Update version. 2017-07-18 19:02:08 +02:00
Kim Kulling
a895808959 Merge branch 'master' of https://github.com/assimp/assimp 2017-07-18 17:03:45 +02:00
Kim Kulling
4361262029 PlyLoader: fix out of bound access. 2017-07-18 17:02:21 +02:00
Kim Kulling
fc647742fe Merge pull request #1350 from Madrich/master 
Some fixes
 2017-07-17 11:23:29 +02:00
Madrich
80acc1f241 Fix Collada export image tag 
Fix compiler double issues
 2017-07-17 09:42:26 +02:00
Madrich
ae0850b88c Merge pull request #13 from assimp/master 
Update fork
 2017-07-17 09:07:41 +02:00
Kim Kulling
3346fb517f fix compiler warnings. 2017-07-16 01:02:33 +02:00
Kim Kulling
123d06ca1c Merge pull request #1347 from rickomax/master 
Fixed many FBX bugs
v4.0.0.rc1 		2017-07-15 20:55:57 +02:00
rickomax
328646f1d1 Merge branch 'master' of https://github.com/assimp/assimp 2017-07-15 11:22:14 -03:00
Kim Kulling
c9d18ebe1f Merge pull request #1345 from jamesgk/master 
Use unique node names when loading Collada files
 2017-07-15 11:08:59 +02:00
Kim Kulling
bd7fdfeeca Merge pull request #1338 from pdaehne/master 
X3D importer: Support for binary X3D files
 2017-07-15 11:08:08 +02:00
rickomax
c86013b08d Fixed many FBX bugs 
Fixed a bug where FBX loader won´t load embedded textures that don´t have the Content data filled. Some FBX files only fill this data once, so any embedded texture with the same source filename, should use the pre-loaded data.

Fixed another bug where FBX Texture "Filename" field came different than  on some files than the one defined by the code. One suggestion is load all properties by the case-insensitive function created.

Added the "AI_CONFIG_IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES" flag to tell the importer to load embedded texture data from already loaded ones.
 2017-07-15 00:27:33 -03:00
jamesgk
727cffdfb4 Use unique node names when loading Collada files 2017-07-14 11:54:37 -07:00
Kim Kulling
c9912fd481 Merge pull request #1337 from terziman/master 
Added support for metadata in assbin format
 2017-07-12 21:28:37 +02:00
Patrick Dähne
0a1a4a0b96 X3D importer: Fixed iterator on MSVC 2015 2017-07-12 20:48:49 +02:00
Kim Kulling
8648fd223e update python readme. 2017-07-12 20:35:50 +02:00
Patrick Dähne
c1442c63cf X3D importer: Fixed problems with auto, override and regex on older compilers 2017-07-12 19:57:10 +02:00
Patrick Dähne
e97ba7aec2 X3D importer: Fixed missing header file 2017-07-11 21:32:47 +02:00
Patrick Dähne
8959bcb847 X3D importer: Fixed path handling 2017-07-11 19:41:24 +02:00
Patrick Dähne
457dff1bf1 X3D importer: Implemented support for binary X3D files 2017-07-11 19:28:40 +02:00
Leo Terziman
1026264c64 Fixed bug in assbin metadata export when no metadata are defined 2017-07-11 18:15:56 +02:00
Leo Terziman
6c6a8fe671 Added support for metadata in assbin format 2017-07-11 17:39:36 +02:00
Kim Kulling
e66dc5c9ad Collada: add workaround to deal with polygon with holes . 2017-07-11 10:42:10 +02:00
Kim Kulling
947e4389ce closes https://github.com/assimp/assimp/issues/1335: use correct path 
for compilers.
 2017-07-10 13:39:29 +02:00
Kim Kulling
d40b6089e8 Fix compiler warnings + one review finding. 2017-07-09 22:17:35 +02:00
Kim Kulling
647b59b7fa Merge pull request #1334 from assimp/x_deals_with_lines 
X-Importer: make it deal with lines.
 2017-07-07 18:38:51 +02:00
Kim Kulling
af216ec294 X-Importer: make it deal with lines. 2017-07-07 16:34:08 +02:00
Kim Kulling
5de0172869 Merge pull request #1333 from gongminmin/master 
Remove std functions deprecated by C++11.
 2017-07-06 08:34:55 +02:00
Minmin Gong
4efe7bfd41 Remove std functions deprecated by C++11. 2017-07-04 17:01:03 -07:00
Kim Kulling
b38ba233f5 add missing coverity token. 2017-07-01 10:42:47 +02:00
Kim Kulling
ac37e4ddba closes https://github.com/assimp/assimp/issues/1320: check if all 
exporters are disabled.
 2017-06-28 22:13:49 +02:00
Kim Kulling
616e62c4b8 Merge branch 'master' of https://github.com/assimp/assimp 2017-06-28 22:09:53 +02:00
Kim Kulling
3bf8c9dcf4 Merge pull request #1318 from rspencer01/master 
Fixes parameters to pyassimp.load
 2017-06-28 22:09:20 +02:00
Kim Kulling
12908506ab Merge pull request #1322 from assimp/issue_1319 
closes https://github.com/assimp/assimp/issues/1319: fix build without
 2017-06-28 22:08:44 +02:00
Kim Kulling
f30fd58494 fix review findings., 2017-06-28 22:08:20 +02:00
Kim Kulling
a8285f181d add missing coverity scan token. 2017-06-28 20:26:15 +02:00
Kim Kulling
27b7b44c9d fix unittests. 2017-06-28 20:11:13 +02:00
Kim Kulling
18538e353d Merge pull request #1323 from vkovalev123/master 
Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attr…
 2017-06-27 13:26:36 +02:00
Vitaly Kovalev
6891db99af Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attributes 
Signed-off-by: Vitaly Kovalev <vkovalev@gkmsoft.ru>
 2017-06-27 13:52:43 +03:00
Kim Kulling
a408b92279 closes https://github.com/assimp/assimp/issues/1319: fix build without 
3DS.
 2017-06-26 22:01:15 +02:00
Kim Kulling
9ffc1a97c1 Merge pull request #1321 from pdaehne/master 
Fixes for X3DImporter/X3DExporter
 2017-06-26 21:04:25 +02:00
Patrick Dähne
d8cac6eb24 Fixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet 2017-06-26 15:25:15 +02:00
Robert Spencer
c6d888531b Fixes parameters to pyassimp.load 
Commit 704e57db4e changed the order
of the parameters to `pyassimp.load`.  The new order groups
`filename` and `file_type` which is preferable, but the samples and
other calls to `load` still point to the old order.  This fixes that
with named arguments where necessary.
 2017-06-25 15:18:53 +02:00
Kim Kulling
afb2f3036e OpenDDLParser: latest greatest. 2017-06-25 13:21:36 +02:00
Patrick Dähne
aaa476cb10 X3D importer: Added EXPORT and IMPORT to the list of ignored XML tags 2017-06-23 11:59:14 +02:00
Patrick Dähne
3c8a4a5abb X3D Exporter: fixed missing attributes 2017-06-22 20:48:33 +02:00
Patrick Dähne
855589d2a1 X3D importer: Fixed import of normals for the single index / normal per vertex case 2017-06-22 18:54:03 +02:00
Patrick Dähne
6118f77d3b X3D importer: Fixed handling of inlined files 2017-06-22 16:29:26 +02:00
Patrick Dähne
840ed9dd34 X3D importer: fixed whitespace handling (issue #1202) 2017-06-22 15:05:23 +02:00