97b67d5cb5
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 18:47:24 +10:00
2ec46cc188
fix name lost in mesh and nodes when load with aiProcess_PreTransformVertices flag
2017-09-09 19:04:15 +03:00
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
3de9bbb73d
fixed spelling error
2017-09-02 19:44:51 +02:00
b4da9c4f56
Fix review findings: remove unused includes
2017-08-31 11:30:31 +02:00
00e3b03c5b
closes https://github.com/assimp/assimp/issues/1406 : fix merge issue + improve 3MF-tests
2017-08-31 11:04:13 +02:00
f8ef94095a
Update version check in FBX reader to check for version >= 7500 instead of exactly 7500.
2017-08-29 15:41:25 +02:00
7151cf117b
Merge branch 'master' of https://github.com/rickomax/assimp into rickomax-master
2017-08-25 16:47:08 +02:00
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
12a28d33ce
FBX importer: try a constant again (ll suffix this time)
2017-08-25 12:14:03 +02:00
9a12b6ef0b
FBX importer: Back to INT64_MIN but include <stdint.h> also.
2017-08-25 11:17:07 +02:00
cac93ad0a8
Merge pull request #1400 from kebby/master
...
Collada importer: Add support for line strip primitives
2017-08-25 09:10:38 +02:00
80489963a1
FBX importer: don't rely ont INT64_MIN / ..MAX macros
2017-08-24 17:18:54 +02:00
7182f89a51
FBX importer: Use actual min/max of animation keyframes when start/stop time is missing
2017-08-24 14:40:53 +02:00
92beee9924
Collada importer: Add support for line strip primitives
2017-08-23 17:52:53 +02:00
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
2017-08-21 09:27:40 +01:00
e0fc412e57
Fix OBJ discarding all material names if the material library is missing
2017-08-18 17:40:07 +04:30
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
dab0985994
assert: remove assert with more than one statement and use only ai_assert.
2017-08-14 22:20:26 +02:00
b1313b04b8
should be map, not set
2017-08-12 00:16:00 -04:00
847e0291a0
changed a few leftover asserts to ai_assert
2017-08-12 00:13:24 -04:00
5b3b80cbc2
Formatting
2017-08-09 11:41:12 -04:00
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
7a4a32625c
Ensure gltf asset version is printed as \d.0
2017-08-09 10:47:34 -04:00
7fd9c3dc98
§
2017-08-05 18:54:17 +02:00
8091e46e81
Merge pull request #1370 from 0xcccc/master
...
Fix android build issues
2017-08-03 16:40:32 +02:00
ba658e7813
ply-importer: fix creation of vertex attributes.
2017-08-03 14:57:48 +02:00
8478df7dbd
PlyLoader: fix vertex attribute lookup.
2017-08-02 14:24:53 +02:00
def42bf624
Fix android build issues
2017-08-02 19:15:07 +08:00
81fd027860
closes https://github.com/assimp/assimp/issues/1270 : use HasTexture for
...
texture coordinates.
2017-08-02 11:35:57 +02:00
44e2ba541f
Merge pull request #1363 from jamesgk/gltf2
...
glTF2 export support
2017-07-29 15:08:52 +02:00
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
3fe8c72f5d
new release: update to 4.0.1.
2017-07-28 22:27:36 +02:00
6c526d7c64
PPdPmdParser: fix compilation for clang.
2017-07-28 22:23:08 +02:00
5939d81138
glTF2: Use better mipmap filter defaults
2017-07-27 15:18:35 -07:00
d052b74b96
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-27 20:49:54 +02:00
a2bbf76cf4
StreamReader: fix out-of-range exception
2017-07-27 20:49:49 +02:00
d74306ad67
fix build
2017-07-27 13:07:26 +02:00
c91e9a94da
glTF2: export materials' normal maps
2017-07-26 14:42:22 -07:00
b7b17b03ec
glTF2: use opacity for diffuse alpha + alphaMode
...
The "transparency" attribute is unused in glTF2.
2017-07-26 14:39:35 -07:00
acf8c54e55
glTF2: Fix animation export
2017-07-26 14:20:53 -07:00
16ed8861eb
X3D importer: Workaround for buggy Android NDK (issue #1361 )
2017-07-26 14:14:11 +02:00
bb55246c18
Export glTF 2
2017-07-25 18:05:18 -07:00
d7cbbaf23e
Compile with glTF2 export option (currently same as glTF1 output)
2017-07-25 17:34:03 -07:00
38626d4260
glTF: start fork of files used in export, for glTF2
2017-07-25 17:34:03 -07:00
4dc2cd8442
Profiler: fix invalid using statement.
2017-07-25 08:54:29 +02:00
2cb1a9efc6
Profiler: add a unittest.
2017-07-25 00:00:43 +02:00
96cb3f7140
Merge pull request #1359 from sacereda/profilerLogging
...
Elapsed seconds not shown correctly
2017-07-23 01:56:22 +02:00
6429502fc5
Elapsed seconds not shown correctly
2017-07-22 23:31:10 +02:00
8606ec6060
Low performance in OptimizeMeshesProcess::ProcessNode with huge number of aiMeshes
2017-07-22 23:28:55 +02:00
147541ab7f
Complementing last fix
...
Complementing last fix
2017-07-19 19:04:10 -03:00
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
3859cd692f
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-18 19:02:47 +02:00
5e98898dca
Update version.
2017-07-18 19:02:08 +02:00
a895808959
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-18 17:03:45 +02:00
4361262029
PlyLoader: fix out of bound access.
2017-07-18 17:02:21 +02:00
80acc1f241
Fix Collada export image tag
...
Fix compiler double issues
2017-07-17 09:42:26 +02:00
3346fb517f
fix compiler warnings.
2017-07-16 01:02:33 +02:00
328646f1d1
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-15 11:22:14 -03:00
c9d18ebe1f
Merge pull request #1345 from jamesgk/master
...
Use unique node names when loading Collada files
2017-07-15 11:08:59 +02:00
bd7fdfeeca
Merge pull request #1338 from pdaehne/master
...
X3D importer: Support for binary X3D files
2017-07-15 11:08:08 +02:00
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
727cffdfb4
Use unique node names when loading Collada files
2017-07-14 11:54:37 -07:00
0a1a4a0b96
X3D importer: Fixed iterator on MSVC 2015
2017-07-12 20:48:49 +02:00
c1442c63cf
X3D importer: Fixed problems with auto, override and regex on older compilers
2017-07-12 19:57:10 +02:00
e97ba7aec2
X3D importer: Fixed missing header file
2017-07-11 21:32:47 +02:00
8959bcb847
X3D importer: Fixed path handling
2017-07-11 19:41:24 +02:00
457dff1bf1
X3D importer: Implemented support for binary X3D files
2017-07-11 19:28:40 +02:00
1026264c64
Fixed bug in assbin metadata export when no metadata are defined
2017-07-11 18:15:56 +02:00
6c6a8fe671
Added support for metadata in assbin format
2017-07-11 17:39:36 +02:00
e66dc5c9ad
Collada: add workaround to deal with polygon with holes .
2017-07-11 10:42:10 +02:00
d40b6089e8
Fix compiler warnings + one review finding.
2017-07-09 22:17:35 +02:00
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
af216ec294
X-Importer: make it deal with lines.
2017-07-07 16:34:08 +02:00
4efe7bfd41
Remove std functions deprecated by C++11.
2017-07-04 17:01:03 -07:00
ac37e4ddba
closes https://github.com/assimp/assimp/issues/1320 : check if all
...
exporters are disabled.
2017-06-28 22:13:49 +02:00
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
f30fd58494
fix review findings.,
2017-06-28 22:08:20 +02:00
27b7b44c9d
fix unittests.
2017-06-28 20:11:13 +02:00
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
a408b92279
closes https://github.com/assimp/assimp/issues/1319 : fix build without
...
3DS.
2017-06-26 22:01:15 +02:00
9ffc1a97c1
Merge pull request #1321 from pdaehne/master
...
Fixes for X3DImporter/X3DExporter
2017-06-26 21:04:25 +02:00
d8cac6eb24
Fixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet
2017-06-26 15:25:15 +02:00
afb2f3036e
OpenDDLParser: latest greatest.
2017-06-25 13:21:36 +02:00
aaa476cb10
X3D importer: Added EXPORT and IMPORT to the list of ignored XML tags
2017-06-23 11:59:14 +02:00
3c8a4a5abb
X3D Exporter: fixed missing attributes
2017-06-22 20:48:33 +02:00
855589d2a1
X3D importer: Fixed import of normals for the single index / normal per vertex case
2017-06-22 18:54:03 +02:00
6118f77d3b
X3D importer: Fixed handling of inlined files
2017-06-22 16:29:26 +02:00
840ed9dd34
X3D importer: fixed whitespace handling (issue #1202 )
2017-06-22 15:05:23 +02:00
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
735e64309b
LWO: use forward declaration in header.
2017-06-21 23:06:53 +02:00
bd2af6591f
Fix compiler warnings.
2017-06-21 23:02:46 +02:00
7e45c63901
GLTF exporter: ensure buffer view byte offsets are correctly aligned
2017-06-21 09:58:24 -07:00
439409bef2
SceneCombiner: fix the build.
2017-06-21 15:24:06 +02:00
b727420cf2
SceneCOmbiner: Fix the build.
2017-06-21 14:31:37 +02:00
612ac234c5
SceneCombiner: move header for scenecombiner to public folder.
2017-06-21 14:21:16 +02:00
d3140a68ab
Merge branch 'master' of https://github.com/assimp/assimp
2017-06-17 21:17:39 +02:00
64cbc69337
remove dead code.
2017-06-17 20:36:59 +02:00
d7e13e67c4
Utf8: integrate new lib.
2017-06-17 19:38:47 +02:00
6e1034996e
UTF8Encoding: introduce new lib.
2017-06-16 16:43:39 +02:00
79818145a7
ObjImporter: remove dead code.
2017-06-15 20:24:10 +02:00
7977ded078
Merge pull request #1300 from assimp/ply_export_test
...
ply-exporter: add unittest.
2017-06-09 23:02:30 +02:00
4974c99288
Merge remote-tracking branch 'github/master' into contrib
2017-06-08 11:01:11 +02:00
548c09271b
ply-exporter: add unittest.
2017-06-07 14:06:38 +02:00
7f8839b1f4
Merge pull request #1293 from arkeon7/PLY_refactoring
...
PLYImporter refactoring
2017-06-06 11:55:37 +02:00
19d59b630b
SpatialSort: use much easier reabability.
2017-06-06 11:37:02 +02:00
44a9f80e40
Ply importer with correction from last general trunk merge
2017-06-02 22:19:41 +02:00
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
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
9e98097aae
closes https://github.com/assimp/assimp/issues/1244 : log error for
...
overflow.
2017-05-31 21:43:41 +02:00
8c6f18ea2a
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-31 21:37:42 +02:00
1207a81b70
ObjImporter: remove dead code.
2017-05-31 21:37:16 +02:00
4dc7940ac5
ObjImporter: fix dead code.
2017-05-31 20:28:00 +02:00
e501cc17c2
Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks
2017-05-31 20:18:39 +02:00
82380084c5
ObjImporter: next try for multiple line stuff.
2017-05-31 16:36:08 +02:00
813f3b8248
ObjLoader: improve performance of obj-import.
2017-05-30 21:10:33 +02:00
c121cec68a
Obj-Importer: introduce working test for line breaks.
2017-05-29 22:00:13 +02:00
d30b1e585c
Tests how o adress this topic.
2017-05-28 22:25:06 +02:00
8cc80a3d9c
ObjImporter: fix the build.
2017-05-28 14:14:22 +02:00
3d99892b94
Opj-Importer: fix coverity finding.
2017-05-27 19:37:28 +02:00
e93355c8b4
Build: fix some compiler warnings for g++.
2017-05-26 09:18:23 +02:00
1b4cbcc6ad
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-25 22:40:36 +02:00
fb33199d99
GLTFImporter: exclude headers from build whem no_glft_importer is
...
defined.
2017-05-25 22:34:45 +02:00
b7d4b69e0d
X3DImporter: fix the build.
2017-05-24 22:35:35 +02:00
3c370c83b9
MDLImporter: remove dead code.
2017-05-24 21:18:51 +02:00
18b0316d52
X3DImporter: fix coverity finding ( missing comma ).
2017-05-24 21:15:55 +02:00
ec496a5833
X3DImporter: fix coverity finding.
2017-05-24 21:04:35 +02:00
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
febf94f6aa
Merge pull request #1212 from aoowweenn/umw_dev
...
MikuMikuDance Format
2017-05-17 12:01:46 +02:00
eba06f0c8b
Merge pull request #1275 from ab4d/master
...
Fixed build error in ObjExporter :: GetMaterialLibFileName
2017-05-17 11:34:35 +02:00
1daad40b30
Merge branch 'master' into issue-1262
2017-05-17 10:20:45 +02:00
04f908aa4c
Obj-Exporter: fix build.
2017-05-17 10:13:07 +02:00
60c54cbf59
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-17 09:25:30 +02:00
2f649833d5
LWOLoader: fix link in loader description.
2017-05-17 09:25:07 +02:00
331bbacf3d
Fixed build error in ObjExporter :: GetMaterialLibFileName
2017-05-16 22:18:47 +02:00
2b89a3cffc
Using single quote for one character parameter in find_last_of method call
2017-05-16 21:56:49 +02:00
3f68278ea0
Merge branch 'master' into issue-1262
2017-05-16 21:53:35 +02:00
a45b5cdfb5
OpenGEX: fix invalid handling with color4 token.
2017-05-16 21:45:23 +02:00
542fe31a94
closes https://github.com/assimp/assimp/issues/1262 : fix .
2017-05-16 21:07:20 +02:00
c3974512e4
Improved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl
2017-05-16 15:55:40 +02:00
04dbdca329
Revert "Creating fileName.mtl file instead of fileName.obj.mtl"
...
This reverts commit 5757980ea5
2017-05-16 15:47:57 +02:00
5757980ea5
Creating fileName.mtl file instead of fileName.obj.mtl
2017-05-16 15:34:50 +02:00
ff7624f06f
Merge pull request #1268 from VennGrayDog/b1
...
Add TokensForSearch in BlenderLoader
2017-05-15 21:37:26 +02:00
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
428a4cdd71
SpatialSort: use std::vector::clear().
2017-05-15 19:41:08 +02:00
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
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
0b34089df0
Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files.
2017-05-15 02:34:53 -04:00
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
3d05df2d3e
Fix location of config.h
2017-05-14 15:09:31 -04:00
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
c33039d682
GLTF exporter: convert animation time from ticks to seconds
2017-05-11 11:04:23 -07:00
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
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
f6a8be5bac
AMPImporter: fix coverity findings.
2017-05-10 19:34:50 +02:00
5411f769e8
STEPFile: fix coverity findings.
2017-05-10 18:50:51 +02:00
d36fbfbb8b
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-10 18:30:36 +02:00
0300574b8b
AMFImporter: fix coverity findings.
2017-05-10 18:29:42 +02:00
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
9ef1a4fae0
X3D: fix coverity findings.
2017-05-09 22:54:04 +02:00
cfb867b5e7
Fix config.h not being found during install
2017-05-09 21:51:49 +02:00
eb828a3b71
X3DImporter: fix coverity findings.
2017-05-09 21:35:21 +02:00
4a5c483ac4
AMFImporter: make test against nullptr dereferencing meaningful.
2017-05-09 21:03:20 +02:00
f77e27ca19
ColladaExporter: remove self assignment.
2017-05-09 20:59:01 +02:00
03d97b23ec
Coverity: fix finding in COBLoader.
2017-05-09 20:15:30 +02:00
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
36f4fb8826
GLTF exporter: ensure animation accessors have same count
2017-05-08 14:45:26 -07:00
186629b372
SpatialSort: use std::vector::resize( 0 ) to improve readability.
2017-05-08 21:57:08 +02:00
65653edf88
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-08 21:29:07 +02:00
5289954e27
Fix review findings.
2017-05-06 20:57:17 +02:00
98100d8cab
Blender-Importer: fix coverity findings.
2017-05-06 11:14:04 +02:00
39e048dea6
Merge pull request #1254 from samitc/master
...
Improve performance of obj line break
2017-05-04 19:53:51 +02:00
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
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
dd1d10407e
make array non static to support multithreaded
2017-05-01 16:54:07 +03:00
8b4e066ca5
Improve performance of obj line break
2017-05-01 16:32:49 +03:00
0069552183
Fix static init ordering bug in OpenGEX importer
2017-05-01 15:11:22 +02:00
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
aff391c681
Fixed no member named 'atop' in global namespace issue for Android NDK compilation
2017-04-27 17:15:03 +09:00
8445db2cd9
Set UVW index material properties for OBJ files.
2017-04-21 01:09:26 -07:00
b64882f4c7
Fix spelling
2017-04-11 16:33:13 -04:00
9fc7f72b55
fix line breakes in obj files
2017-04-11 17:16:18 +03:00
0e3956caf1
Compilation fix: Removing the vector4 headers from code/CMakeLists.txt
2017-04-08 23:25:39 +02:00
2825d2daf8
Merge branch 'master' of https://github.com/assimp/assimp
2017-04-07 17:50:20 +02:00
38fab5ae8e
doc updatedoc update
2017-04-07 17:46:53 +02:00
8f3aaa88f9
Fixed compiler error on clang 4.0 running on OSX
...
glTFExporter.cpp:585:35: error: ordered comparison between pointer and zero ('aiVector3D *'
(aka 'aiVector3t<float> *') and 'int')
if(comp_allow && (aim->mNormals > 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
2017-04-03 11:07:43 +02:00
0f6782df27
Fix PDB file installation in RelWithDebInfo configuration
2017-04-01 16:03:01 +02:00
6d71e4d5d7
Config.h.in: fix typo.
2017-03-29 21:08:40 +02:00
1ab85f16ff
Merge pull request #1217 from Kai-W/master
...
Added ComponentType Unsigned int and Error handling
2017-03-28 17:06:06 +02:00
8accf5b386
3MF: reformattings.
2017-03-28 00:35:56 +02:00
6c73cc8aff
Added ComponentType Unsigned int and Error handling
...
Part of GLTF 2.0 changes
2017-03-27 17:22:49 +02:00
7bd3242563
comment out override specifier
2017-03-27 22:49:58 +08:00
51dae22828
merge master and adjust assimp/DefaultIOSystem.h
2017-03-27 22:35:19 +08:00
8cd0d3b3c7
change std::make_unique to mmd::make_unique
2017-03-27 22:16:19 +08:00
ccf2bce2b0
correct offset matrix
2017-03-24 15:45:50 +08:00
59b48fb960
finish skin controller
2017-03-24 14:39:34 +08:00
968612fea1
testing2
2017-03-24 12:04:40 +08:00
314bb451bb
testing weights, still strange
2017-03-23 16:30:01 +08:00
f10f2f5814
Almost finish vertex weghts
2017-03-23 04:33:53 +08:00
1c525a9365
Merge pull request #1208 from terziman/master
...
Added parameters to IFC importer to control tessellation
2017-03-22 20:08:21 +01:00
845d206959
Fill in mParent for each node in Assbin Loader
2017-03-22 21:11:17 +08:00
5bf974ae3b
keep writing dae skinning
2017-03-22 17:06:55 +08:00
e5a3038abd
try to fill in vertex weights to dae exportor
2017-03-21 16:21:49 +08:00
d1c7d905e8
Fixed infinite loop on non-manifold geometry
...
Geometry that had strange non-manifold faces could cause the normal
calculation to enter an infinite loop. Instead we now correctly detect
which faces to scan over.
2017-03-19 13:46:23 -07:00
209e972762
Fixed faceted normals in SIB importer.
2017-03-18 14:52:48 -07:00
bf2e2f7537
Extended support for tessellation parameter to more IFC shapes
2017-03-17 14:55:18 +01:00
d4ead31c18
Merge remote-tracking branch 'github/master' into contrib
2017-03-17 12:13:52 +01:00
9ef234b842
Added parameter to control cylindrical shapes tessellation
...
+ renamed smoothing angle parameter for better user understanding
2017-03-17 11:58:50 +01:00
fff0e886a1
Fixed bug in IFC openings when curmesh.vertcnt is empty
2017-03-17 11:53:36 +01:00
0eecff74d8
correct node hierarchy
2017-03-16 01:25:53 +08:00
2cd6c3d755
Closes https://github.com/assimp/assimp/issues/1128 : do not use non
...
verbose format flag for import.
2017-03-14 19:01:41 +01:00
0231af4343
skeleton almost done
2017-03-14 02:01:26 +08:00
bb7f387bcf
Merge branch 'master' of https://github.com/assimp/assimp
2017-03-11 22:13:48 +01:00
1c6145b39e
Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api
2017-03-11 18:19:36 +01:00
b47bfeb0d7
StringUtils: add the right missing header.
2017-03-11 17:25:34 +01:00
6179e22749
StringUtils: add missing include for VS2012 & 2013
2017-03-11 11:34:23 +01:00
8bc183182c
Added new option to IFC importer to control tessellation angle
...
+ removed unused IFC option
2017-03-10 14:42:17 +01:00
2d3dd1d40f
use SkeletonMeshBuilder to show bone positions.
2017-03-10 17:15:01 +08:00
b725d7dbf5
Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes
2017-03-08 10:27:57 +01:00
3bd9efa82c
Cleanup_includes: fix linux build.
2017-03-08 09:55:44 +01:00
c0c480a4cb
fixup! merge master and mv FindDevIL to cmake-modules
2017-03-05 23:36:36 +08:00
83db3fc084
fixup! remove dependency of ICU library
2017-03-05 23:14:21 +08:00
7226d73682
merge master and mv FindDevIL to cmake-modules
2017-03-05 23:07:06 +08:00
34906071fc
remove dependency of ICU library
2017-03-05 22:59:53 +08:00
8d27945619
Merge branch 'master' into cleanup_includes
2017-03-05 15:15:29 +01:00
e6dcad384a
Fix missing includes.
2017-03-05 15:05:40 +01:00
0c0ca403b5
Convert to OpenGL space by three processes.
2017-03-05 20:40:41 +08:00
7a25f5ac25
finish UV texture
2017-03-02 23:16:29 +08:00
ffc95162ec
fix for FreeBSD
2017-03-01 16:30:03 +09:00
e89c29a9cc
finish vertex
2017-03-01 13:52:46 +08:00
a38b2fb10f
Merge pull request #1191 from Lugdunum3D/feature-importers-whitelist
...
Allow to enable importers in a whitelist manner
2017-03-01 00:34:10 +01:00
9a0a74ef1f
Merge pull request #1190 from Lugdunum3D/fix-buildsystem-minizip
...
Fix buildsystem minizip
2017-03-01 00:15:12 +01:00
574c192575
Merge pull request #1186 from astillich/ase_cface
...
Fixed parsing ASE MESH_CFACE
2017-03-01 00:12:12 +01:00
f312d8709e
More cleanup
2017-02-28 16:37:07 +01:00
5dd1bb9d6c
Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/
2017-02-28 11:44:04 +09:00
d77989088c
Allow to enable importers in a whitelist manner
2017-02-28 11:42:53 +09:00
4495162f5f
Fix new lines problem
2017-02-27 18:34:04 -05:00
7a47f1f8f7
Issue-1183: add stp to the list of supported extensions for step-files.
2017-02-27 20:11:59 +01:00
e80d3aa9d4
finish mesh creation
2017-02-27 21:02:58 +08:00
0700dfe711
Fixed parsing ASE MESH_CFACE
2017-02-25 23:30:41 +01:00
4045466f73
pass through but panic
2017-02-24 08:35:15 +08:00
5e2c846ca0
Remove unused header.
2017-02-22 17:22:23 +01:00
ef540f46a3
Remove unused headers.
2017-02-22 17:20:26 +01:00
a75fa44bde
PLY: prepare bugfix by adding missing unittest.
2017-02-11 14:19:34 +01:00
615bdb27d9
Closes https://github.com/assimp/assimp/issues/1102 : update Version.cpp
2017-02-11 13:49:48 +01:00
6ed1f7570e
Merge branch 'master' of https://github.com/assimp/assimp
2017-02-05 19:30:11 +01:00
31bb9f7ba6
Obj: fix code review findings.
2017-02-04 18:32:04 +01:00
11e2ca173d
Fix the build.
2017-02-04 18:15:50 +01:00
692fb216f7
closes https://github.com/assimp/assimp/issues/809 : add vertex color
...
export support.
2017-02-04 14:51:23 +01:00
f9fa95a7c2
Obj-Importer: fix crash when updating the current mat-index: use correct
...
index.
2017-02-01 20:11:12 +01:00
bfb6eb317c
Merge pull request #1160 from NolaDonato/materialindex
...
OBJParser: set material index when changing current material
2017-02-01 18:42:16 +01:00
e28b5422e0
OBJ: check for null mesh before updating material index
...
Sometimes the current mesh is null, should check before updating the material index
Submitted by: Nola Donato nola.donato@samsung.com
2017-01-31 16:40:04 -08:00
fc4243a08f
OBJParser: set material index when changing current material
...
When a new material is parsed from the material library, the name of the current material is set but the old material index remains. This leaves an incorrect material index in the current mesh causing textures to not be associated with the right mesh. This patch updates the material index when changing the material name.
submitted by: Nola Donato nola.donato@samsung.com
2017-01-30 20:32:37 -08:00
df5fc5f68d
OBJParser: Support spaces in texture file names
...
This patch allows embedded spaces in texture filenames found in MTL files. It only affects the OBJ parser.
Submitted by: Nola Donato nola.donato@samsung.com
2017-01-30 20:27:35 -08:00
28a78ca460
Merge pull request #1156 from elect86/patch-7
...
Update ColladaParser.cpp
2017-01-28 13:28:47 +01:00
16c50df071
Merge pull request #1154 from Kvalme/master
...
Fix for COLLADA export texture mapping #1084
2017-01-28 13:28:31 +01:00
ca47232101
Update ColladaParser.cpp
...
Fixed indent
2017-01-28 11:54:11 +01:00
c3c637be37
Update ColladaParser.cpp
2017-01-28 08:02:02 +01:00
36e53b75fa
Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist>
2017-01-27 14:29:18 +03:00
0434f5a5ff
Update ColladaParser.cpp
2017-01-26 17:29:31 +01:00
85e2788e50
Update ColladaParser.cpp
2017-01-26 17:28:39 +01:00
3323d42ad6
Update PlyLoader.cpp
2017-01-20 19:30:36 +01:00
821e9fb0b8
Update PlyLoader.cpp
2017-01-19 22:43:38 +01:00
57975cb007
Merge pull request #1145 from elect86/patch-3
...
typo
2017-01-19 18:54:06 +01:00
82b1769759
Fix new call.
2017-01-19 13:38:06 +01:00
35b95ba710
API: Fix build
2017-01-19 11:41:43 +01:00
ebd04041ab
Merge branch 'master' of https://github.com/assimp/assimp
2017-01-19 11:19:02 +01:00
f121e2eb66
Fixes https://github.com/assimp/assimp/issues/1143 : fix build.
2017-01-19 11:18:33 +01:00
11e1901922
typo
2017-01-18 21:56:33 +01:00
45eb13719e
fixes https://github.com/assimp/assimp/issues/1141 : fix typo.
2017-01-17 22:05:45 +01:00
54757a47a8
Update PlyLoader.cpp
...
Sorry, I was wrong
2017-01-16 21:09:38 +01:00
f14e433dd9
Update PlyLoader.cpp
...
Typo
2017-01-16 21:06:05 +01:00
f438652df8
Update PlyLoader.cpp
2017-01-16 21:04:24 +01:00
342824303c
Update PlyLoader.cpp
2017-01-16 21:01:49 +01:00
f16387e5a7
Merge pull request #1135 from hblasins/objExtension
...
Added support for parameters Ni and Tf in OBJ/MTL file format.
2017-01-16 20:22:41 +01:00
17cae8ac5a
Added support for parameters Ni and Tf in OBJ/MTL file format.
2017-01-12 17:11:17 -08:00
9621dff027
Morph animation support for collada
2017-01-12 13:41:32 +02:00
a97a4fb03b
Merge pull request #1131 from Sibras/master
...
FBX: Fix light and camera transformations and add some missing properties.
2017-01-10 17:48:35 +01:00
6483b10997
{D3MF} Move #ifndefs before #includes
2017-01-10 09:53:11 -05:00
2f2fe92b62
FBX: Add additional material properties.
...
Currently there isnt a AI_MATKEY_DISPLACEMENTSCALING define but fbx supports the value so for the moment it is just manually specified.
2017-01-09 17:03:38 +11:00
5be2351dc6
FBX: Correct camera position and clip planes.
...
Fbx cameras are stored in the scene graph as well as having separate camera properties.
The separate camera properties have a camera position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
camera being transformed twice. Since the scene graph contains all the relevant
transformations the camera position and direction can just use default values. Fbx
specifies cameras along the positive x axis so the default camera values have a up and
direction set accordingly.
Fixes : #807 #643
2017-01-09 17:03:32 +11:00
b34a552fb7
FBX: Add correct light locations and falloff values.
...
Fbx lights are stored in the scene graph as well as having separate light properties.
The separate light properties have a light position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
light being transformed twice. Since the scene graph contains all the relevant
transformations the light position and direction can just use default values. Fbx
specifies lights along the negative y axis so the default light values have a up and
direction set accordingly.
The DecayStart value specifies the distance from the light that the light intensity
will drop to half. Using the default assimp falloff equation of f=1/c+lr+qr^2 then
the falloff coefficients can be calculated for either c,l or q accordingly by setting
r=DecayStart and f=0.5.
Fixes #851
2017-01-09 17:03:25 +11:00
c3d40810b5
Cleared majority of codepage warnings in Visual Studio 14.
2017-01-09 00:41:10 +08:00
dfa3409de9
Blender: add missing constructors.
2017-01-05 20:23:02 +01:00
58af9efdc9
FBX: fix compiler warning: remove unused local function.
2016-12-31 16:09:17 +01:00
6dfff37d8f
SubDivision: fix compiler warning: unused variable.
2016-12-31 16:07:11 +01:00
b934331985
closes https://github.com/assimp/assimp/issues/1111 : add warning when
...
detecting invalid mat definition.
2016-12-19 20:44:00 +01:00
bd0449ea79
closes assimp/assimp/issues/1101: copy aiTexture type declaration instead
...
of using decltype for declaration to fix iOS build.
2016-12-14 21:42:01 +01:00
5caa232b15
Merge pull request #1109 from assimp/issue_899
...
closes assimp/assimp/issues/899: fix parsing of texture name.
2016-12-12 23:42:24 +01:00
df03c657bf
Merge pull request #1106 from elect86/master
...
OBJ, added the index to handle clamp option for each cubemap texture
2016-12-12 21:22:56 +01:00
859d15d3a0
closes assimp/assimp/issues/899: fix parsing of texture name.
2016-12-12 21:22:03 +01:00
5127e18da6
Update PlyParser.h
...
Typo
2016-12-11 13:01:26 +01:00
b1d5390413
Update ObjFileImporter.cpp
2016-12-09 19:31:07 +01:00
83896f18b3
Update ObjFileImporter.h
2016-12-09 19:27:01 +01:00
b1e89e3636
closes https://github.com/assimp/assimp/issues/1098 : add license info.
2016-12-08 20:07:56 +01:00
d24ba9a4bb
Merge pull request #1099 from asmaloney/warning_fixes
...
Fixes two type warnings and a missing case option
2016-12-08 17:49:36 +01:00
0c7aac02eb
Fixes spelling in comments
2016-12-07 21:31:51 -05:00
3c5f1578c2
Fixes two type warnings and a missing case option
2016-12-07 20:30:45 -05:00
a3a1c82380
Merge pull request #1087 from elect86/patch-4
...
Update ObjFileMtlImporter.cpp
2016-12-07 20:16:57 +01:00
ff73821cea
Update ObjFileMtlImporter.cpp
2016-12-07 19:52:03 +01:00
8929760b3e
Add better MinGW support for IFCReaderGen big objects
2016-12-05 12:57:05 +02:00
f9cce7f59c
MinGW __stat64 support depends on MSVCRT version
2016-12-05 12:33:48 +02:00
17fc3eea8f
Do not build exporter if its importer is not built
2016-12-05 11:12:46 +02:00
769805efd0
Merge branch 'master' into issue_1089
2016-12-02 14:31:18 +01:00
dcfc696e86
FBX: woraround for issue 1089.
2016-12-02 11:32:34 +01:00
c46ac37c9b
Merge pull request #1085 from elect86/patch-3
...
Update ObjFileParser.cpp
2016-12-01 17:56:20 +01:00
c80777f13f
Enable SIBImport test.
2016-11-30 17:49:22 +01:00
12ea506504
Enable unittest for apacity bug for dae files.
2016-11-30 15:05:06 +01:00
c2deb3e15f
BaseIMporter: fix review findings.
2016-11-30 15:03:32 +01:00
a80d7346d8
AMFImporter: fix some review findings.
2016-11-30 15:03:02 +01:00
f2817587ab
AMFImporter: use correct unique token to identify schema for AMF-assets.
2016-11-29 19:50:40 +01:00
43e1cae2ea
Fix appveyor build: disable bugger mingw config.
2016-11-28 10:40:10 +01:00
a2c82051d4
Update ObjFileMtlImporter.cpp
...
Fixed grammar
2016-11-27 22:44:03 +01:00
fe7863d22f
Update ObjFileParser.cpp
...
Fixed error message
2016-11-27 20:32:59 +01:00
181f78687f
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-27 16:44:03 +01:00
8272514b83
ObjImporter: use pre increment as a micro optimization.
2016-11-27 16:43:25 +01:00
8bfe465d03
Merge pull request #1083 from jaredmulconry/implementation_warning_fix
...
Fixed warnings on MSVC14 x64 (Issue #1065 )
2016-11-27 16:40:45 +01:00
1d9f91946f
Merge pull request #1080 from johnmaf/bugfix/collada-transparency
...
Properly export COLLADA <transparency> value
2016-11-27 16:30:59 +01:00
cf151b77d8
Fixed build warnings on MSVC14 x64 in the XGL loader.
2016-11-27 16:03:25 +11:00
7415289649
Fixed build warnings on MSVC14 x64 in X file importer.
2016-11-27 16:02:21 +11:00
cbfbf2a256
Fixed build warnings on MSVC14 x64 in the X3D format sources.
2016-11-27 15:54:22 +11:00
f22d78a3d3
Fixed build warnings on MSVC14 x64 in Unreal importer.
2016-11-27 14:36:45 +11:00
39f54bf183
Fixed build warnings on MSVC14 x64 in Target Animation source.
2016-11-27 14:35:49 +11:00
387afcf74f
Fixed build warnings on MSVC14 x64 in subdivision routine.
2016-11-27 13:37:32 +11:00
58e0d8c261
Fixed build warnings on MSVC14 x64 in the STL format sources.
2016-11-27 13:32:44 +11:00
f2e2aad647
Fixed build warnings on MSVC14 x64 in spacial sort.
2016-11-27 13:28:40 +11:00
20318811ff
Fixed build warnings on MSVC14 x64 in the skeleton mesh builder.
2016-11-27 13:17:02 +11:00
98e7eb476d
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
...
# Conflicts:
# code/ObjFileImporter.cpp
2016-11-27 13:00:33 +11:00
578ed3f5d0
Properly export COLLADA <transparency> value
2016-11-25 12:09:49 -05:00
1541db01cc
Remove scaling of specular exponent in OBJFileImporter.cpp
2016-11-25 10:56:11 -05:00
f1254639d0
Merge pull request #1075 from Chainsawkitten/MinGW
...
Fix some MinGW warnings
2016-11-24 21:34:56 +01:00
d82fd0d750
closes https://github.com/assimp/assimp/issues/1076 : use ai_assert instead
...
of assert.
2016-11-24 21:15:07 +01:00
347c09c539
Put back unused line (in comments)
2016-11-24 15:15:17 +01:00
bde2b466be
Remove unnecessary semicolon
2016-11-24 14:53:33 +01:00
bd6f94b926
Remove unused variable
2016-11-24 14:15:13 +01:00
3b49dfe93e
Comment out unused variables
2016-11-24 14:10:24 +01:00
30cd60ff82
Remove unnecessary semicolons
2016-11-24 13:26:18 +01:00
83e472cef3
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-23 20:20:45 +01:00
d87400b76a
Fix some findings in animation header.
2016-11-23 20:20:11 +01:00
f206249fbf
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
...
# Conflicts:
# code/AMFImporter_Postprocess.cpp
# code/FBXConverter.cpp
# code/IFCLoader.cpp
# code/NDOLoader.cpp
# code/glTFAsset.inl
2016-11-23 22:24:04 +11:00
ba2f377b52
Fix coverity findings.
2016-11-22 22:03:31 +01:00
61e974f767
Merge pull request #1074 from assimp/testsuite_aiMetadata
...
Ue new alloc semantic when using aiMetadata + increase test coverage.
2016-11-22 21:20:02 +01:00
f45aeca3f6
Fix build: use ai_assert instead of assert.
2016-11-22 21:17:47 +01:00
a446d75250
Ue new alloc semantic when using aiMetadata + increase test coverage.
2016-11-22 21:06:14 +01:00
c5e3058ab3
Fix coverity findings.
2016-11-22 10:22:15 +01:00
566aa1ae00
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-21 23:55:14 +01:00
c61146f52e
Add unittest fixure for aiMetadata.
2016-11-21 23:54:39 +01:00
9e07701f3e
Merge branch 'master' into coverity_scan
2016-11-21 10:18:17 +01:00
eb6390a639
Merge pull request #1071 from jaredmulconry/master
...
AMF Postprocessed Metadata given type bool regardless of original type
2016-11-20 17:52:47 +01:00
b6fb1f3c05
Update STLLoader.cpp
...
If `faceVertexCounter` does not start equal 3, then at line 291 you will get a warning
2016-11-20 15:14:33 +01:00
ff31abf57c
Fixed build warnings on MSVC14 x64 in the scene combiner.
2016-11-20 14:07:24 +11:00
439b4861c8
Fixed build warnings on MSVC14 x64 in the SIB format sources.
2016-11-20 14:06:56 +11:00
655a470fc9
Fixed build warnings on MSVC14 x64 in the Quake 3 format sources.
2016-11-20 13:30:20 +11:00
98aea657ff
Fixed build warnings on MSVC14 x64 in some helpers.
2016-11-20 13:18:11 +11:00
f81e28f320
Fixed build warnings on MSVC14 x64 in the pre-transform vertices post-process.
2016-11-20 13:06:50 +11:00
3e08a47d4f
Fixed build warnings on MSVC14 x64 in some scene optimisations.
2016-11-20 13:04:56 +11:00
48e542d8d4
Fixed build warnings on MSVC14 x64 in the OpenGEX format sources.
2016-11-20 13:02:26 +11:00
4a63f1759c
Fixed build warnings on MSVC14 x64 in the Ogre format sources.
2016-11-20 12:49:33 +11:00
0c13322089
Fixed build warnings on MSVC14 x64 in the Obj format sources.
2016-11-20 12:29:26 +11:00
8478b03f22
Fixed build warnings on MSVC14 x64 in the NDO format sources.
2016-11-20 12:27:04 +11:00
2946a7349b
Fixed build warnings on MSVC14 x64 in the MS3D format sources.
2016-11-20 02:40:36 +11:00
923b014472
Fixed build warnings on MSVC14 x64 in the MD3 and MD5 format sources.
2016-11-20 02:40:18 +11:00
60cd4605eb
Fixed build warnings on MSVC14 x64 in the Material System source.
2016-11-20 02:11:01 +11:00
335003a5a3
Fixed build warnings on MSVC14 x64 in the LWS format sources.
2016-11-20 02:03:53 +11:00
2c93e29dcc
Fixed build warnings on MSVC14 x64 in the LWO format sources.
2016-11-20 02:01:57 +11:00
4df18f93ea
Fixed build warnings on MSVC14 x64 in the limit bone weights post-process.
2016-11-20 01:53:47 +11:00
1e2c0279b0
Fixed build warnings on MSVC14 x64 in the IRR format sources.
2016-11-20 01:52:04 +11:00
c7efb50ad1
Fixed build warnings on MSVC14 x64 in the core Importer.
2016-11-20 01:36:33 +11:00
5f098b2f94
Fixed build warnings on MSVC14 x64 in the IFC format sources.
2016-11-20 01:13:55 +11:00
d9b0449e83
Fixed build warnings on MSVC14 x64 in the glTF format sources. One warning
...
yet to be resolved.
2016-11-20 00:18:29 +11:00
2ac9b0ce45
Fixed build warnings on MSVC14 x64 in the FBX format sources.
2016-11-19 23:50:03 +11:00
acad22cc1e
Fixed build warnings on MSVC14 x64 in the DXF format sources.
2016-11-19 03:53:28 +11:00
0469a5c2e4
Fixed build warnings on MSVC14 x64 in the debone process.
2016-11-19 03:45:25 +11:00
43ef4ec715
Fixed build warnings on MSVC14 x64 in the D3MF format sources.
2016-11-19 03:34:39 +11:00
9a323d6de3
Fixed build warnings on MSVC14 x64 in the CSM loader.
2016-11-19 03:29:47 +11:00
d16b8953b5
Fixed build warnings on MSVC14 x64 in the Collada exporter.
2016-11-19 03:24:55 +11:00
4b6c69c4f8
Fixed an incorrect cast introduced in an earlier commit.
2016-11-19 03:17:39 +11:00
128c27e89c
Fixed build warnings on MSVC14 x64 in the Collada loader.
2016-11-19 03:16:06 +11:00
3b63e4af54
Fixed build warnings on MSVC14 x64 in the Collada parser.
2016-11-19 02:42:51 +11:00
2866da1262
Fixed build warnings on MSVC14 x64 in the COB format sources.
2016-11-19 02:35:30 +11:00
df6707a262
Fixed build warnings on MSVC14 x64 in the BVH format sources.
2016-11-19 02:33:58 +11:00
e4d43aa51a
Fixed a bug in the AMF Importer Postprocessing where metadata would be
...
incorrectly recorded as having type bool for all entries.
2016-11-19 02:07:32 +11:00
06beb50391
Fixed build warnings on MSVC14 x64 in the Blender format sources, as well as
...
build warnings in tests.
2016-11-19 01:54:27 +11:00
bf5fc593eb
Fixed build warnings on MSVC14 x64 in the B3D format sources.
2016-11-19 01:21:59 +11:00
a2dadbbe52
Fixed build warnings on MSVC14 x64 in the AssBin sources.
2016-11-19 00:39:11 +11:00
6ba2dc4db3
Fixed build warnings on MSVC14 x64 in the postprocessing of AMF format.
2016-11-19 00:31:32 +11:00
505928cc02
Fixed build warnings on MSVC14 x64 in the 3DS format sources.
2016-11-19 00:20:53 +11:00
cae8a172c3
Merge branch 'master' into coverity_scan
2016-11-18 11:38:45 +01:00
a9c5b6f1be
Ensure that filelist for assimp lib is not empty for coveralls.
2016-11-17 19:57:24 +01:00
302b8044c6
Merge pull request #1064 from snowzurfer/master
...
Fix obj .mtl file loading
2016-11-14 20:17:28 +01:00
eceb61b854
Fixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set
...
for the 1 and 2-suffixed versions introduced in
commit 0a25b076b8
2016-11-14 22:52:29 +11:00
ce4f696312
Revert "Make assimp build cherry-picked importers in CMake"
...
This reverts commit 70d5bb8c7b
2016-11-12 02:10:51 +00:00
70d5bb8c7b
Make assimp build cherry-picked importers in CMake
...
Modify assimp's cmake to exclude the build of all the importers
by default; the user has then to manually select the ones needed
by setting the relative option.
From the explanation as written in the CMakeLists itself:
---
This option allows to select whether to build all the importers and then
manually select which ones not to build (old behaviour), or if to
exclude all importers from build and manually select the ones to actually
build.
By default, exclude all importers and manually select which ones to use.
To have all importers excluded, simply do not set this option in the parent
CmakeLists. Then, set the option for the importer(s) needed in the parent
CMakeLists, e.g.:
OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" TRUE)
To have assimp build all the importers, set the option to true, then manually
exclude which importers you don't need, e.g.:
OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" FALSE)
NOTE: In order to use this method of exclusion, the tools build must be disabled;
their code references certain importers/exporters which would be excluded.
If you need the tools, either manually add the importers/exporters the code
references (you will see linkage errors), or just enable the build of all the
importers as explained above.
---
As mentioned there, set the main CMakeLists not to build the tools and
the tests by default, since they use certain exporters and importers
which, with this method, are not necessarily used/built.
2016-11-12 02:04:05 +00:00
fdd01bda83
BatchImporter: make validation configurable and add unittest for class.
2016-11-12 02:04:05 +00:00
631eef49c3
BatchImporter: make validation configurable and add unittest for class.
2016-11-11 12:49:05 +01:00
cf7059f074
Fix obj .mtl file loading
...
Fix the obj file loader by adding a new method which allows
a name to be read considering the space in the middle between two
words and use that for parsing the "mtlib" line in the .obj file
parsing method.
Before, the method used in the obj parsing function would have
returned the string "mtlib NAME_OF_MTL" instead of "mtlib" only,
which resulted in the .mtl file being never parsed.
2016-11-10 23:12:36 +00:00
c5d6ac2c30
ObjParser: remove deprecated code.
2016-11-10 21:39:32 +01:00
888ea72f20
Merge pull request #1061 from assimp/optimized_faces_in_obj
...
ObjImporter: remove unnecessary allocations of std::vector
2016-11-09 20:52:22 +01:00
c07aee21b7
Fix build
2016-11-09 20:18:26 +01:00
568b459e24
Fix review findings.
2016-11-09 20:16:45 +01:00
ae956044aa
ObjImporter: remove unnecessary allocations of std::vector in obj-specific
...
face.
2016-11-09 20:09:45 +01:00
1d08c9e2e2
Merge pull request #1060 from assimp/issue_1059
...
Issue 1059
2016-11-08 21:31:47 +01:00
9f96126362
ObjParser: remove dead code.
2016-11-08 20:35:21 +01:00
5ff1c39e02
Obj-Parser: Fix performance issue.
2016-11-08 20:34:55 +01:00
1aafe6287c
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-07 17:20:27 +01:00
8ffd94937e
Fix BlenderDNA for clang cross compiler.
2016-11-07 17:19:49 +01:00
d4223d1fce
closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057
2016-11-06 19:36:37 +01:00
cc7b7723c1
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-05 18:41:52 +01:00
499886f89e
ScenePreprocessor: fix invalid index counter.
2016-11-05 18:41:19 +01:00
dcb7478785
Update FBXConverter.cpp
2016-11-04 09:20:04 +01:00
a074ca58b3
Keys interpolation fix
...
In line 3073 there was an unproper scope of cast to double.
2016-11-04 08:48:14 +01:00
dfaea27dfc
MaterialSystem: fix some findings.
2016-11-03 23:29:03 +01:00
c849e0108d
Merge pull request #1055 from assimp/issue_957
...
Fix compiler warnings related to issue 957.
2016-11-03 19:11:56 +01:00
02e038bbb6
Fix compiler warnings related to issue 957.
2016-11-03 18:37:02 +01:00
b30dc8ffc9
Fixes compile issue for 3ds exporter
...
... when you have disabled the 3ds importer
2016-11-02 19:54:53 +01:00
3e05d13827
Merge pull request #1048 from tomacd/keep_materials_names
...
Keep original materials names in RemoveRedundantMaterials, ColladaExporter
2016-10-31 09:42:45 +01:00
fcac614ad0
Blender: fix compiler warning: FAIL already defined.
2016-10-30 19:21:38 +01:00
810fc405a8
Fix build.
2016-10-30 09:06:45 +01:00
293654fe7c
Fix unittest.
2016-10-30 08:55:11 +01:00
b9261f01a3
Obj-Stream-Handling: fix compiler-errors and warnings.
2016-10-29 21:41:24 +02:00
186f3f091f
Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_obj_stream_handling
2016-10-29 20:07:53 +02:00
b13c30f50e
Obj: Fix some small issues
2016-10-29 19:07:30 +02:00
8e8757f800
Keep original materials names after RemoveRedundant materials process and export to collada
2016-10-27 19:23:43 +02:00
949a27a743
New streaming interface: fix build.
2016-10-22 23:34:56 +02:00
cbe2e9af49
Merge branch 'master' into new_obj_stream_handling
2016-10-22 21:04:02 +02:00
d3a3bd9c12
BUgfixes regarding filepos setupBUgfixes regarding filepos setup.
2016-10-22 21:03:11 +02:00
33e370a8b7
Obj-Stream-Handling: fix readin of linewise import.
2016-10-21 21:14:35 +02:00
1724cc9e66
Remove redundant file.
2016-10-21 19:44:31 +02:00
50803b897c
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-21 19:43:56 +02:00
fe0cfc52bc
Q3BSP-Loader: reformat include.
2016-10-20 22:25:39 +02:00
af54cb8a29
Q3BSP: fix license dates.
2016-10-20 17:04:37 +02:00
6a31e3528e
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-20 16:43:38 +02:00
91e833056e
Q3BSP-Importer: remove commented code.
2016-10-20 16:42:00 +02:00
b0f09ee6e2
Merge pull request #903 from dontbmh/upstream
...
fix strncpy not null terminated string
2016-10-20 16:18:30 +02:00
74ab4afd01
Merge pull request #1042 from VeganPower/Fix_988
...
Added support for 64 bit version header introduced in FbxSdk2016
2016-10-19 16:03:53 +02:00
bac28061ea
3MF: fix nullptr access.
2016-10-18 21:16:44 +02:00
acd2802f22
Check for std::string::npos before applying std::string::substr
2016-10-18 10:48:47 -04:00
a54e42cb5a
Some more fixes.
2016-10-18 14:02:58 +02:00
4b15dfd9af
Fix OBJ parser mtllib statement parsing bug.
...
Since `getName` returns the whole line (including spaces) parse out the
first word for comparison.
2016-10-17 18:48:04 -04:00
5cd16a0aa6
Merge pull request #1034 from ascandal/feature/gltf-compact-skins
...
glTF compact skins
2016-10-17 21:45:50 +02:00
ea0424de18
Merge pull request #1037 from ystreet/cfileio-leaks
...
cfileio: fix leaks by not closing files in the destructor
2016-10-17 17:29:38 +02:00
862dfd5a05
Merge pull request #1032 from ashdnazg/master
...
use cmath and C++ (std::) versions of math functions
2016-10-17 17:26:32 +02:00
cbcaa107eb
cfileio: fix leaks by not closing files in the destructor
...
Numerous importers rely on the default C++ IOSystem implementation
having the destructor close the file for them. The C IOSystem wrapper
wasn't and instead assumed that the Close() method was going to be
called.
This brings the C IOSystem wrapper in line with the default C++ IOSystem
by having the destructor close the file.
2016-10-18 00:35:56 +11:00
09ad67f469
3MF-Importer: remove unused variable.
2016-10-16 17:14:22 +02:00
6ce2a37b82
merge upstream/master and fix conflicts
2016-10-15 18:12:02 -07:00
fcf2d6357e
check if bones exist before creating skin
2016-10-15 17:21:55 -07:00
5cb4df80ad
C++11-combat: hopefully the last std::to_string to replace.
2016-10-15 21:45:58 +02:00
46d78f57d5
OpenGEXImporter: fix compiler warning.
2016-10-15 21:45:09 +02:00
7681089abc
C++11-Combat: last replacements of std::to_string.
2016-10-15 21:30:02 +02:00
e0dde73018
C++11-combat: replace more std::to_string by assimp-specific to_string
2016-10-15 21:25:16 +02:00
b90669c45e
C++11: Replace std::to_string by assimp-specific implementation.
2016-10-15 20:36:51 +02:00
a84bf869c2
replace more math.h functions occurences with std::
2016-10-15 12:05:57 +03:00
3b6ffc3ef5
fix mingw build (mingw supports stat64 nowadays)
2016-10-15 03:52:50 +03:00
25cda401c5
use cmath and C++ (std::) versions of functions
2016-10-15 03:29:45 +03:00
9c4bb1c9bc
find the correct index in jointNames
2016-10-14 15:47:21 -07:00
2505f02263
Added support for 64 bit version header introduced in FbxSdk2016
2016-10-14 17:47:10 +01:00
1c03aebfb8
test combining skins
2016-10-13 19:49:59 -07:00
084a6f6415
Obj-Streaming: add new io-stream for line-wise cached reading + first
...
bugfixes.
2016-10-12 15:30:04 +02:00
dc1e11c8be
added some comments
2016-10-11 15:33:52 -07:00
57a00d5faa
find skeleton root joint and only allow four joint weights per vertex
2016-10-11 15:28:04 -07:00
ccf32aaf57
Merge pull request #1029 from samitc/master
...
fix bug when reading strings in quote in MD5 models
2016-10-11 13:48:24 +02:00
905e48a35c
Buffered stream API for big files: add next try of a prototype.^
2016-10-11 12:29:40 +02:00
96a64a353a
fix bug when reading strings in quote in MD5 models
2016-10-11 13:04:41 +03:00
6a0d4bac35
Merge pull request #1026 from ascandal/feature/gltf-skins-animation
...
glTF skinning animation
2016-10-10 22:20:10 +02:00
1c78f1be03
Fixed: unzip.h was still included even if the D3MF importer is disabled
2016-10-10 17:58:06 +02:00
bf06ee3ed4
Merge branch 'master' into new_obj_stream_handling
2016-10-10 10:19:45 +02:00
ad4d1f717f
Obj-Import: finish first prototype of IOStreamBuffer.
2016-10-10 10:18:14 +02:00
47dd1eb227
Merge pull request #1025 from smalcom/issue_768
...
Issue 768
2016-10-09 18:09:19 +02:00
1f377bc99d
try to find root joint node for skeleton
2016-10-08 19:18:13 -07:00
c49971e120
fix bug when exporting mRotationKeys data
2016-10-08 15:36:01 -07:00
71de606770
add skeleton and mesh to node containing the mesh
2016-10-08 15:34:00 -07:00
57b9232075
deleted code/MakeFile and added to .gitignore
2016-10-08 15:23:59 -07:00
0359ded946
[F] Checking directive name with start from symbol 'm'. And checking argument of 'mtllib'.
2016-10-07 16:40:51 +03:00
6f6dd69270
Merge pull request #1021 from smalcom/export_x3d
...
Export x3d
2016-10-07 13:05:02 +02:00
d474c24753
Merge pull request #1024 from ascandal/feature/glTF-animations
...
Export glTF node animations
2016-10-07 10:30:42 +02:00
574abd3c01
removed obsolete commented out code
2016-10-07 00:26:08 -07:00
0bae2bbfa7
Obj-Importer: start new streaming handling.
2016-10-07 09:19:10 +02:00
84803bd51a
removed cout debugging statements and older ExportSkins function
2016-10-06 23:57:16 -07:00
d128837a3a
export vertex joint and weight information
2016-10-06 18:59:53 -07:00
ae36ca0e44
moved ExportSkins function into ExportMeshes function
2016-10-06 15:18:33 -07:00
83c9addbc9
removed duplicate function for ExportData
2016-10-06 13:01:03 -07:00
f59b8b3a59
export inverseBindMatrix Data for skins
2016-10-06 12:56:34 -07:00
42a8d58f45
Export Nodes before meshes to avoid issue if node id's are changed
2016-10-06 11:29:09 -07:00
c6d233768f
[F] Small doc changes.
2016-10-06 19:02:37 +03:00
8c6ee48af5
[*] Merged fresh master and resolved conflicts.
2016-10-06 17:12:56 +03:00
9a4d693773
[+] Export to X3D format.
2016-10-06 17:04:37 +03:00
85d5fc2169
[-] Removed unneeded logging.
...
[F] Invalid metadata type used in postprocessing.
2016-10-06 17:04:08 +03:00
4ac57f1fab
fixed issues to get node animations working
2016-10-06 02:34:11 -07:00
0313328a92
set bindShapeMatrix to identity
2016-10-05 18:16:32 -07:00
79852de5ae
added skins and jointNames
2016-10-05 17:30:02 -07:00
cfa0ea3189
finished first version of extport animation data
2016-10-05 13:32:06 -07:00
b61aaf7ec4
New animation file for OpenGEX.
2016-10-05 20:14:42 +02:00
a3295c6640
fix compile warning
2016-10-05 02:07:42 +02:00
0aab2aa96a
Merge pull request #1018 from johnmaf/bugfix/obj-homogeneous_coords
...
Parse homogeneous vertex coordinates in OBJs
2016-10-04 23:12:05 +02:00
f94b7287fc
Merge pull request #1015 from ascandal/feature/fix-glTF-validator-errors
...
Fix glTF validator errors
2016-10-04 23:10:30 +02:00
7a721b3014
Merge pull request #1016 from johnmaf/bugfix/glTF-sort_ptypes
...
Sort by primitive type before exporting as glTF
2016-10-04 23:09:16 +02:00
c3ebdc56de
Parse homogeneous vertex coordinates in OBJs
2016-10-04 17:06:31 -04:00
9d40f36f87
[F] Fixed type in list.
...
[+] Added function to metadata class for conveniance.
[*] Enumeration AI_INT changed to AI_INT32.
2016-10-04 23:58:51 +03:00
0ba0eca48e
[+] Call for X3D exporter.
2016-10-04 23:55:08 +03:00
8d3184f6fb
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-04 18:41:25 +02:00
86dc3f7a79
X3D: Some more reformattings and missing initializations.
2016-10-04 18:40:58 +02:00
d249cca011
created the asset writer function for animations export gltf
2016-10-04 07:09:01 -07:00
7bf6cfc9f6
removed BOM
2016-10-04 12:45:28 +02:00
7b9162136f
Some small format changes for assimp-style :-).
2016-10-04 11:45:08 +02:00
37d32e79c9
created exportAnimation function
2016-10-03 19:29:37 -07:00
f378230a13
Sort by primitive type before exporting as glTF
2016-10-03 17:19:44 -04:00
9dc4fb2aa3
AMF: add missing license info.
2016-10-03 19:24:14 +02:00
99c93e861c
Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors
2016-10-03 09:34:16 -07:00
aeb99898d3
[*] Set float type for constants: less warnings, less type truncations.
2016-10-02 20:00:57 +03:00
897370b6ff
[*] Pull fresh data.
...
[F] Using ssize_t is bad idea.
2016-10-02 19:52:24 +03:00
268b18dabf
Merge branch 'master' into import_x3d
2016-10-02 17:31:44 +03:00
3086a07e86
[*] Docs and build-files fixes.
2016-10-02 17:27:13 +03:00
59212bf55a
Merge pull request #1011 from smalcom/import_amf
...
Import amf
2016-10-02 14:52:00 +02:00
6233f65b3a
Merge pull request #1012 from johnmaf/bugfix/glTF-transparency
...
glTF: Read and write transparency values
2016-10-02 11:52:59 +02:00
9c0de90ede
[F] Fixed missed break.
...
[F] Doc changes.
[*] Removed Boost dependency.
[*] Style changes.
2016-10-02 03:08:34 +03:00
823003ba9b
[F] Fixing checking rule
2016-10-02 02:28:06 +03:00
0619232aef
included samplers dictionary for textures
2016-09-30 17:23:38 -07:00
8856f7f6ae
Merge branch 'import_amf' into import_x3d
2016-09-30 02:38:59 +03:00
9d4d0de607
[*] Few changes for building using old (or MS) compilers.
2016-09-30 02:24:24 +03:00
c1a3912b3f
[F] Erasing with constant iterator. Strange that new gcc is allow this.
...
[*] Few changes for building using old (or MS) compilers.
2016-09-30 02:12:46 +03:00
83c0163ec6
glTF: Read and write transparency values
2016-09-29 17:44:04 -04:00
db54eb98e3
Merge branch 'import_amf' into import_x3d
2016-09-30 00:30:26 +03:00
f497f739fa
[*] Not all modern compilers is support new C++ feature "using". What the sad?
2016-09-30 00:03:34 +03:00
8ad6c80dac
[*] Removed Boost dependency.
2016-09-29 23:48:41 +03:00
61bced27df
[*] Removed Boost dependency.
2016-09-29 23:38:24 +03:00
76c84aa24d
[F] Header missed.
2016-09-29 23:19:47 +03:00
ef9b6a7375
[F] Removed UTF-8 BOM
2016-09-29 23:16:59 +03:00
3274951f2a
[+] X3D importer.
2016-09-29 18:50:24 +03:00
e4cb388153
[*] Style and doc changes.
2016-09-29 18:04:31 +03:00
818fb2e901
[F] Typo: invalid format hint index.
2016-09-29 17:11:53 +03:00
7dd2e7011d
fixed issue with texcoordinate bufferview target
2016-09-28 18:50:08 -07:00
f2e6f2f67f
work around for indices array in ExportData
2016-09-28 15:56:06 -07:00
e89e98291a
calculate and write min and max attributes for accessors
2016-09-28 14:47:15 -07:00
0a25b076b8
Merge branch 'master' into import_amf
2016-09-28 17:51:59 +03:00
cb38054247
[+] AMF-importer. Also some fixes for modern Assimp.
2016-09-28 17:49:15 +03:00
9f7e34663e
FBX: make lookup test less strict. closes https://github.com/assimp/assimp/issues/994
2016-09-28 16:16:06 +02:00
f383ec0797
Fix some review findings.
2016-09-28 00:06:23 +02:00
cd9cb50eaf
OpenGEX: fix some review findings.
2016-09-28 00:06:06 +02:00
3e322495f2
asset.version from int to string
2016-09-27 11:38:17 -07:00
36d770d3db
OpenGEX: fix some review findings.
2016-09-27 19:47:27 +02:00
78dae87de2
closes https://github.com/assimp/assimp/issues/954 : add import of vertex
...
colors in
penGEX-importer.
2016-09-27 19:40:06 +02:00
6a9ccf2016
[+] Flag for scene for supporting formats where more than one face can reference to one vertex.
2016-09-26 13:01:38 +03:00
386128febc
[+] Building AMF-importer.
2016-09-26 12:57:44 +03:00
8e9c0235d3
153083/2 Buffer not null terminated
2016-09-25 15:21:30 +02:00
07ec476b7d
122143,122139 Copy into fixed size buffer
2016-09-24 21:34:58 +02:00
08da6b278d
122180 Resource leak
2016-09-24 20:29:49 +02:00
33dcf4dbd3
122185 Pointer to local outside scope
2016-09-24 20:24:38 +02:00
94538e9d87
122193 Uninitialized scalar variable
2016-09-24 20:19:43 +02:00
5bec41ad16
122198 Resource leak
2016-09-24 20:11:07 +02:00
4872c4caf8
122238 Use after free
2016-09-24 19:19:48 +02:00
3f53ffa576
122243,122194 Resource leak
2016-09-24 16:27:40 +02:00
61097479c8
122243 Resource leak
2016-09-24 15:55:37 +02:00
04e0552f9e
134062 Use after free
2016-09-24 12:33:53 +02:00
38b9ae2c6c
closes https://github.com/assimp/assimp/issues/584 : export scene combiner.
2016-09-24 00:27:45 +02:00
b50d734d75
IFC: Switch generated file to 2 files to fix issue related to <mingw4.9 (
...
Thanks Qt! )
2016-09-23 19:48:38 +02:00
38cbdcd885
Merge pull request #1001 from johnmaf/feature/glTF/separate-bin
...
Export glTF buffer data in a separate .bin file
2016-09-21 19:39:38 +02:00
0277a23521
Add Triangulate post-processing step to glTF exporters
2016-09-21 11:33:02 -04:00
3052f35824
glTF: move mesh splitting to constructor to cover GLB
2016-09-20 14:15:42 -04:00
c9f28192d9
Merge upstream master
2016-09-20 11:53:12 -04:00
f11545d2c0
[*] Merge with fresh master.
2016-09-20 16:02:41 +03:00
b8950f6d90
Merge pull request #998 from johnmaf/bugfix/gltfUVs
...
Flip UVs in glTFExporter
2016-09-20 09:53:57 +02:00
097743880c
Merge pull request #999 from johnmaf/feature/single-glTF-buffer
...
Add all glTF data to single buffer
2016-09-20 09:52:54 +02:00
3c827f29f6
Export glTF buffers as separate .bin files
2016-09-19 17:44:38 -04:00
96fab1cf55
122219-122218 Big parameter passed by value
2016-09-19 22:23:13 +02:00
a9284e5a95
[F] Removed unneeded definitions.
...
[F] Add library for linker.
2016-09-15 20:39:39 +03:00
cd038209dd
Add all glTF data to single buffer
2016-09-15 10:38:02 -04:00
65048d1ef7
[F] Removed Unicode BOM at file beginning.
2016-09-15 14:45:00 +03:00
8b3f348d63
Flip UVs in glTFExporter
2016-09-14 18:03:52 -04:00
40cfb45c74
[F] Not set option-variable (only define for compilation was set.
...
[F] For adding library can not be used TARGET_LINK_LIBRARIES
2016-09-13 13:29:12 +03:00
24e25324f2
Merge branch 'master' into gltf_o3dgc
2016-09-13 12:08:51 +03:00
f51cd4c6d4
Merge branch 'master' into coverity_scan
2016-09-12 12:42:11 +02:00
0c00edb40e
Blender: fix some minor findings.
2016-09-12 12:41:49 +02:00
c98915e382
Merge pull request #949 from r-chris/fix-material-bugs
...
Fixing bugs related to 64-bit upgrade in materials
2016-09-12 09:41:58 +02:00
a375344052
Merge branch 'master' into gltf_o3dgc
2016-09-10 10:37:32 +03:00
22cfe84cba
3MF: add a simple box example from the 3MF-sample repo.
2016-09-10 09:27:29 +02:00
7cedd4ab89
CMake: fix buildCMake: fix build..
2016-09-10 08:48:01 +02:00
5fe32caa6d
Merge branch 'master' into gltf_o3dgc
2016-09-10 09:14:28 +03:00
d97f00571e
[*] Not needed namespace.
2016-09-10 09:07:50 +03:00
ac1bcaa4cc
Merge branch 'master' of https://github.com/assimp/assimp into gltf_o3dgc
2016-09-10 09:05:36 +03:00
95676b4db9
Merge branch 'master' of https://github.com/assimp/assimp
2016-09-09 20:42:36 +02:00
05fce9a008
3MF: make xml tags static const.
2016-09-09 20:42:02 +02:00
b22f93eabf
3MFImporter: add source group for visual dtudio.
2016-09-09 20:41:04 +02:00
d49ad6c93e
[*] Stylistic changes.
...
[F] Added all files from Open3DGC codec to CMakeLists.txt
2016-09-09 16:38:43 +03:00
702d57fbae
Split mesh before exporting gltf. Fixes #995
2016-09-07 17:03:19 -04:00
ccf1b368c8
Merge branch 'master' of https://github.com/assimp/assimp
2016-09-06 15:46:41 +02:00
ffdca3593b
ObjImporter: remove unused code.
2016-09-06 15:41:37 +02:00
0f2cea7ba6
Blender: revert fix for suspicious crash in blender on windows.
2016-09-06 10:42:02 +02:00
9e19b5103c
IrrImporter: Fix release functions.
2016-09-05 10:48:30 +02:00
a54835c91d
Merge master
2016-09-04 20:41:20 +02:00
cc860ede66
Fix coverity findings: fix usage after free.
2016-09-04 20:40:34 +02:00
9d4d2b2a1c
ComputeUVMappingprocess: add missing initialization for scalar value.
2016-09-04 20:35:07 +02:00
bcdc79ba73
Fix invalid release of mat + mesh.
2016-09-04 20:22:04 +02:00
e51b7d2a61
IFC: fix possible use after free access bug.
2016-09-02 20:06:56 +02:00
b240b9d30d
Blender: fix invalid OnjectCompare op.
2016-09-02 20:06:31 +02:00
2568797015
MDLMoader: fix resource leak.
2016-08-30 19:50:53 +02:00
659a55be4a
Fix coverity finding: use deep copy instead of reference showing to
...
mem-adress when reading and calling push_back in a std::vector.
2016-08-30 19:46:34 +02:00
c6f670ff50
glTFImporter: avoid out-of-bounds-access.
2016-08-29 20:05:29 +02:00
147921ac39
MakeVerboseFormat: fix invalid delete statement.
2016-08-29 19:56:38 +02:00
26aa18c75a
Fix findings from code review.
2016-08-29 18:23:41 +02:00
2545dee58d
Fix coverity findings: fix possible out-of-bound access.
2016-08-29 15:32:27 +02:00
238f14f30f
Fix coverity findings: fix possible usage after calling free.
2016-08-29 15:28:37 +02:00
a66e644bf3
Fix coverity finding: fix possible use after free..
2016-08-29 15:24:24 +02:00
243df452a4
GeometryBuilder: fix update of vertices.
2016-08-25 18:20:52 +02:00
85b3e45aa7
Merge pull request #984 from jwwalker/upstream
...
Add typecasts in glTFAssetWriter.inl to fix compile errors
2016-08-19 10:26:48 +02:00
666d1ce164
Changed C-style casts to static_cast.
2016-08-18 10:55:24 -07:00
c2c12c1db5
Use Assimp namespace to fix build for big-endian architectures
2016-08-18 10:51:20 +02:00
e9ecd6f8a7
Add typecasts in glTFAssetWriter.inl to fix compile errors about ambiguous constructors, see: < https://github.com/assimp/assimp/issues/980 >
2016-08-17 17:48:29 -07:00
3f08cebfab
include config.h to always have the correct types (float/double) exposed
2016-08-17 07:57:31 +10:00
4f7b624fe8
fix precision issue within memory copy
2016-08-16 16:03:56 +10:00
63a4591683
Fixing bugs related to 64-bit upgrade in materials
2016-08-16 16:03:56 +10:00
27f81884f9
adding support to store all the layered textures
2016-08-15 09:58:53 -07:00
2732e5d9b6
[F] Removed Unicode BOM.
2016-08-14 19:49:05 +03:00
e0356b09be
Merge branch 'master' into gltf_o3dgc
2016-08-14 16:49:53 +03:00
48f8c117e2
[F] Conditional compilation for Open3DGC-extension.
...
[F] Flag comp_allow did not reset when mesh can not be encoded.
2016-08-14 16:27:16 +03:00
b916857659
closes https://github.com/assimp/assimp/issues/967 : add unzip include path
...
when no other version was found.
2016-08-14 11:44:21 +02:00
de70f5c028
[+] Added link to RT library when using Open3DGC-compression.
2016-08-13 17:44:58 +03:00
3a10a3cf03
[-] Removed unneeded include.
2016-08-13 16:27:34 +03:00
8ab50aa9a0
[*] Few C++11 constructions are removed.
2016-08-13 16:27:07 +03:00
1844665693
[*] Few C++11 constructions are removed.
2016-08-13 16:09:21 +03:00
0379675fca
Add type to deal with 64-bit filesizes on x86_64-apple-darwin15.5.0x86_64-apple-darwin15.5.0
2016-08-12 18:47:37 +02:00
83b02ff41f
DefaultIOStream: add missing detection for apple-based OS.
2016-08-12 18:14:26 +02:00
bdcff35d5d
closes https://github.com/assimp/assimp/issues/901
2016-08-12 17:13:18 +02:00
0ad2f2247a
[+] glTF import/export. Support for Open3DGC-compression of mesh primitives.
2016-08-11 01:04:30 +03:00
778ad7f06f
[+] Use "buffer" ID against "bufferView" ID for Open3DGC-compression.
2016-08-09 13:37:32 +03:00
9a4fa1321b
[+] Save parameters of mesh extension: Open3DGC-compression.
2016-08-09 13:26:57 +03:00
507668229f
[+] Support Open3DGC for glTF import/export. Intermediate commit.
2016-08-08 19:24:50 +03:00
41ed74beb6
[*] Style. Intermediate commit.
2016-08-08 19:07:30 +03:00
a6ec0e4c7a
[*] Style. Intermediate commit.
2016-08-08 19:06:17 +03:00
29e982e185
[F] Fixed problem with more then one mesh in scene. More detaily read at line 529 in glTFAsset.inl.
2016-08-03 18:06:38 +03:00
c024beadba
[+] Put information to log about decompressing.
2016-08-03 11:16:30 +03:00
5e4fd5fa3c
[+] glTF. Support for import meshes with Open3DGC compression.
2016-08-03 03:46:04 +03:00
2e452205aa
[+] Building of Open3DGC codec.
2016-08-03 03:40:53 +03:00
454320ad08
Merge pull request #953 from TrianglesPCT/master
...
Fix blender vertex colors being negative, and fix blender vertex colors scaling to be 0 to 1
2016-07-27 21:37:02 +02:00
66c1a176de
Add files via upload
...
forcing a new build
2016-07-25 23:04:08 -06:00
f119447549
Fixes compilation on OSX with gcc.
...
- The symbol `typeof` collides with a non-standard gcc "keyword". See https://gcc.gnu.org/onlinedocs/gcc/Typeof.html
- Renamed to `type_of`.
2016-07-25 16:33:25 +03:00
667aa37fdd
Add files via upload
...
used ai_real instead of float
2016-07-24 18:45:41 -06:00
28c9f56c5e
Add files via upload
...
scale blender vert color out to 0-1 range as aiColor specifies
2016-07-24 02:26:23 -06:00
bcb86bcc35
Add files via upload
...
fix blender vert colors being casted to signed char, which was causing negative values.
Also fix blender vert colors being way outside of 0 to 1 range which aiColor specifies
2016-07-24 02:23:59 -06:00
5c5acae92e
Delete reduntal 'g ' from actual name of Group. (we don't have 'usemtl' in material name)
...
Fixed issue in case 'usemtl' goes straight after 'g'.
2016-07-22 14:10:06 +01:00
5fc3ee9a21
fix https://github.com/assimp/assimp/issues/946 : use correct test for objectcompare in blender.
2016-07-17 13:54:01 +02:00
c57b524a59
moving cmake configure_file to appropriate location
2016-07-16 18:47:59 +10:00
a7894b090d
Upgrading PLY exporter to allow element definition as double
2016-07-16 18:23:33 +10:00
ad8bb32561
Properly defining build-time defines in config.h
2016-07-16 18:23:33 +10:00
05a6ee6473
Adding double precision import support for formats that can be exported
2016-07-16 18:23:33 +10:00
fa1d6d8c55
propagating precision requirments into operations
2016-07-16 18:23:33 +10:00
5adb0e899c
CMake Option and moving more functions to optional double support
2016-07-16 18:23:33 +10:00
2f7e3dcdcc
Basic changes to introduce optional double precision
2016-07-16 18:23:33 +10:00
45fae27aed
DefaultIOStream: export class for testing.
2016-07-16 09:13:59 +02:00
a15a77dff5
glTF: fix doxygen typo.
2016-07-15 10:35:44 +02:00
e1697b30bc
Blender: mark local function as static.
2016-07-15 10:33:48 +02:00
9678da72c9
Public includes: add pragma statement and formalize include guard schema.
2016-07-11 20:56:38 +02:00
02602ce9af
Update license date.
2016-07-10 15:34:58 +02:00
a8673d4828
Merge pull request #941 from assimp/feature/issue_940
...
Feature/issue 940
2016-07-08 19:29:51 +02:00
4d012bc476
Update version.
2016-07-08 18:40:26 +02:00
599e846f57
Remove dead code.
2016-07-08 18:31:19 +02:00
070fb3363f
Closes https://github.com/assimp/assimp/issues/940 : use standard offsetof
...
instead of an own version.
2016-07-08 18:30:26 +02:00
a5b3ce9a3c
reverting back to 16 digit precision export
...
having to import 17 digit floats likely leads to issues in many other apps
2016-07-06 15:33:51 +10:00
10f22779f4
setting default export precision to 17 for all exporters
2016-07-06 14:49:14 +10:00
19769eef8b
Version: prepare 3.3 version.
2016-07-05 18:43:16 +02:00
7b08233ef2
Fix identation
2016-07-01 17:08:28 +02:00
3c7dd2b302
More whitespace consistency
2016-07-01 17:02:54 +02:00
616aa022a7
CMake: whitespace consistency, variable naming
2016-07-01 16:57:45 +02:00
9c7de7b2a8
Update to latest Melange SDK
2016-07-01 14:50:46 +02:00
886cea2933
Merge pull request #927 from royshil/obj_color_vertices_support
...
adding support for per-vertex colors in OBJ files.
2016-06-28 22:08:59 +02:00
5321072007
Static code analysis: fix minor finding.
2016-06-28 11:25:04 +02:00
7d98643bcf
adding support for per-vertex colors.
2016-06-27 20:08:22 -04:00
9b6de15b74
closes https://github.com/assimp/assimp/issues/904 : add ai_strtof for
...
VS2012.
2016-06-20 20:30:29 +02:00
447a9642c2
closes https://github.com/assimp/assimp/issues/918 : use correct lib
...
install name for macos.
2016-06-17 20:42:19 +02:00
b01e424476
Merge pull request #917 from assimp/feature/new_includes
...
Feature/new includes
2016-06-14 22:54:56 +02:00
62e07a8af0
closes https://github.com/assimp/assimp/issues/911 : use correct include
...
path for unzip, when detected.
2016-06-14 20:27:40 +02:00
334ac9a7d0
Merge pull request #908 from Adjective-Object/master
...
Added 'joint' node type to Collada export
2016-06-13 11:35:11 +02:00
f15b6177f7
glTFExporter fixes: spaces to tabs
2016-06-10 13:41:59 -04:00
32d9ef042a
Merge branch 'master' into gltfErrors
2016-06-10 09:51:35 -04:00
c98e77907c
fixed some small bugs in the gltf exporter: byteOffsets in accessors/bufferViews, logic problem with bufferView targets
2016-06-10 09:49:04 -04:00
81773b4e4e
Update fast_atof.h
...
Fix include brackets.
2016-06-07 11:51:09 +02:00
7207e5117c
Use new include bracktes.
2016-06-06 22:04:29 +02:00
d23439451a
Added 'joint' node type to Collada export
2016-06-05 21:04:02 -04:00
814d2e7821
Merge branch 'master' of https://github.com/assimp/assimp
2016-06-04 19:04:06 +02:00
0a1dda22b2
ColladaParser: add warning when empty semantic will be parsed.
2016-06-04 17:53:51 +02:00
d67c8c29b6
Merge pull request #898 from turol/cxx11-refactor
...
Use C++11 range-based for loops
2016-05-26 16:56:07 +02:00
bb2b30e54a
fix strncpy not null terminated bug
2016-05-26 16:13:21 +08:00
8fa0071d16
closes https://github.com/assimp/assimp/issues/892 : add own to_string
...
implementation.
2016-05-26 00:44:29 +02:00
4e982c0538
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-26 00:41:48 +02:00
2cbbc3da09
OpenGEX-Importer: remove dead code.
2016-05-26 00:41:31 +02:00
abad093d09
Update OpenGEXImporter.cpp
...
Fix compiler warning: remove unused variables.
2016-05-25 10:18:24 +02:00
5463146688
Add std::string header.
2016-05-25 00:58:05 +02:00
f9f493d017
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-25 00:27:16 +02:00
037fec275c
std::to_string: add replacement for android build chain.
2016-05-25 00:26:41 +02:00
381f87507f
SplitLargeMeshes: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
896ab8eee2
Unreal: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
d238597459
Raw: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
6c9c040419
Q3BSP: Use C++11 range-based for loop
2016-05-23 17:33:51 +03:00
a09a6a40c0
OpenGEX: Use C++11 range-based for loop
2016-05-23 17:33:49 +03:00
32e4dd0bd1
Ogre: Use C++11 range-based for loop
2016-05-23 17:30:48 +03:00
3eb9b8e91b
NFF: Use C++11 range-based for loop
2016-05-23 17:30:47 +03:00
ac676d4d3c
MD5: Use C++11 range-based for loop
2016-05-23 17:30:47 +03:00
b9fbfbc18a
LWO: Use C++11 range-based for loop
2016-05-23 17:30:42 +03:00
cd4f212b5f
Merge pull request #891 from ciechowoj/blender_materials
...
Blender materials
2016-05-22 14:39:45 +02:00
3031470ec1
IRR: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
c7c756d344
FBX: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
8566b9aa90
D3MF: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
52405bbe1b
Collada: Use C++11 range-based for loop
2016-05-22 13:57:11 +03:00
f0ebb40f19
ASE: Use C++11 range-based for loop
2016-05-22 13:57:09 +03:00
b345f79d45
3DS: Use C++11 range-based for loop
2016-05-22 13:57:06 +03:00
38ce71d5a0
Update glTFAsset.inl
...
closes https://github.com/assimp/assimp/issues/893 : fix invalid memcpy usage.
2016-05-19 09:10:56 +02:00
c9c6fda28e
Merge pull request #889 from ciechowoj/area_lights
...
Adds support for area lights.
2016-05-18 00:11:05 -07:00
c554b55f97
Merge branch 'blender_materials'
...
Conflicts:
test/CMakeLists.txt
2016-05-17 22:52:18 +02:00
c4a542a994
Adds blender material loading.
2016-05-17 21:17:51 +02:00
fc5464eb38
Pull from upstream, 5/17/2016
2016-05-17 08:44:38 -04:00
913f26475d
Adds importing blender material.
2016-05-16 21:17:58 +02:00
25d84a6aff
Adds support for area lights.
2016-05-16 13:04:43 +02:00
560e1eebc1
fix for https://github.com/assimp/assimp/issues/887 : add missing define.
2016-05-16 11:24:04 +02:00
1acd24e0ae
iSIBImporter: fix possible dereferncing of a null pointer.
2016-05-15 19:56:29 +02:00
6575696459
OpenGEX: fix coverity findings.
2016-05-15 18:57:10 +02:00
e1084b5314
Merge branch 'feature/opengex_missing_features'
2016-05-14 10:36:46 +02:00
210182b17a
OpenGEX: fix coverity findings.
2016-05-14 10:10:05 +02:00
159af06524
Fixed GLTF bugs, and added a few test models
2016-05-10 16:25:15 +02:00
86a636fbbf
Add in IRRMESH option
2016-05-09 18:26:18 -04:00
e9085097f3
OpenGEX: add light impl and add examples.
2016-05-09 20:43:22 +02:00
0d5eb30a28
CameraObj: load camera data in the correct way.
2016-05-08 22:31:16 +02:00
82f73b6d03
OpenGEX: fix invalid access to textures. Next steps to camera and light.
2016-05-08 11:09:53 +02:00
00b574d746
Fixed compile issue for travis-ci
2016-05-07 15:36:05 +02:00
753b63c526
Removed override keywords so compilation success on gcc 4.6
2016-05-07 15:15:00 +02:00
89320bab46
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-07 14:18:17 +02:00
8f4f0047fb
Added 3MF importer
2016-05-07 14:16:33 +02:00
0b79d1ebda
Revert previous glTF fix ( e5233283ef) because it breaks ODR as pointed out by @turol, instead just make importer depend on the necessary definitions.
2016-05-05 19:11:33 +02:00
f5327a99ba
Add using namespace std on top of assxml exporter so vsnprintf is found no matter where it lives.
2016-05-05 19:05:02 +02:00
e5233283ef
Fix travis compile: glTFImporter chokes on unavailability of WriteLazyDict<T>. It does not use it directly, but instantiation of LazyDict<T> creates a reference.
...
My understanding is that compilers were correct in rejecting this, but I may be missing some detail of C++' template instantiation rules.
2016-05-05 16:37:55 +02:00
896120b76a
Assimp mostly uses unsigned int where it perhaps should've used size_t, nonetheless SPBC insisted on size_t, causing lots of noisy compile warnings.
2016-05-05 15:41:50 +02:00
167bc579c5
Fix MSVC11 compile error in AssxmlExporter.cpp -- vsnprintf is not in std.
2016-05-05 15:41:12 +02:00
1daae7b7b9
STEPFile.h: delete deleted copy ctor and move ctors. Class has a const member, so implicit creation is off anyway. Enables pre cpp11 compilation.
2016-05-05 15:40:36 +02:00
e7fd168114
Merge pull request #854 from tomacd/fix_scene_combiner
...
fix SceneCombiner copy of aiNode not setting mParent field
2016-05-05 15:07:09 +02:00
e9b93788ca
Merge pull request #863 from mpersano/master
...
Fix texture coords exporting on binary PLY files
2016-05-03 21:55:17 +02:00
12613720ff
Fix macro used for detecting IRR support
2016-05-02 18:24:26 -04:00
8449afad71
Merge pull request #868 from otgerrogla/master
...
Fixed a few GLTF importer/exporter bugs
2016-04-28 22:56:41 +02:00
11e52dc3d7
Removed rogue comma
2016-04-28 21:34:31 +02:00
2fe401fc54
Fixed gcc compilation error
2016-04-28 21:22:01 +02:00
64f78e003f
Fixed crashes when files were not found, and fixed some warnings
2016-04-28 20:50:01 +02:00
46e7ae5dc0
OpenGEX: prepare light- and camera-node and object.
2016-04-28 20:20:40 +02:00
d9b365eb90
Fixed a few GLTF importer/exporter bugs
2016-04-28 18:44:47 +02:00
5192b837da
Replace std::endl by using backslash n.
2016-04-27 17:58:40 +02:00
7468ca5c35
VS2015-code analysis: fix finding ( index var type too small ).
2016-04-23 09:43:20 +02:00
829e56df0c
cmake env: add license info.
2016-04-23 09:42:05 +02:00
473d2ca052
Fix texture coords exporting on binary PLY files
2016-04-22 16:09:45 -03:00
2f9c33e3e9
closes https://github.com/assimp/assimp/issues/857
2016-04-20 23:27:59 +02:00
0ec1e91722
Regression Testsuite: update database.
2016-04-19 08:49:14 +02:00
22dc22778d
Assxml exporter: Make some local functions static.
2016-04-19 08:48:37 +02:00
1b94b8969f
Blender Importer: fix review findings.
2016-04-19 08:45:04 +02:00
5a8c15d826
fix SceneCombiner copy of aiNode not setting mParent field
2016-04-18 11:28:21 +02:00
de39c49c4c
assxml export: make local functions static.
2016-04-17 23:29:46 +02:00
a6e7938696
Assxml io function: use vsprintf for var-argument list.
2016-04-17 21:33:11 +02:00
dec93efc92
AssxmlExporter: fix crash in writing header info in VS2015.
2016-04-16 18:42:49 +02:00
6b243230b2
C++11-Support: remove boost.
2016-04-07 21:31:04 +02:00
632b58f27e
Merge pull request #850 from mensinda/no-boost
...
Replaced boost with c++11 features
2016-04-06 21:16:23 +02:00
b045a1ec5c
Deleted move constructor of LazyObject
2016-04-06 21:03:54 +02:00
3eafc7e746
Renamed Math.h --> MathFunctions.h
2016-04-06 16:54:03 +02:00
f59cba13eb
Try fixing clang builds
2016-04-06 11:10:12 +02:00
726b004806
Removed boost/noncopyable.hpp
2016-04-06 10:51:18 +02:00
51c80ecb80
Moved gcd and lcm implemetation
2016-04-06 10:21:59 +02:00
cc0fce8568
Replaced boost::timer with std::chrono
2016-04-06 10:13:02 +02:00
ae99f99b99
Replaced boost::tuple with std::tuple
2016-04-06 00:17:21 +02:00
b37e25cd7d
Replaced boost::format with internal formater
2016-04-06 00:03:05 +02:00
5dacda0a08
replaced boost smart pointers with c++11 smart pointers
2016-04-05 23:23:53 +02:00
cff5b0d1a0
Replaced depreacated std::auto_ptr with std::unique_ptr
2016-04-05 22:56:11 +02:00
18843fe5e1
Replaced BOOST_FOREACH with c++11 ranged for loops
2016-04-05 22:53:54 +02:00
4836a2993e
Replaced boost::thread with std::thread
2016-04-05 22:28:21 +02:00
20630e950a
Regression test suite: add ui for simpler text execution.
2016-04-05 22:02:02 +02:00
a2d9cbef7e
Update STEPFileReader.cpp
...
StepFileReadder: initialize var with nullptr.
2016-04-04 12:52:22 +02:00
f2d5921252
Update FBXConverter.cpp
...
FBXConverter: initialize aiNodeAnim with nullptr.
2016-04-04 12:48:53 +02:00
87e7cf00a2
Fix spelling mistakes
2016-04-03 01:38:00 +01:00
d094dfc3a1
Merge pull request #800 from pkholland/master
...
Can't add integer to string pointer
2016-04-01 10:01:23 +02:00
49d60dc856
Merge pull request #832 from assimp/no-boost
...
Removed usage of Boost static assert.
2016-03-31 15:42:53 +02:00
0d44479399
Import reflectance factor from Blender.
2016-03-29 21:16:26 +02:00
1592a18210
PLYLoader: fix review comments.
2016-03-25 00:09:56 +01:00
42d29b1bfe
Merge branch 'master' of https://github.com/assimp/assimp
2016-03-24 19:54:33 +01:00
7c71f0b7a9
PLYLoader: improve readability by refactorings.
2016-03-24 19:53:15 +01:00
6be4d82a6b
Merge pull request #835 from robertliebo/VCS-1030/ObjMtlFilenameFallback
...
Vcs 1030/obj mtl filename fallback
2016-03-22 20:35:41 +01:00
23892a6ded
FBX: add debugging tool to log class type + info.
2016-03-22 20:30:25 +01:00
ca0fa2ba69
FBX-Importer: put debug printf into comments.
2016-03-22 20:25:29 +01:00
124fc9ae27
[VCS-1030] add log info about .mtl fallback
2016-03-22 18:39:52 +01:00
abb3e6b854
[VCS-1030] fallback for non-found .mtl file: try file name of original obj with just the file extension replaced by "mtl"
2016-03-22 18:38:28 +01:00
397fa374a3
Removed usage of Boost static assert.
2016-03-18 17:02:39 -07:00
76e4e82ecb
FBX: fix https://github.com/assimp/assimp/issues/782
2016-03-16 20:26:33 +01:00
644d6a9a67
Collada: refactorings.
2016-03-15 21:17:38 +01:00
d89e7943ad
FBX Close issue-806: support version 7400.
2016-03-15 21:16:47 +01:00
e3d7ca264c
Collada: reset workaround.
2016-03-15 19:28:57 +01:00
3a7c3a5698
Test for issue-731: possible overflow.
2016-03-14 21:00:08 +01:00
7e9fe2d654
OpenGEX: use correct number of uv-coordinates for texture coordinates.
2016-03-13 20:22:36 +01:00
555f533777
MD3: Check file is big enough to contain all the advertised surfaces
2016-03-13 00:57:08 +02:00
da0b180901
MD3: Fix crash on invalid vertex index
2016-03-13 00:57:08 +02:00
b0f453dba8
MD2: Check file is big enough to contain all the advertised frames
2016-03-13 00:57:08 +02:00
8d2af995de
MD2: Fix integer overflows on malformed input
2016-03-13 00:57:08 +02:00
e2361bf209
MDL: Fix read past end of buffer on malformed input
2016-03-12 22:35:54 +02:00
6ee5fdf567
OpenGEX: fix review finding.
2016-03-12 20:55:11 +01:00
b4b303ab55
OpenGEX: fix alloc for texture coordinates.
2016-03-12 13:22:09 +01:00
93be0f69da
PlyParser: fix invalid loading when comment is empty.
2016-03-10 17:47:07 +01:00
3c9e57fd73
Fix memory leak in OBJ loader when a mesh has no faces.
2016-03-04 03:40:47 -08:00
53370d0d31
FBXImporter: some refactorings to increase readability.
2016-03-03 18:38:50 +01:00
2b09199f4a
FBXImporter: move MeshGeometry declaration into its own header
2016-03-03 15:19:38 +01:00
3079b90622
Importer: when the right importer was found log this info.
2016-02-29 15:57:47 +01:00
e9f47b08c5
FBXImporter: fx build.
2016-02-28 20:56:11 +01:00
28d327b7ea
FBXImporter: fix build.
2016-02-28 20:27:31 +01:00
2496e8a0a3
Lib: reduce number of header files included.
2016-02-28 17:30:11 +01:00
58fc3940f2
Obj Importer: add missing semicolon to fix the build.
2016-02-25 19:04:13 +01:00
99f00834ec
closes ssues/804: add statement to take care of emissive texture, new
...
version.
2016-02-25 18:00:09 +01:00
f20a5afcf0
can't add integer to string pointer
2016-02-18 12:17:47 -08:00
38d462f0b3
Merge pull request #764 from rmitton/sib_import
...
Validation fix for empty SIB scenes.
2016-02-18 11:58:26 +01:00
88fee56cce
Merge pull request #790 from ov/safe-normalizing-in-smoothing-groups
...
use NormalizeSafe to prevent NaN when normalizing zero vectors
2016-02-18 11:53:57 +01:00
b71bd3df84
LWO: Fix division by zero
2016-02-13 23:37:08 +02:00
322c959424
Merge pull request #791 from trond/collada_animation_clip
...
Collada animation clip support
2016-02-11 22:11:27 +01:00
f0717b1d7c
Merge pull request #793 from AlexBobkov/master
...
Fixed installing pdb file
2016-02-11 22:10:21 +01:00
a5f9d0d3fc
Fixed installing pdb file
2016-02-11 16:24:26 +03:00
7d4a713a86
Fix loading of pk3 q3bsp maps
...
This fixes loading of pk3 maps. The pk3 files contain directory entries with a size of 0, which triggered an assertion.
2016-02-11 14:10:49 +01:00
ccd9f92533
Fixed a couple of nested template brackets that wasn't spaced out correctly.
2016-02-11 01:00:03 +01:00
4d5df6dc9a
use NormalizeSafe to prevent NaN when normalizing zero vectors
2016-02-11 12:19:06 +13:00
7e58a47ba0
* Combining single-channel animations like the previous code did, except now it has been deferred until after all nodes have been read. This makes the regression tests pass for a database created before these code changes.
...
* Changed name of ColladaParser::RebuildRootAnimationsFromClips to ColladaParser::PostProcessRootAnimations as it now does more than it did before.
2016-02-10 23:57:29 +01:00
d9017299a8
iObjParser: refactorings.
2016-02-10 10:40:39 +01:00
8681abe845
Obj_Importer: remove dead code.
2016-02-09 17:50:08 +01:00
1550191256
Closes https://github.com/assimp/assimp/issues/777 : fix invalid skipping
...
of line during face defintion parsing.
2016-02-08 18:07:00 +01:00
c34717639e
Collada: Importer generates animations from <library_animation_clips>, if the node is present.
2016-02-07 23:36:49 +01:00
72b5ed50e9
Bump just to get AppVeyor to re-test it.
2016-02-07 13:21:58 -08:00
37a3976b30
Revert "Fix issue: OBJ import takes forever ( #759 ) (attempt 2)"
2016-02-07 20:03:24 +01:00
c084a47c5d
Merge pull request #771 from andrewparlane/obj_load_forever_fix
...
Fix issue: OBJ import takes forever (#759 ) (attempt 2)
2016-02-07 20:00:03 +01:00
522f4e0882
Closes https://github.com/assimp/assimp/issues/786 :
...
- fix invalid value get for index data.
- update OpenDDL-library
2016-02-07 17:58:28 +01:00
dfbae1294f
JoinVerticesProcess: iAdd test for possible null pointer access.
2016-02-05 18:53:23 +01:00
a74b321ed1
Add unittests for defect reproduction.
2016-02-04 20:43:02 +01:00
699aa9c583
Closes https://github.com/assimp/assimp/issues/754 : use correct index
...
token.
2016-02-03 21:09:20 +01:00
0e06404ec1
SIBImporter: Properly fix C++11 issues for Clang
...
C-style cast has a higher precedence than & -operator so this was getting
parsed differently than Kim assumed. Thou shalt not use C-style casts.
2016-02-02 20:29:40 +02:00
a1bd83d797
ai_assert: split 2 checks in one macro to 2 separate ai_assert tests.
2016-02-01 16:16:09 +01:00
16fffb2ab1
Merge branch 'master' of https://github.com/assimp/assimp
2016-01-31 00:42:02 +01:00
a37ea18f09
SIBImporter: fix c++14 compilation issue for clang.
2016-01-31 00:41:14 +01:00
bcd38707c5
3DSConverter: fix level 4 compiler warning.
2016-01-29 21:22:41 +01:00
bac6067869
gltf: make code more radable and check against one possible null ptr
...
access.
2016-01-27 20:26:38 +01:00
0e7446af83
Merge branch 'master' of https://github.com/assimp/assimp
2016-01-27 18:49:26 +01:00
8bbd55a790
PostProcessing: first prototype of customized post processing.
2016-01-27 18:49:01 +01:00
f473b17c99
Merge pull request #773 from boxdot/master
...
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 17:20:26 +01:00
13ec11bca8
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 02:12:15 +01:00
b3b08728fa
fix new / delete missmatch
2016-01-26 22:47:50 +01:00
109f6feb6e
ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.
...
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.
This time I've fixed the order of evaluation bug in the call to getFace().
2016-01-25 20:44:31 -04:00
c7d86e97cc
ObjTools: Update getName() to work with const iterators.
...
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
2016-01-25 20:43:34 -04:00
4633266c31
Revert "Fix issue: OBJ import takes forever ( #759 )"
2016-01-25 23:53:59 +01:00
f23285a1ce
Fixed whitespace to match coding standard.
2016-01-25 13:45:08 -08:00
94a35dfdd2
Fixed NULL pointers to match coding standards.
2016-01-25 13:42:30 -08:00
9969167c2a
ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.
...
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.
2016-01-23 20:01:44 -04:00
ce64dfb3fd
ObjTools: Update getName() to work with const iterators.
...
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
2016-01-23 20:01:44 -04:00
ae2cce0899
Validation fix for empty scenes.
...
The validator requires empty scenes to have NULL pointers.
2016-01-23 15:22:48 -08:00
0e4cf64a45
Merge pull request #763 from andrewparlane/mtlFix
...
ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
2016-01-23 19:51:49 +01:00
3c4e06c23f
ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
...
We don't handle reflection textures during MTL import. This allowed a NULL
ptr to be used. Simply return in the case of a reflection texture.
2016-01-23 13:11:47 -04:00
c062eb0db4
Collada exporter: improve compatibility when exported path contains ':'.
...
Old code exported "c:/foo.jpg" path as "c%3a/foo.jpg".
Replacing : with %3a was probably legal, but it made paths unreadable for existing Max importers.
2016-01-21 22:35:44 +01:00
Jared Mulconry
Amit Cirt
Kim Kulling
IOhannes m zmölnig
Alexander Gessler
Kim Kulling
Tammo Hinrichs
Eduardo Costa
Arshia001
Minmin Gong
Jeremy Abel
Daniel Hritzkiv
Kim Kulling
Knox Shao
jamesgk
Patrick Dähne
Sergio Acereda
rickomax
Madrich
Leo Terziman
Vitaly Kovalev
arkeon
Kim Kulling
Andrej
VennGrayDog
Steve Mokris
Squareys
John Senneker
rdb
Helio Chissini de Castro
Cong Jie
Tyson Grant Nottingham
Andy Maloney
Guillaume Bittoun
Maarten Heremans
Andre Schulz
Kai Westerkamp
aoowweenn
rmitton
Shin-ya Murakami
Antoine Bolvy
Alexander Stillich
nola.donato@samsung.com
Giuseppe Barbieri
Denis Biryukov
Henryk Blasinski
Antti Määttä
Matt Oliver
Tan Li Boon
Mika Rautio
Jared Mulconry
Albin Bernhardsson
Alberto Taiuti
AndrzejKozik
Martin Gerhardy
tomacd
Matthew Waters
Angelo Scandaliato
Eshed
Rosario Leonardi
amit512
Sergey Kosarevsky
Alexandr Arutjunov
abma
wise86Android
James Walker
Daniel Knezevic
Chris Russ
roshan.c
TrianglesPCT
Adi Shavit @ MacBookPro
Volodymyr Boichentsov
Fabian Herb
cmdrf
Roy Shilkrot
Kangning Li
Maxwell Huang-Hobbs
Dirk
Turo Lamminen
ciechowoj
Richard Selneck
Otger
Richard Selneck
Gorilux
Alexander Gessler
mpersano
mensinda
Eric Engestrom
boxdot
Robert Liebo
Sherief Farouk
emvivre
Thiago Goulart
Paul Holland
Alexander Bobkov
rdb
Trond Abusdal
Vitaly Ovchinnikov
Andrew Parlane
Stepan Hrbek