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
Madrich
80acc1f241
Fix Collada export image tag
...
Fix compiler double issues
2017-07-17 09:42:26 +02:00
Kim Kulling
3346fb517f
fix compiler warnings.
2017-07-16 01:02:33 +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
Patrick Dähne
0a1a4a0b96
X3D importer: Fixed iterator on MSVC 2015
2017-07-12 20:48:49 +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
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
Minmin Gong
4efe7bfd41
Remove std functions deprecated by C++11.
2017-07-04 17:01:03 -07: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
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
27b7b44c9d
fix unittests.
2017-06-28 20:11:13 +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
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
Kim Kulling
6aca0f86b4
Merge pull request #1314 from jamesgk/gltf-export
...
GLTF exporter: ensure buffer view byte offsets are correctly aligned
2017-06-22 08:31:07 +02:00
Kim Kulling
735e64309b
LWO: use forward declaration in header.
2017-06-21 23:06:53 +02:00
Kim Kulling
bd2af6591f
Fix compiler warnings.
2017-06-21 23:02:46 +02:00
jamesgk
7e45c63901
GLTF exporter: ensure buffer view byte offsets are correctly aligned
2017-06-21 09:58:24 -07:00
Kim Kulling
439409bef2
SceneCombiner: fix the build.
2017-06-21 15:24:06 +02:00
Kim Kulling
b727420cf2
SceneCOmbiner: Fix the build.
2017-06-21 14:31:37 +02:00
Kim Kulling
612ac234c5
SceneCombiner: move header for scenecombiner to public folder.
2017-06-21 14:21:16 +02:00
Kim Kulling
d3140a68ab
Merge branch 'master' of https://github.com/assimp/assimp
2017-06-17 21:17:39 +02:00
Kim Kulling
64cbc69337
remove dead code.
2017-06-17 20:36:59 +02:00
Kim Kulling
d7e13e67c4
Utf8: integrate new lib.
2017-06-17 19:38:47 +02:00
Kim Kulling
6e1034996e
UTF8Encoding: introduce new lib.
2017-06-16 16:43:39 +02:00
Kim Kulling
79818145a7
ObjImporter: remove dead code.
2017-06-15 20:24:10 +02:00
Kim Kulling
7977ded078
Merge pull request #1300 from assimp/ply_export_test
...
ply-exporter: add unittest.
2017-06-09 23:02:30 +02:00
Leo Terziman
4974c99288
Merge remote-tracking branch 'github/master' into contrib
2017-06-08 11:01:11 +02:00
Kim Kulling
548c09271b
ply-exporter: add unittest.
2017-06-07 14:06:38 +02:00
Kim Kulling
7f8839b1f4
Merge pull request #1293 from arkeon7/PLY_refactoring
...
PLYImporter refactoring
2017-06-06 11:55:37 +02:00
Kim Kulling
19d59b630b
SpatialSort: use much easier reabability.
2017-06-06 11:37:02 +02:00
arkeon
44a9f80e40
Ply importer with correction from last general trunk merge
2017-06-02 22:19:41 +02:00
Arkeon
f84851e893
PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply import - manage texture coords on faces in ply import - correction on point cloud faces generation
...
IFC :
- update poly2tri to avoid crash on some IFC files
Collada :
- manage missing texture reference in collada import
2017-06-02 13:48:57 +02:00
Leo Terziman
ca5ac0b532
Fixed bug where IFC models with multiple IFCSite only loaded 1 site instead of the complete model
2017-06-01 09:47:50 +02:00
Kim Kulling
9e98097aae
closes https://github.com/assimp/assimp/issues/1244 : log error for
...
overflow.
2017-05-31 21:43:41 +02:00
Kim Kulling
8c6f18ea2a
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-31 21:37:42 +02:00
Kim Kulling
1207a81b70
ObjImporter: remove dead code.
2017-05-31 21:37:16 +02:00
Kim Kulling
4dc7940ac5
ObjImporter: fix dead code.
2017-05-31 20:28:00 +02:00
Kim Kulling
e501cc17c2
Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks
2017-05-31 20:18:39 +02:00
Kim Kulling
82380084c5
ObjImporter: next try for multiple line stuff.
2017-05-31 16:36:08 +02:00
Kim Kulling
813f3b8248
ObjLoader: improve performance of obj-import.
2017-05-30 21:10:33 +02:00
Kim Kulling
c121cec68a
Obj-Importer: introduce working test for line breaks.
2017-05-29 22:00:13 +02:00
Kim Kulling
d30b1e585c
Tests how o adress this topic.
2017-05-28 22:25:06 +02:00
Kim Kulling
8cc80a3d9c
ObjImporter: fix the build.
2017-05-28 14:14:22 +02:00
Kim Kulling
3d99892b94
Opj-Importer: fix coverity finding.
2017-05-27 19:37:28 +02:00
Kim Kulling
e93355c8b4
Build: fix some compiler warnings for g++.
2017-05-26 09:18:23 +02:00
Kim Kulling
1b4cbcc6ad
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-25 22:40:36 +02:00
Kim Kulling
fb33199d99
GLTFImporter: exclude headers from build whem no_glft_importer is
...
defined.
2017-05-25 22:34:45 +02:00
Kim Kulling
b7d4b69e0d
X3DImporter: fix the build.
2017-05-24 22:35:35 +02:00
Kim Kulling
3c370c83b9
MDLImporter: remove dead code.
2017-05-24 21:18:51 +02:00
Kim Kulling
18b0316d52
X3DImporter: fix coverity finding ( missing comma ).
2017-05-24 21:15:55 +02:00
Kim Kulling
ec496a5833
X3DImporter: fix coverity finding.
2017-05-24 21:04:35 +02:00
Kim Kulling
3d5e94477f
Merge pull request #1272 from assimp/issue-1262
...
closes https://github.com/assimp/assimp/issues/1262 : fix .
2017-05-19 23:13:40 +02:00
Kim Kulling
febf94f6aa
Merge pull request #1212 from aoowweenn/umw_dev
...
MikuMikuDance Format
2017-05-17 12:01:46 +02:00
Kim Kulling
eba06f0c8b
Merge pull request #1275 from ab4d/master
...
Fixed build error in ObjExporter :: GetMaterialLibFileName
2017-05-17 11:34:35 +02:00
Kim Kulling
1daad40b30
Merge branch 'master' into issue-1262
2017-05-17 10:20:45 +02:00
Kim Kulling
04f908aa4c
Obj-Exporter: fix build.
2017-05-17 10:13:07 +02:00
Kim Kulling
60c54cbf59
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-17 09:25:30 +02:00
Kim Kulling
2f649833d5
LWOLoader: fix link in loader description.
2017-05-17 09:25:07 +02:00
Andrej
331bbacf3d
Fixed build error in ObjExporter :: GetMaterialLibFileName
2017-05-16 22:18:47 +02:00
Andrej
2b89a3cffc
Using single quote for one character parameter in find_last_of method call
2017-05-16 21:56:49 +02:00
Kim Kulling
3f68278ea0
Merge branch 'master' into issue-1262
2017-05-16 21:53:35 +02:00
Kim Kulling
a45b5cdfb5
OpenGEX: fix invalid handling with color4 token.
2017-05-16 21:45:23 +02:00
Kim Kulling
542fe31a94
closes https://github.com/assimp/assimp/issues/1262 : fix .
2017-05-16 21:07:20 +02:00
Andrej
c3974512e4
Improved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl
2017-05-16 15:55:40 +02:00
Andrej
04dbdca329
Revert "Creating fileName.mtl file instead of fileName.obj.mtl"
...
This reverts commit 5757980ea5
.
2017-05-16 15:47:57 +02:00
Andrej
5757980ea5
Creating fileName.mtl file instead of fileName.obj.mtl
2017-05-16 15:34:50 +02:00
Kim Kulling
ff7624f06f
Merge pull request #1268 from VennGrayDog/b1
...
Add TokensForSearch in BlenderLoader
2017-05-15 21:37:26 +02:00
Kim Kulling
7e011c92f0
Merge pull request #1269 from assimp/issue_1266
...
closes https://github.com/assimp/assimp/issues/1266 : fix wrong delete
2017-05-15 21:33:42 +02:00
Kim Kulling
428a4cdd71
SpatialSort: use std::vector::clear().
2017-05-15 19:41:08 +02:00
Kim Kulling
e5657bf0c5
closes https://github.com/assimp/assimp/issues/1266 : fix wrong delete
...
Instead of delete delete [] must be used.
2017-05-15 09:55:39 +02:00
Alexander Gessler
ab45dc79fa
Merge pull request #1263 from jamesgk/gltf-export
...
GLTF exporter: convert animation time from ticks to seconds
2017-05-15 09:12:57 +02:00
VennGrayDog
0b34089df0
Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files.
2017-05-15 02:34:53 -04:00
Alexander Gessler
24790398b9
Merge pull request #1264 from smokris/master
...
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'
2017-05-15 00:39:36 +02:00
VennGrayDog
3d05df2d3e
Fix location of config.h
2017-05-14 15:09:31 -04:00
Steve Mokris
2e455b78c8
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'.
2017-05-11 15:21:37 -04:00
jamesgk
c33039d682
GLTF exporter: convert animation time from ticks to seconds
2017-05-11 11:04:23 -07:00