Kim Kulling
339cc2e951
Some review findings.
2018-05-31 20:15:13 +02:00
Michael Roer Pedersen
fceeaa72f4
FBX animation export: Assimp animation time is already in seconds. Just convert to FBX time.
2018-05-31 15:07:00 +02:00
Tammo Hinrichs
ffb6756d2a
FBX: LayeredTextures now work with embedded texture data
2018-05-30 14:56:53 +02:00
Doron Adler
1ee9200277
smallerMax
2018-05-30 08:49:11 +03:00
Kim Kulling
1883d44b9b
Merge branch 'master' into master
2018-05-29 19:02:40 +02:00
Sebastian Maisch
c6eda67296
Changed assimp to force regeneration of normals.
2018-05-29 13:01:11 +02:00
Doron Adler
27b989fd36
Merge branch 'master' into ios-build-script
...
* master: (148 commits)
Update Importer.cpp
[-] Trace print removed.
[F] Get return "like true" when error occured.
[*] qt_assimp_viewer can be built with Qt4 or Qt5. [F] Working in doule precision.
[F] List of importers can be empty.
[F] More correct control by a mouse
[F] React on mouse pressing ig view only.
[F] One alignment for labels. [-] Unused checkbox.
[+] QtCreator temporary file.
[*] Refactoring of "draw axes" procedure. [-] Removed not working part of code for reloading textures. That do nothing, just show checkbox. As Yoda said: "Do. Or do not. There is no try."
[-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
Fix GenVertexNormals
[F] Wrong type in equation.
[F] Uninitialized variables.
Fix #1587 : add validation to LWS unit test
Fix #1970 : stl with empty solid
Add test for issue 1970: STL with empty solid
Add mesh name to ValidateDataStructure log
Read and write the KHR_materials_unlit glTF/2.0 extension.
...
# Conflicts:
# CMakeLists.txt
# port/iOS/build.sh
2018-05-28 16:27:00 +03:00
Doron Adler
323d59c7aa
Check for null
2018-05-28 16:12:54 +03:00
Kim Kulling
bf7ec7d130
Merge branch 'master' into fix-vector-out-of-bound-access
2018-05-26 13:25:57 +02:00
Kim Kulling
aa18e8a2a5
Update Importer.cpp
...
Make check more expressive.
2018-05-25 21:43:39 +02:00
smalcom
02d2b6e0d8
[F] Get return "like true" when error occured.
2018-05-25 21:30:59 +03:00
smalcom
5b23492421
Merge branch 'master' into qt_assimp_viewer
2018-05-25 21:20:03 +03:00
smalcom
d72ff712cb
[F] List of importers can be empty.
2018-05-25 21:16:08 +03:00
gstanlo
97cecc858a
Properly reads in glTF/2.0 sampler address modes.
...
Assimp was returning glTF/2.0 values as address modes instead of aiTextureMapModes.
Also modified text glTF/2.0 model's sampler uv address modes to mirror/clamp respectively, and tests for them in the unit test.
2018-05-24 17:25:26 -07:00
Kim Kulling
c4c22069e1
Merge branch 'master' into master
2018-05-24 14:38:50 +02:00
Matthias Möller
e761f13c80
does not access undefined memory area anymore.
...
This will fix some Debuggers, which throw an exception, when accessing out-of-bound memory
2018-05-24 12:07:05 +02:00
smalcom
3861fb4ab5
Merge branch 'master' into qt_assimp_viewer
2018-05-24 12:36:59 +03:00
smalcom
e201fcf4f4
[-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
2018-05-24 12:25:27 +03:00
gstanlo
0c07397720
glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
2018-05-22 17:32:12 -07:00
Adrian Mark Perez
7777883fe7
Fix GenVertexNormals
2018-05-22 13:55:36 -07:00
smalcom
8abcc454ad
[F] Uninitialized variables.
2018-05-21 17:38:01 +03:00
Alexandre Avenel
84739fda0a
Fix #1970 : stl with empty solid
...
Log warning instead of stopping whole import.
2018-05-19 23:19:36 +02:00
Alexandre Avenel
6c0553d810
Add mesh name to ValidateDataStructure log
2018-05-19 23:19:25 +02:00
Alexander Gessler
caecd385b5
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-19 03:05:29 +02:00
Stanlo Slasinski
a1a17c1dda
Read and write the KHR_materials_unlit glTF/2.0 extension.
2018-05-18 14:52:02 -07:00
Kim Kulling
c788fff2b0
Merge branch 'master' into bug/exception-on-empty-mesh-after-degenerate-removal
2018-05-17 09:36:53 +02:00
Daniel Löber
9e80e18b1a
Remove dead code
2018-05-16 11:10:48 +02:00
Daniel Löber
46ed73c768
Do not throw exception on empty mesh after removal of degenerates
...
Remove mesh instead. This keeps one edge case open: nodes without mesh
references. They are kept as it is for now (they may stilol contain
transformations and child references).
2018-05-16 11:06:06 +02:00
Alexandre Avenel
2879e0d6ef
Fix typos on code using codespell
2018-05-13 16:35:03 +02:00
Kim Kulling
e3548fe850
Update glTF2Exporter.h
...
Fix typo.
2018-05-12 08:50:17 +02:00
Kim Kulling
950496c351
some minor refactorings.
2018-05-12 08:39:22 +02:00
Kim Kulling
f93ee9dace
closes https://github.com/assimp/assimp/issues/1780 : check against nullptr before accessing normal data in aiMesh instance.
2018-05-12 08:10:26 +02:00
Kim Kulling
ef605fecaa
FBX: small optimization to avoind static computation in loop.
2018-05-12 08:09:27 +02:00
Kim Kulling
c08614bbff
closes https://github.com/assimp/assimp/issues/919 : add missing cast for vs2015.
2018-05-10 09:44:31 +02:00
Kim Kulling
c160d1f7df
Merge branch 'master' into umw_dev
2018-05-09 13:03:07 +02:00
Kim Kulling
400b61b3fe
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-09 11:22:09 +02:00
Diego Lopes
700c85bbfb
_stat64 doesn't seem to exist. use __stat64!
...
Merely add an extra _ to the type name...
2018-05-08 13:01:56 -04:00
wuxq
ea2c90ae79
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-08 18:35:57 +08:00
wuxq
cc1bde0514
change the length of bufferView byteLength
...
chang the joint attribute bufferView byteLength
2018-05-08 18:31:27 +08:00
Kim Kulling
f92d4edced
Merge branch 'master' into patch-1
2018-05-08 10:22:14 +02:00
Kim Kulling
948cf4d3cc
Merge branch 'master' into master
2018-05-07 21:32:13 +02:00
A. Breust
50c5f3cb58
Fixes DXF loader false positive on FBX file
...
A binary FBX file can have an header section `FBXHeaderVersion` which starts around the 70th byte.
Therefore, the token check for DXF file was hitting true because the `SearchFileHeaderForToken` is case insensitive.
We limit the scope of the token search to the first 32 bytes.
2018-05-07 15:16:32 +02:00
Kim Kulling
ce11aa51f5
add win32-based make script.
2018-05-07 00:07:41 +02:00
Kim Kulling
327a43c26f
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-06 19:39:37 +02:00
Kim Kulling
be0203229b
Merge branch 'master' into master
2018-05-06 16:41:12 +02:00
Kim Kulling
36c6ce7431
Merge branch 'master' into master
2018-05-06 12:29:21 +02:00
Eugene Barnett
908ef3e44a
1740 Issue - Enabling and Disabling importers
...
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT will be respected by the macro
--using local variable ASSIMP_IMPORTER_ENABLED to include or exclude
--an importer
-Fixes individual importer ex: set(ASSIMP_BUILD_FBX_IMPORTER OFF)
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT is cached
--if assimp is a child cmake project, need to force cache
--from parent project
--ex: set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT CACHE INTERNAL FALSE)
2018-05-05 16:57:59 -04:00
Nicholas Woodfield
458a7ae801
Silencing compile warnings during build, all little stuff like uint to size_t or BOOL to bool.
2018-05-03 15:03:14 -04:00
Kim Kulling
b759aa63a0
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-05-03 20:33:50 +02:00
Alexis Breust
4aaf7ad547
Added name to nodes
2018-05-03 11:07:39 +02:00
LoicFr
a5791b66fe
Merge branch 'master' into master
2018-05-02 17:47:32 +02:00
LoicFr
99139e9c9e
Merge branch 'master' into master
2018-05-02 17:11:54 +02:00
kimkulling
a0bf664695
closes code/SortByPTypeProcess.cpp: fix memory leak.
2018-05-02 16:42:22 +02:00
Loïc Fricoteaux
ed86023016
Change glTF2 file extensions from gltf2/glb2 to gltf/glb in the exporter so that it matches the importer and respect the standard specifications
2018-05-02 16:13:17 +02:00
Kim Kulling
2acb513732
Merge branch 'master' into issue-1167
2018-05-02 15:45:52 +02:00
Kim Kulling
7bb2d6271b
Merge branch 'master' into fix_fbx_empty_names
2018-05-02 14:57:08 +02:00
wuxq
27d41442c9
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-02 15:28:57 +08:00
Kim Kulling
5c5226a98c
Merge branch 'master' into issue-1923
2018-05-01 21:10:52 +02:00
Kim Kulling
037a213bb4
STL-Exporter: fix division by zero in normalize method during update
2018-05-01 15:06:56 +02:00
Kim Kulling
eced86b949
some refactorings.
2018-05-01 13:41:39 +02:00
Kim Kulling
2c47717ca6
Introduce export with test for point clouds.
2018-05-01 13:28:53 +02:00
Kim Kulling
9f835ea843
closes https://github.com/assimp/assimp/issues/842 : experimental suppor for ascii stl pointcloud export.
2018-05-01 09:06:22 +02:00
Korbinian Würl
4b7b692e5e
Fix Issue #1923 : OBJ Exporter can't correctly export vertex colors
...
The indexMap for vertices now uses a combined vp + vc index
2018-04-30 16:29:22 +02:00
Trylz
6fb9ebe3c8
Apply fix
2018-04-28 23:34:07 -04:00
wuxq
7a7a706ebd
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-04-29 11:29:43 +08:00
wuxq
814b56e5e2
multi joint has bug with ReplaceData
...
multi joint has a bug in ReplaceData_joint with "bin" change
2018-04-28 15:05:21 +08:00
Korbinian Würl
1533aec21c
Fix ply exporter to be conformant to spec respecting vertex colors.
...
Vertex colors should be defined as red, green, blue, alpha instead of r, g, b, a and should have the type 'uchar' instead of 'float'
2018-04-27 22:11:36 +02:00
Sebastian Matusik
af8f9a97a9
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-04-27 12:45:47 +01:00
Sebastian Matusik
1f9d6f1ec4
Fix for blendshapes import when using the JoinIdenticalVertices optimization flag
2018-04-27 11:52:31 +01:00
Kim Kulling
e2d0c07791
Merge branch 'master' into use_log_macros
2018-04-26 22:02:18 +02:00
Kim Kulling
b877b3e10e
use correct log macro.
2018-04-26 22:01:41 +02:00
kimkulling
6a311210e7
fix another bug of misusage of the log macros.
2018-04-26 17:01:22 +02:00
kimkulling
8626b185fb
Fix misused log macros + compiler warnings.
2018-04-26 16:38:42 +02:00
kimkulling
c299755721
DXF: fix macro issues.
2018-04-26 16:13:57 +02:00
kimkulling
a5e14db19b
fix invaid macro usage.
2018-04-26 15:41:31 +02:00
kimkulling
68288782e4
Merge branch 'use_log_macros' of https://github.com/assimp/assimp into use_log_macros
2018-04-26 15:18:24 +02:00
kimkulling
75c7b15b55
Fix c++11 usage.
2018-04-26 15:05:49 +02:00
kimkulling
3d79472172
fix the build.
2018-04-26 14:36:59 +02:00
Kim Kulling
dd7d0943f6
Update glTF2Asset.inl
...
Move creation of vars to avoid useless creation in case of an error.
2018-04-26 14:24:00 +02:00
Kim Kulling
8f26b9d840
Merge branch 'master' into use_log_macros
2018-04-26 14:13:04 +02:00
kimkulling
30c20eb5fc
INtroduce new log macros.
2018-04-26 14:10:18 +02:00
Kim Kulling
972fffe70b
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-04-26 13:40:49 +02:00
wuxiaoqian
f6af6ded1f
fixed the bug of export gltf2, the JOINTS_0 componentType is Incorrect
2018-04-26 11:03:50 +08:00
wuxiaoqian
6b4caa0f12
fix export gltf2, The JOINTS_0 componentType is incorrect
2018-04-26 10:56:56 +08:00
Loïc Fricoteaux
a8077baed5
Add vertex color support to glTF2 export
2018-04-25 11:37:56 +02:00
Sergio Acereda
ce6a5e5d56
ImproveCacheLocality crashes if non triangular faces
2018-04-23 11:33:48 +02:00
kimkulling
0e15b25cd1
Next log call changes.
2018-04-20 16:23:24 +02:00
kimkulling
b6f29bf54f
Add usage of log macros, next files.
2018-04-19 17:21:21 +02:00
kimkulling
066349f36b
Add usage of log macros.
2018-04-19 16:48:43 +02:00
kimkulling
f2833539d7
closes https://github.com/assimp/assimp/issues/1784 : change so.name to keep track of the minor version of the lib.
2018-04-19 08:52:21 +02:00
Leo Terziman
c797f16b0e
In IFC, fixed parser to avoid interpretation of '##' in string as identifiers
2018-04-18 11:53:49 +02:00
Leo Terziman
6ca8423e24
Improved memory footprint of IFC loading by avoiding keeping in cache duplicated indices.
2018-04-18 11:12:40 +02:00
Arkeon
f235646030
Correction on Collada parser missing textures when the image is in CDATA
...
<image id="image-1404706686">
<init_from><![CDATA[textures\burgundy.png]]></init_from>
</image>
2018-04-13 09:36:01 +02:00
kimkulling
e57394a772
move log tools from blender to logger interface.
2018-04-12 16:09:01 +02:00
Kim Kulling
096f7e272a
Merge branch 'master' into isue_1621
2018-04-12 00:05:38 +02:00
Kim Kulling
5319974fe1
Use correct check to do a tokensearch.
2018-04-11 21:16:20 +02:00
Kim Kulling
0f9268bf01
Merge branch 'master' into issue_1893
2018-04-11 20:27:05 +02:00
kimkulling
da073f1270
closes https://github.com/assimp/assimp/issues/1893 : fix mem leak in glft2Importer.
2018-04-11 17:22:31 +02:00
kimkulling
9ca32b2373
closes https://github.com/assimp/assimp/issues/1894 : use mesh name to name exported obj node.
2018-04-11 17:04:49 +02:00
Kim Kulling
f096843c45
Merge branch 'master' into umw_dev
2018-04-08 21:42:10 +02:00
Kim Kulling
c41d459e21
add missing constructor to ensure RTTI
2018-04-08 21:27:18 +02:00
Kim Kulling
483541ee25
Merge branch 'master' into isue_1621
2018-04-06 20:54:01 +02:00
Kim Kulling
183224f045
closes https://github.com/assimp/assimp/issues/1621 : add file check for dxf file without extensions.
2018-04-06 20:51:07 +02:00
Kim Kulling
0a3fb04b04
Update ScenePrivate.h
...
add missing header
2018-04-06 16:23:59 +02:00
Kim Kulling
32b466941b
Add missig docs and fix some small review findings.
2018-04-06 12:01:22 +02:00
Kim Kulling
08ddd5c296
Export missig symbols.
2018-04-06 10:53:32 +02:00
Kim Kulling
a636146cf2
Merge branch 'master' into develop_kimkulling
2018-04-06 10:34:46 +02:00
Kim Kulling
a3cb1ef55e
Merge branch 'master' into develop_kimkulling
2018-04-06 10:32:35 +02:00
Kim Kulling
40f5f19ce0
Merge branch 'master' into issue-1219
2018-04-05 15:24:40 +02:00
James Carthew
8cb25328cb
committing all changes.
2018-04-05 17:50:30 +10:00
Edward Andrew
b8025d92fc
Merge branch 'master' into issue-1219
2018-04-04 21:12:52 +01:00
Kim Kulling
0e945b5581
Merge branch 'master' into develop_kimkulling
2018-04-04 16:32:46 +02:00
James Carthew
6147a4f50d
Updated COB importer plugin to flip normals.
2018-04-04 08:08:28 +10:00
Edward Andrew
0c035f131d
Merge branch 'master' into issue-1219
2018-04-02 14:39:13 +01:00
Kim Kulling
4d662c42b3
Add check for SSE2-support.
2018-04-02 10:27:05 +02:00
Edward Andrew
35f4e7101a
Fixed issue#1219. CalcTangentsProcess::ProcessMesh.
2018-04-02 01:46:14 +01:00
A. Breust
0624eb0e08
Merge branch 'master' into gltf2-duplicated-textures
2018-04-01 18:09:14 +02:00
Kim Kulling
d17047cfd1
Merge branch 'master' into fbx_export_ascii
2018-04-01 17:00:42 +02:00
Kim Kulling
c9bb3592ff
FBX-Importer: remove unused lookup tables for nodes.
2018-03-31 18:10:29 +02:00
Kim Kulling
f3cc2f79fc
FBX-Importer: remove unused lookup table.
2018-03-31 17:30:31 +02:00
Kim Kulling
2a5728b4c3
FBX-Importer: fix usage of deprecated include.
2018-03-31 17:25:29 +02:00
Kim Kulling
c97fb99435
closes https://github.com/assimp/assimp/issues/1855 : fix correction of node names.
2018-03-31 16:37:39 +02:00
aoowweenn
21b518e350
use memset to allow VS compiler
2018-03-31 14:44:18 +08:00
aoowweenn
1ea7230785
Handle materials with texture id < 0
2018-03-31 14:06:26 +08:00
aoowweenn
04d70dc76d
adjust encoding to fit the new utf8 library
2018-03-31 13:29:42 +08:00
Kim Kulling
4919d3da2f
closes https://github.com/assimp/assimp/issues/1836 : make documentation much more clear how to apply global scaling.
2018-03-30 16:58:11 +02:00
Alexis Breust
26ac2ffb6c
Not duplicating textures for embedded ones
2018-03-29 15:52:05 +02:00
Tommy
070acfbadd
FBX Export: relax bindpose matrix check slightly.
...
Apparently +/- 1e-5 is too strict.
2018-03-29 14:29:02 +02:00
Tommy
39d9878429
FBX Export: use ai_snprintf.
2018-03-29 13:10:41 +02:00
Tommy
4b2120ab56
FBX Export: fix for geometric transform nodes with multiple children.
2018-03-29 10:45:23 +02:00
Tommy
0dad1d0c04
FBX Export: fix Texture_Alpha_soutce typo.
2018-03-29 01:47:31 +02:00
Tommy
826243f289
Implement ascii FBX export.
...
It's available under the 'fbxa' format id.
2018-03-29 01:44:32 +02:00
Tommy
aadb413fc0
Explicit handling of an FBXExportNode edge-case.
2018-03-28 16:09:07 +02:00
Tommy
00277d93f2
Tidier FBXExportNode construction with properties.
2018-03-28 15:47:27 +02:00
Tommy
e972b73fc2
FBX Export: tidy includes
2018-03-27 13:29:03 +02:00
Tommy
ee0cdb3954
FBX Export: Tidy animation export code.
2018-03-27 13:12:15 +02:00
Tommy
57bd125839
FBX Export: implement basic animation export.
2018-03-27 11:45:03 +02:00
Tommy
2dff6e2d5b
FBXExportProperty: implement float and long array properties.
2018-03-26 18:27:15 +02:00
Kim Kulling
d810446bb2
Merge branch 'master' into patch-1
2018-03-23 19:43:58 +01:00
Kim Kulling
666e224359
Merge branch 'master' into issue_1527
2018-03-22 23:57:30 +01:00
Kim Kulling
be4c780115
Update FBXMeshGeometry.cpp
...
Fix build.
2018-03-22 23:08:25 +01:00
Kim Kulling
13ae0a0ac3
FBX: fix parse error for uv-coordinates.
2018-03-22 22:14:10 +01:00
JeffH-BMG
376586b164
Merge branch 'master' into patch-1
2018-03-22 13:09:32 -04:00
Cloud Wu
cad11df039
Fix mingw compilation
2018-03-22 16:54:12 +08:00
Kim Kulling
e01e77a6c7
Merge branch 'master' into develop_kimkulling
2018-03-21 21:20:28 +01:00
Kim Kulling
af3bba1572
fix review findings.
2018-03-20 23:38:08 +01:00
Kim Kulling
4ae7298489
Update DefaultIOSystem.cpp
...
fix typo
2018-03-20 21:59:45 +01:00
Kim Kulling
1a887a64c1
Update EmbedTexturesProcess.cpp
...
Fix typo.
2018-03-20 21:56:26 +01:00
Kim Kulling
b01594f6a8
Update EmbedTexturesProcess.cpp
...
Replace c-cast by static_cast.
2018-03-20 21:52:42 +01:00
Kim Kulling
339e33303e
Update DefaultIOSystem.cpp
...
Use static_cast instead of int.
2018-03-20 20:39:15 +01:00
Kim Kulling
d0edb94208
Update D3MFImporter.cpp
...
Use static cast instead of c-cast.
2018-03-20 20:38:03 +01:00
Kim Kulling
f898f40486
Merge branch 'master' into master
2018-03-20 20:33:17 +01:00
Kim Kulling
5814e6f9f0
Optimize some std::string usages.
2018-03-20 18:43:54 +01:00
Kim Kulling
2d7ece4ce7
Merge branch 'master' into 3mf_basematerial_support
2018-03-20 16:14:25 +01:00
Kim Kulling
e36f78482c
https://github.com/assimp/assimp/issues/1796 : return correct value on detach logger.
2018-03-20 14:53:57 +01:00
Kim Kulling
e668b97453
Merge branch 'master' into 3mf_basematerial_support
2018-03-20 14:12:00 +01:00
Kim Kulling
317f3e2a59
3MF: Export metadata.
2018-03-20 14:10:08 +01:00
Kim Kulling
b66bee8d79
Export: Copy metadata to be able to export it properly.
2018-03-20 14:09:07 +01:00
Kim Kulling
ef12eb84bb
3MF: add metadata import.
2018-03-20 10:09:47 +01:00
Marco Di Benedetto
9d813a48b0
fixed emply buffer stream write, removed some cast warnings.
2018-03-19 18:22:27 +01:00
JeffH-BMG
4841ee05c5
Merge branch 'master' into patch-1
2018-03-19 10:29:43 -04:00
Kim Kulling
f7854e4b32
Merge branch 'master' into master
2018-03-18 20:56:25 +01:00
Kim Kulling
6843b7a00c
Merge branch 'master' into patch-3
2018-03-18 17:44:21 +01:00
Sergey Gonchar
2d980c16f0
Support Maya 2018 Collada Export with blendshapes and bones controllers for a mesh
2018-03-15 21:41:40 -07:00
Kim Kulling
5cf6509fb5
closes https://github.com/assimp/assimp/issues/1120 : use euler angles for pre- and post-rotation.
2018-03-14 20:42:42 +01:00
Kim Kulling
4c023c3818
fix unittest folder for roundtriptest.
2018-03-13 21:40:23 +01:00
JeffH-BMG
546ad1c1bd
Merge branch 'master' into patch-3
2018-03-13 15:19:14 -04:00
JeffH-BMG
9e1638e813
Merge branch 'master' into patch-1
2018-03-13 15:18:50 -04:00
Kim Kulling
6b9add5594
fix compiler warning fr 64 bit
2018-03-13 18:19:10 +01:00
Kim Kulling
f11d4902c6
fix CanRead-method for the 3MF-Importer.
2018-03-13 17:50:34 +01:00
Kim Kulling
c5c0052a6c
Merge branch '3mf_basematerial_support' of https://github.com/assimp/assimp into 3mf_basematerial_support
2018-03-12 22:28:53 +01:00
Kim Kulling
c7ac32f891
fix naming readout + export.
2018-03-12 22:28:00 +01:00
Kim Kulling
a3ad45f3b3
Merge branch 'master' into 3mf_basematerial_support
2018-03-11 20:16:40 +01:00
Kim Kulling
c8ae0bbb3d
3MF: fix model folder desc.
2018-03-11 20:15:49 +01:00
Kim Kulling
017b7d1a2f
3MF: add missig tags for meta data.
2018-03-11 20:15:25 +01:00
Kim Kulling
336a09ee0e
add material reference to faces.
2018-03-09 23:35:12 +01:00
JeffH-BMG
72280463c2
Merge branch 'master' into patch-3
2018-03-09 14:40:30 -05:00
JeffH-BMG
f7469df871
Merge branch 'master' into patch-2
2018-03-09 14:40:16 -05:00
JeffH-BMG
c539dfe7a2
Merge branch 'master' into patch-1
2018-03-09 14:38:54 -05:00
Kim Kulling
6668eeb68e
Fix possible nullptr dereferencing.
2018-03-09 19:03:05 +01:00
Kim Kulling
2ca2e7e355
Merge branch 'master' into fbx_export_footer_tweak
2018-03-09 18:11:56 +01:00
Kim Kulling
69742670dd
3mf: use correct material assignment in case of multi-materials.
2018-03-09 11:40:45 +01:00
Kim Kulling
56f9069eb5
Merge branch 'master' into blender_fbx_opacity_fix
2018-03-09 08:30:23 +01:00
Kim Kulling
7f04b4dd43
Merge branch 'master' into fix/issue623
2018-03-09 00:04:28 +01:00
JeffH-BMG
cfd56a43a5
Fix compile error
...
Fixed bad cast.
2018-03-07 18:24:38 -05:00
JeffH-BMG
89a4cf9495
Respond to comments
...
Use memcpy() to read normals and vertices, to mitigate alignment issues, per comments.
2018-03-07 17:26:01 -05:00
Kim Kulling
af8839a8b5
Merge branch 'master' into fbx_export_footer_tweak
2018-03-07 19:44:38 +01:00
Tommy
9f02c8a97c
Fix default opacity of materials exported to FBX by Blender.
2018-03-07 09:15:08 +01:00
JeffH-BMG
6fd64b95c3
Fix compile error
...
Add parens to use of 'sizeof' operator
2018-03-06 15:03:44 -05:00
JeffH-BMG
5ea06e1bb6
Add support for texture file in PLY exports
...
The PLY format has an unofficial way to specify an associated texture, using the "comment TextureFile" comment line. The PLY loader supports this, but the exporter does not. The change looks for a diffuse texture in the scene's materials, and if it finds one, it adds it to the exported mesh using "comment TextureFile".
2018-03-06 14:50:02 -05:00
JeffH-BMG
0dab5c508e
STL binary Export should write 4-byte floats for vertex and normal coordinates
...
The STL binary format uses 4-byte floats. When using double-precision builds of Asset Importer, the STL exporter was writing out 8-byte double values instead..
2018-03-06 13:55:32 -05:00
JeffH-BMG
05cf8bfb2e
Fix import of binary STL files in double-precision builds
...
When ASSIMP_DOUBLE_PRECISION is used, the STL loader attempts to read 8-byte double vertex and normal values from the STL file. STL files are written using 4-byte floats, however, and the import will read past the end of the buffer, and possibly crash.
2018-03-06 13:48:11 -05:00
Daniel Kirchner
f4c37fa245
Collada: add importer property that forces the use of collada names. Closes #1375 .
2018-03-06 00:30:33 +01:00
Kim Kulling
5312ec806e
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-03-05 18:19:36 +01:00
Kim Kulling
22182a907e
Merge branch 'master' into master
2018-03-05 13:20:07 +01:00
Alexandre Avenel
15fa86f100
Set primitive_type to point when PLY is a point cloud
2018-03-04 22:43:20 +01:00
Alexandre Avenel
f053695176
Fix issue #623 PLY importer should not create faces
...
When the PLY file contains no faces, we should not create them.
2018-03-04 22:43:20 +01:00
Alexandre Avenel
d2547e84f5
Fix for undefined behavior when loading binary PLY
...
This commit fix undefined behavior reported by UBSAN when loading a binary
PLY file.
2018-03-04 22:04:31 +01:00
Tommy
701f9ccfe9
FBX Export: minor tweak to footer.
...
Should now be identical to those output by the FBX SDK.
2018-03-03 19:53:49 +01:00
Kim Kulling
8e7b7a0d87
Merge branch 'master' into master
2018-03-02 15:04:28 +01:00
Tommy
a58f8e1c1a
FBX Export: add missing 0 value to file footer.
2018-02-28 23:38:49 +01:00
Josh Faust
f07d27eb07
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-02-27 18:47:11 -08:00
Josh Faust
190190c1d7
Fix material index off-by-one error in some OBJ files (seen in a C4D export)
2018-02-27 14:58:04 -08:00
Kim Kulling
ef371bddd6
Merge branch 'master' into master
2018-02-27 18:34:34 +01:00
Kim Kulling
c0f04bf965
IMporter: fix lookup for tokens during inmemory imports.
2018-02-27 18:30:36 +01:00
Kim Kulling
e99dfdb050
fix cppcheck findings.
2018-02-25 21:03:09 +01:00
Tommy
9d9acf6840
FBX Export: allow export even when not in bind pose,
...
iff all bones have an offset matrix defined.
2018-02-25 11:45:38 +01:00
Tommy
249f1844ae
FBX Export: reconstruct full skeleton for any FBX deformers.
2018-02-25 09:53:09 +01:00
Marco Di Benedetto
72e9f3ecb9
fixed embedded texture reading.
2018-02-24 18:47:43 +01:00
Marco Di Benedetto
138b990d0a
added missing install of pbrmaterial.h
2018-02-24 17:57:42 +01:00
Marco Di Benedetto
4b7cd97fea
added support for embedded textures defined with buffer views.
2018-02-24 17:44:40 +01:00
Marco Di Benedetto
b0ac2d9daf
Merge https://github.com/assimp/assimp
2018-02-24 17:06:12 +01:00
Tommy
a9d70b2dbc
FBX Import: properly delete inverse geotrans nodes when not using them.
2018-02-24 09:37:36 +01:00
Tommy
c18a07e47f
FBX Import: Properly clean up post_nodes_chain in case of exception.
2018-02-24 08:43:36 +01:00
Tommy
b91976eead
FBX Export: handle newly-added geometric transform inverse nodes.
...
This also tidies up the imported node structure a little,
by not adding the inverse nodes if there are no child nodes.
2018-02-24 08:42:05 +01:00
Kim Kulling
5e4b2b898f
Merge branch 'master' into fbx_export_squashed
2018-02-23 23:33:43 +01:00
Kim Kulling
375dd4c179
Update D3MFImporter.cpp
...
Fix order of init list.
2018-02-23 20:34:34 +01:00
Kim Kulling
437ae0c839
Merge branch 'master' into 3mf_basematerial_support
2018-02-23 18:29:54 +01:00
Kim Kulling
606a28dbe8
Merge branch 'master' into develop_kimkulling
2018-02-23 17:54:58 +01:00
Kim Kulling
1d901f075c
3mf-importer: fix parsing of base-material color.
2018-02-23 17:49:29 +01:00
Tommy
f847d4817d
FBX Export: fix logic for determining if scale transformation is identity.
...
Previously it was comparing scale.SquareLength() to 1.0.
2018-02-21 15:29:59 +01:00
Tommy
c1f353f6c7
FBX Export: Geometric transformations always create transformation chain.
...
In combination with fb213e4b
, this fixes #1112 .
2018-02-21 14:15:03 +01:00
Kim Kulling
50b6c63594
Merge branch 'master' into develop_kimkulling
2018-02-21 13:31:32 +01:00
Kim Kulling
22dbb6c2d2
Update FileSystemFilter.h
...
- Fix typo.
-test in public metod against invalid parameters
2018-02-21 13:10:51 +01:00
Tommy
fb213e4bac
FBX Importer: apply inverse of geometric transform to child nodes.
2018-02-21 12:45:09 +01:00
Kim Kulling
7cd1a66c8b
Use correct lookup.
2018-02-20 22:08:40 +01:00
Kim Kulling
a92dbabc25
Update FileSystemFilter.h
...
Fix missing save.
2018-02-20 16:36:55 +01:00
Kim Kulling
7c33d932e3
Merge branch 'master' into master
2018-02-20 10:40:04 +01:00
Kim Kulling
d49c5b6ecf
Merge branch 'master' into fix-paint3d-vertexcolor
2018-02-20 09:23:53 +01:00
Kim Kulling
a84604f566
Merge branch 'master' into develop_kimkulling
2018-02-20 09:04:11 +01:00
Kim Kulling
f0ccff70a4
Update FileSystemFilter.h
...
Fix review findings
2018-02-20 09:03:18 +01:00
Kim Kulling
5f4539db28
Merge branch 'master' into issue_1773
2018-02-19 22:55:11 +01:00
Kim Kulling
b9a34dbc50
Merge branch 'master' into globalscale-registry
2018-02-19 20:19:17 +01:00
Kim Kulling
f78f273916
Merge branch 'master' into issue_1773
2018-02-19 15:54:46 +01:00
Tommy
1de9b3232a
Silence a clang warning.
2018-02-19 15:04:46 +01:00
Tommy
95f66f84ef
Remove constexpr for MSVC.
2018-02-19 14:33:40 +01:00
Tommy
242b5d5874
Initial FBX Export Support, sponsored by MyDidimo (mydidimo.com).
...
Supports:
* mesh data with normals and uvs
* lambert and phong materials
* file textures
* bones / skeletons
* skinning
Does not yet support:
* animations
* cameras
* lights
* embedded textures
2018-02-19 13:53:55 +01:00
Kim Kulling
219702597f
Merge branch 'master' into develop_kimkulling
2018-02-19 11:47:41 +01:00
Kim Kulling
8950504cf0
Fix import of materials.
2018-02-18 21:30:23 +01:00
Giuseppe Barbieri
58436068e7
Update BlenderScene.cpp
2018-02-16 22:16:10 +01:00
Kim Kulling
1b53c26943
Merge branch 'master' into globalscale-registry
2018-02-15 18:04:38 +01:00
Martin Buchner
a7587cb526
Merge branch 'master' into issue_1773
2018-02-15 15:31:41 +01:00
Kim Kulling
ccbcaa2ee8
fix some static-analysis findings.
2018-02-13 20:36:22 +01:00
Kim Kulling
cdfe33e3f2
Merge branch 'master' into pbrmaterial_h
2018-02-13 19:17:18 +01:00
Kim Kulling
4fb0e85d9d
Merge branch 'master' into issue_1773
2018-02-13 14:45:14 +01:00
Sergio Acereda
9a7611a93e
AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h
2018-02-12 22:33:51 +01:00
Kim Kulling
331e67c32d
3mf: introduce first prototype for basematerial support.
2018-02-12 22:07:12 +01:00
Sergio Acereda
8a4fd2f947
globalScale process not registered
2018-02-12 21:51:40 +01:00
Kim Kulling
78173177e8
closes https://github.com/assimp/assimp/issues/1564 : remove copy constructor.
2018-02-12 21:45:47 +01:00
mbuchner
1299905026
Make FileSystemFilter forward all virtual functions to wrapped IOSystem instance
...
This makes it possible to override those functions. Previously the
default implementation was always used.
Fixes #1773
2018-02-12 12:13:44 +01:00
Giuseppe Barbieri
f00d450d25
Update BlenderDNA.inl
2018-02-11 17:43:49 +01:00
Marco Di Benedetto
c874fd8ae2
changed std::to_string to to_string.
2018-02-09 16:18:49 +01:00
Marco Di Benedetto
affedc139e
Merge https://github.com/assimp/assimp
2018-02-09 15:54:34 +01:00
Turo Lamminen
ebdad4f883
Ogre: Avoid creating function-scoped static constants
...
They're causing false positive race condition messages from Helgrind
2018-02-09 15:40:28 +02:00
Kim Kulling
4e4098f1fc
Merge branch 'master' into issue_567
2018-02-08 20:29:47 +01:00
Kim Kulling
674a47dd3e
closes https://github.com/assimp/assimp/issues/567 : prevend dependency cycle
2018-02-08 20:24:18 +01:00
Kim Kulling
c7ea536351
closes https://github.com/assimp/assimp/issues/1386 : fix undefined behaviour in compare function.
2018-02-07 20:21:05 +01:00
Max Vollmer
990dc983ed
Issue #1776 Fixed potential crash bug in ObjectCompare, because it didn't follow strict weak ordering. As counter-intuitive as it seems, a comparator must return false for equal values. The C++ standard defines and expects this behavior: true if lhs < rhs, false otherwise.
2018-02-07 10:48:39 +01:00
Kim Kulling
277fa2da93
Merge branch 'master' into memleaks
2018-02-07 00:38:23 +01:00
Kim Kulling
57c1fe5954
x-parser: fix the crash.
2018-02-06 23:59:46 +01:00
Giuseppe Barbieri
4736160b79
Update BlenderDNA.h
2018-02-06 22:36:37 +01:00
Kim Kulling
495ae70cc5
XFileParser: release x-file-based scene when throwing an exception.
2018-02-06 19:21:56 +01:00
Turo Lamminen
17b26c91e2
OpenGEX: Use std::unique_ptr to fix some memory leaks
2018-02-06 20:20:16 +02:00
Turo Lamminen
5ce9ece0cc
OpenGEX: Replace std::copy with explicit loop
2018-02-06 20:08:49 +02:00
Turo Lamminen
aa434b9566
OpenGEX: Add comment about pointer ownership
2018-02-06 20:05:02 +02:00
Turo Lamminen
ef891fb850
LWO: Move some assignments to make it clearer when the thing should be moved
2018-02-06 19:58:05 +02:00
Turo Lamminen
3b68ffe363
LWO: Use C++11 auto for easier refactoring
2018-02-06 19:50:42 +02:00
Turo Lamminen
9344074a04
MDLLoader: Replace raw pointer with vector to fix a memory leak
2018-02-06 19:22:32 +02:00
Turo Lamminen
1aed63afb7
OpenGEX: Replace another raw pointer with vector to fix a memory leak
2018-02-06 19:13:54 +02:00
Turo Lamminen
880be5403f
OpenGEX: Replace raw pointer with vector to fix a memory leak
2018-02-06 19:03:47 +02:00
Turo Lamminen
c42dd9104c
BlenderLoader: Fix memory leak
2018-02-06 18:52:23 +02:00
Turo Lamminen
d284d107e7
XGLLoader: Fix a memory leak
2018-02-06 18:43:51 +02:00
Kim Kulling
dceb7257dd
Update XFileParser.cpp
...
Fix the build.
2018-02-05 13:53:06 +01:00
Kim Kulling
eb23946fe7
Update XFileParser.cpp
...
Fix alignment for float and double.
2018-02-05 13:44:19 +01:00
Kim Kulling
ff556027ef
X: fix some review findings.
2018-02-05 00:33:41 +01:00
Kim Kulling
3685791e0d
closes https://github.com/assimp/assimp/issues/1729 : check for bit flip when unsigned int overflow happens in x-file parsing.
2018-02-04 22:15:18 +01:00
Kim Kulling
1a9f17e13d
Merge branch 'master' into issue_774
2018-02-04 18:33:22 +01:00
Kim Kulling
c5157bc471
fbx: global settings use float instead of double.
2018-02-04 17:13:58 +01:00
Kim Kulling
37d352622b
closes https://github.com/assimp/assimp/issues/774 : use correct type for unitscale in fbx.
2018-02-04 16:42:36 +01:00
Turo Lamminen
5278e1a5f8
CSM: Fix a possible memory leak by using std::unique_ptr
2018-02-03 17:52:25 +02:00
Turo Lamminen
cfcaf3e97b
BVH: Initialize all members of Node in constructor
2018-02-03 17:38:30 +02:00
Turo Lamminen
da19ed0b2a
BaseImporter: Remove dead condition
...
operator new never returns NULL, it throws exception on allocation failure
2018-02-03 17:25:31 +02:00
Turo Lamminen
be865ae613
LimitBoneWeightsProcess: Initialize all members of Weight in constructor
2018-02-03 17:19:27 +02:00
Turo Lamminen
9397932e4f
PretransformVertices: Rearrange some assignments to clarify things
2018-02-03 17:08:25 +02:00
Kim Kulling
d47f34344e
closes https://github.com/assimp/assimp/issues/1752 : move guard over include statement.
2018-02-03 08:46:03 +01:00
Kim Kulling
58d1ef6492
Merge branch 'master' into unzipExt
2018-02-01 19:21:09 +01:00
Kim Kulling
a1963feab7
Merge branch 'master' into warning4221
2018-01-31 20:27:45 +01:00
Kim Kulling
2714e146e0
Update OgreXmlSerializer.cpp
...
- Make constats static
- add asserts to check against nullptr dereferencing
2018-01-31 09:57:34 +01:00
Sergio Acereda
8f99c1a0be
including <unzip.h> instead of <contrib/unzip/unzip.h>
2018-01-30 22:13:44 +01:00
Kim Kulling
46e9d1321d
Merge branch 'master' into warning4221
2018-01-30 21:41:44 +01:00
Turo Lamminen
388ec8461c
Ogre: Change OgreXmlSerializer::ReadAttribute parameter from std::string to pointer
2018-01-30 20:12:46 +02:00
Turo Lamminen
cfc9a69512
Ogre: Don't create std::strings in global scope where char pointer will do
2018-01-30 20:03:28 +02:00
Turo Lamminen
0c66b3902e
Ogre: Avoid creating static std::strings
...
They're causing false positive race condition messages from Helgrind
2018-01-30 19:47:15 +02:00
Turo Lamminen
12396d0ce3
Ogre: Change OgreXmlSerializer::HasAttribute parameter from std::string to pointer
...
It's immediately passed via string pointer and in most places
it's already a raw string constant.
2018-01-30 19:42:58 +02:00
Sergio Acereda
be33feba44
Warning LNK4221 when not building exporter.
2018-01-29 12:39:40 +01:00
Kim Kulling
bd29fe73fa
Merge branch 'master' into new_license_dates
2018-01-28 20:16:17 +01:00
Kim Kulling
b049933d2f
update license dates.
2018-01-28 19:42:05 +01:00
Turo Lamminen
e0cbd92da4
ASE: Delete BaseNode constructor which doesn't take name
2018-01-27 18:48:57 +02:00
Turo Lamminen
4b20e9712c
ASE: Explicitly pass "DUMMY" as Dummy node name
2018-01-27 18:48:57 +02:00
Turo Lamminen
2d1bd1eec4
ASE: Delete Camera default constructor
2018-01-27 18:48:57 +02:00