Daniel Hritzkiv
67eb3b0608
temporarily disable gltf exporting of animations and skins
2017-09-11 10:50:38 -04:00
Daniel Hritzkiv
39172feb3e
Start reading pbr materials
2017-09-11 10:50:37 -04:00
Daniel Hritzkiv
4d59dee5ea
Cache retrieved items via an original index map
2017-09-11 10:50:37 -04:00
Daniel Hritzkiv
47c7c3cf50
Disambiguate Get methods
2017-09-11 10:50:37 -04:00
Daniel Hritzkiv
f814acf33a
Update glTF2 Asset to use indexes
2017-09-11 10:50:37 -04:00
Daniel Hritzkiv
63d3655f1b
Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List
2017-09-11 10:50:36 -04:00
Jared Mulconry
3c1cda0b8c
Merge branch 'master' of github.com:assimp/assimp into issue_1065
2017-09-11 00:17:23 +10:00
Jared Mulconry
698cd5826d
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-11 00:16:26 +10:00
Jared Mulconry
e40cd6c13c
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-11 00:09:40 +10:00
Jared Mulconry
1167edaeca
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-11 00:09:35 +10:00
Jared Mulconry
6db0a63d6e
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:13:12 +10:00
Jared Mulconry
6e02bcd8d6
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:10:59 +10:00
Jared Mulconry
b7f1277175
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:07:37 +10:00
Jared Mulconry
98532b45bf
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:04:44 +10:00
Jared Mulconry
97b67d5cb5
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 18:47:24 +10:00
Amit Cirt
2ec46cc188
fix name lost in mesh and nodes when load with aiProcess_PreTransformVertices flag
2017-09-09 19:04:15 +03:00
Kim Kulling
c143d2e02c
closes https://github.com/assimp/assimp/issues/1404 : set name with merged meshes for output mesh.
2017-09-07 20:30:17 +02:00
IOhannes m zmölnig
3de9bbb73d
fixed spelling error
2017-09-02 19:44:51 +02:00
Kim Kulling
b4da9c4f56
Fix review findings: remove unused includes
2017-08-31 11:30:31 +02:00
Kim Kulling
00e3b03c5b
closes https://github.com/assimp/assimp/issues/1406 : fix merge issue + improve 3MF-tests
2017-08-31 11:04:13 +02:00
Alexander Gessler
f8ef94095a
Update version check in FBX reader to check for version >= 7500 instead of exactly 7500.
2017-08-29 15:41:25 +02:00
Kim Kulling
7151cf117b
Merge branch 'master' of https://github.com/rickomax/assimp into rickomax-master
2017-08-25 16:47:08 +02:00
Kim Kulling
ce9c8a4efc
Merge pull request #1403 from kebby/fbx_anim_fix
...
FBX importer: Use actual min/max of anim keys when start/stop time is missing
2017-08-25 13:33:09 +02:00
Tammo Hinrichs
12a28d33ce
FBX importer: try a constant again (ll suffix this time)
2017-08-25 12:14:03 +02:00
Tammo Hinrichs
9a12b6ef0b
FBX importer: Back to INT64_MIN but include <stdint.h> also.
2017-08-25 11:17:07 +02:00
Kim Kulling
cac93ad0a8
Merge pull request #1400 from kebby/master
...
Collada importer: Add support for line strip primitives
2017-08-25 09:10:38 +02:00
Tammo Hinrichs
80489963a1
FBX importer: don't rely ont INT64_MIN / ..MAX macros
2017-08-24 17:18:54 +02:00
Tammo Hinrichs
7182f89a51
FBX importer: Use actual min/max of animation keyframes when start/stop time is missing
2017-08-24 14:40:53 +02:00
Tammo Hinrichs
92beee9924
Collada importer: Add support for line strip primitives
2017-08-23 17:52:53 +02:00
Eduardo Costa
2e5e56c000
Re-enabling PACK_STRUCT for MDL files.
...
When using this compiler:
Apple LLVM version 7.3.0 (clang-703.0.31)
Target: x86_64-apple-darwin15.4.0
Thread model: posix
The MDL::Frame is aligned in 8-byte boundaries instead of 4. This
generates this error when loading old Quake 1 MDL files:
ERROR: Failed to load file: Invalid MDL file. The file is too small
or contains invalid data (File: MDLLoader.cpp Line: 422)
It seems this error was introduced by commit
bd2af6591f
due to compilation warnings.
2017-08-21 09:27:40 +01:00
Arshia001
e0fc412e57
Fix OBJ discarding all material names if the material library is missing
2017-08-18 17:40:07 +04:30
Minmin Gong
b26fea4cf5
Fix compiling problems under VS2017.3.
...
1. WordIterator's operator== and operator!= must take const WordIterator& as parameter type.
2. OpenMP doesn't work with new two phase lookups. Need to disable twoPhase.
2017-08-14 21:51:59 -07:00
Kim Kulling
dab0985994
assert: remove assert with more than one statement and use only ai_assert.
2017-08-14 22:20:26 +02:00
Jeremy Abel
b1313b04b8
should be map, not set
2017-08-12 00:16:00 -04:00
Jeremy Abel
847e0291a0
changed a few leftover asserts to ai_assert
2017-08-12 00:13:24 -04:00
Daniel Hritzkiv
5b3b80cbc2
Formatting
2017-08-09 11:41:12 -04:00
Daniel Hritzkiv
83bfa61f8d
version in glb header is stored as uint32_t
...
Validator complains about `1` not being a valid version, however.
2017-08-09 11:09:43 -04:00
Daniel Hritzkiv
7a4a32625c
Ensure gltf asset version is printed as \d.0
2017-08-09 10:47:34 -04:00
Kim Kulling
7fd9c3dc98
§
2017-08-05 18:54:17 +02:00
Kim Kulling
8091e46e81
Merge pull request #1370 from 0xcccc/master
...
Fix android build issues
2017-08-03 16:40:32 +02:00
Kim Kulling
ba658e7813
ply-importer: fix creation of vertex attributes.
2017-08-03 14:57:48 +02:00
Kim Kulling
8478df7dbd
PlyLoader: fix vertex attribute lookup.
2017-08-02 14:24:53 +02:00
Knox Shao
def42bf624
Fix android build issues
2017-08-02 19:15:07 +08:00
Kim Kulling
81fd027860
closes https://github.com/assimp/assimp/issues/1270 : use HasTexture for
...
texture coordinates.
2017-08-02 11:35:57 +02:00
Kim Kulling
44e2ba541f
Merge pull request #1363 from jamesgk/gltf2
...
glTF2 export support
2017-07-29 15:08:52 +02:00
Kim Kulling
efa0aaf729
Merge pull request #1364 from pdaehne/master
...
X3D importer: Workaround for buggy Android NDK (issue #1361 )
2017-07-29 15:07:38 +02:00
7557fdbb72
Fix install for builds with MSVC compiler and NMake.
...
The CMake variable "MSVC" and the related versioned variables indicate that the
Visual Studio compiler is used but when using that compiler and the "NMake
Makefiles JOM" build generator the files it tried to install weren't in the
expected Debug folder.
2017-07-29 07:45:25 -04:00
Kim Kulling
3fe8c72f5d
new release: update to 4.0.1.
2017-07-28 22:27:36 +02:00
Kim Kulling
6c526d7c64
PPdPmdParser: fix compilation for clang.
2017-07-28 22:23:08 +02:00
jamesgk
5939d81138
glTF2: Use better mipmap filter defaults
2017-07-27 15:18:35 -07:00
Kim Kulling
d052b74b96
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-27 20:49:54 +02:00
Kim Kulling
a2bbf76cf4
StreamReader: fix out-of-range exception
2017-07-27 20:49:49 +02:00
Kim Kulling
d74306ad67
fix build
2017-07-27 13:07:26 +02:00
jamesgk
c91e9a94da
glTF2: export materials' normal maps
2017-07-26 14:42:22 -07:00
jamesgk
b7b17b03ec
glTF2: use opacity for diffuse alpha + alphaMode
...
The "transparency" attribute is unused in glTF2.
2017-07-26 14:39:35 -07:00
jamesgk
acf8c54e55
glTF2: Fix animation export
2017-07-26 14:20:53 -07:00
Patrick Dähne
16ed8861eb
X3D importer: Workaround for buggy Android NDK (issue #1361 )
2017-07-26 14:14:11 +02:00
jamesgk
bb55246c18
Export glTF 2
2017-07-25 18:05:18 -07:00
jamesgk
d7cbbaf23e
Compile with glTF2 export option (currently same as glTF1 output)
2017-07-25 17:34:03 -07:00
jamesgk
38626d4260
glTF: start fork of files used in export, for glTF2
2017-07-25 17:34:03 -07:00
Kim Kulling
4dc2cd8442
Profiler: fix invalid using statement.
2017-07-25 08:54:29 +02:00
Kim Kulling
2cb1a9efc6
Profiler: add a unittest.
2017-07-25 00:00:43 +02:00
Alexander Gessler
96cb3f7140
Merge pull request #1359 from sacereda/profilerLogging
...
Elapsed seconds not shown correctly
2017-07-23 01:56:22 +02:00
Sergio Acereda
6429502fc5
Elapsed seconds not shown correctly
2017-07-22 23:31:10 +02:00
Sergio Acereda
8606ec6060
Low performance in OptimizeMeshesProcess::ProcessNode with huge number of aiMeshes
2017-07-22 23:28:55 +02:00
rickomax
147541ab7f
Complementing last fix
...
Complementing last fix
2017-07-19 19:04:10 -03:00
rickomax
3d4b54f8fc
Fixed FBX 7500 Binary reading
...
Seems that all FBX 7.5 Binary files uses 32 bits adresses. The code now is taking this in consideration. This commit fixes the https://github.com/assimp/assimp/issues/838 issue.
2017-07-19 19:00:53 -03:00
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
Kim Kulling
9b2671b280
Merge pull request #1248 from NcJie/fixed-android-atof-not-found-issue
...
Fixed no member named 'atop' in global namespace issue for Android ND…
2017-05-11 10:55:59 +02:00
Kim Kulling
ab19c5e3f7
Merge pull request #1258 from jamesgk/gltf-export
...
GLTF exporter: ensure animation accessors have same count
2017-05-11 10:46:06 +02:00
Kim Kulling
f6a8be5bac
AMPImporter: fix coverity findings.
2017-05-10 19:34:50 +02:00
Kim Kulling
5411f769e8
STEPFile: fix coverity findings.
2017-05-10 18:50:51 +02:00
Kim Kulling
d36fbfbb8b
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-10 18:30:36 +02:00
Kim Kulling
0300574b8b
AMFImporter: fix coverity findings.
2017-05-10 18:29:42 +02:00
Kim Kulling
b8747fffca
Merge pull request #1259 from Squareys/fix-cmake-install
...
[One-Line-Change] Fix config.h not being found during cmake --build . --target install
2017-05-10 09:37:04 +02:00
Kim Kulling
9ef1a4fae0
X3D: fix coverity findings.
2017-05-09 22:54:04 +02:00
Squareys
cfb867b5e7
Fix config.h not being found during install
2017-05-09 21:51:49 +02:00
Kim Kulling
eb828a3b71
X3DImporter: fix coverity findings.
2017-05-09 21:35:21 +02:00
Kim Kulling
4a5c483ac4
AMFImporter: make test against nullptr dereferencing meaningful.
2017-05-09 21:03:20 +02:00
Kim Kulling
f77e27ca19
ColladaExporter: remove self assignment.
2017-05-09 20:59:01 +02:00
Kim Kulling
03d97b23ec
Coverity: fix finding in COBLoader.
2017-05-09 20:15:30 +02:00
Kim Kulling
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
jamesgk
36f4fb8826
GLTF exporter: ensure animation accessors have same count
2017-05-08 14:45:26 -07:00
Kim Kulling
186629b372
SpatialSort: use std::vector::resize( 0 ) to improve readability.
2017-05-08 21:57:08 +02:00
Kim Kulling
65653edf88
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-08 21:29:07 +02:00
Kim Kulling
5289954e27
Fix review findings.
2017-05-06 20:57:17 +02:00
Kim Kulling
98100d8cab
Blender-Importer: fix coverity findings.
2017-05-06 11:14:04 +02:00
Kim Kulling
39e048dea6
Merge pull request #1254 from samitc/master
...
Improve performance of obj line break
2017-05-04 19:53:51 +02:00
Kim Kulling
7f014ea889
Merge pull request #1256 from johnmaf/bugfix/gltf-bin-uri
...
Fix incorrect truncation of binary URI in glTF exporter
2017-05-04 19:52:18 +02:00
John Senneker
d6e8fd34f0
Search for .gltf extension at end of file name for buffer prefix.
...
Previously the code assumed that there would be only one '.' in the file
name, which is not a valid assumption. This patch fixes this issue, but
still assumes that the only occurrence of the string ".gltf" is at the
end of the file name. In particular, it will fail on a file name like
"/path/to/a.gltf/my_gltf.wrong_extension".
2017-05-03 15:11:31 -04:00
Amit Cirt
dd1d10407e
make array non static to support multithreaded
2017-05-01 16:54:07 +03:00
Amit Cirt
8b4e066ca5
Improve performance of obj line break
2017-05-01 16:32:49 +03:00
rdb
0069552183
Fix static init ordering bug in OpenGEX importer
2017-05-01 15:11:22 +02:00
Helio Chissini de Castro
4a0171bd82
- Apply mechanism to decide use for IrrXML external or internal
...
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.
Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists
Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
2017-04-29 08:10:44 +02:00
Cong Jie
aff391c681
Fixed no member named 'atop' in global namespace issue for Android NDK compilation
2017-04-27 17:15:03 +09:00
Tyson Grant Nottingham
8445db2cd9
Set UVW index material properties for OBJ files.
2017-04-21 01:09:26 -07:00
Andy Maloney
b64882f4c7
Fix spelling
2017-04-11 16:33:13 -04:00
Amit Cirt
9fc7f72b55
fix line breakes in obj files
2017-04-11 17:16:18 +03:00
Guillaume Bittoun
0e3956caf1
Compilation fix: Removing the vector4 headers from code/CMakeLists.txt
2017-04-08 23:25:39 +02:00
Kim Kulling
2825d2daf8
Merge branch 'master' of https://github.com/assimp/assimp
2017-04-07 17:50:20 +02:00
Kim Kulling
38fab5ae8e
doc updatedoc update
2017-04-07 17:46:53 +02:00