kkulling
789a2bdd36
Move stuff into def.h
2019-10-11 09:47:31 +02:00
Robikz
81d125a2cc
dllexport ASSIMP_API in all Windows compilers, not just MSVC
...
This fixes a problem mentioned in issue #2685 where the libassimp.dll
compiled with MinGW doesn't export any symbols.
2019-10-06 19:02:41 +02:00
Victor Cebollada
e0fee3d87b
gltf2.0 importer - Support for mesh morph animations added.
...
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
2019-09-25 09:58:23 +01:00
Kim Kulling
ab3c17419e
fix warning
2019-09-22 12:27:44 +02:00
Kim Kulling
94c488d7ea
fix compiler warnings.
2019-09-22 10:15:44 +02:00
Kim Kulling
69087abc56
Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor.
2019-09-21 16:36:22 +02:00
Kim Kulling
f5dcd5060f
add missing namespace."
2019-09-17 22:11:58 +02:00
Kim Kulling
2edcf82f5a
add missing include.
2019-09-17 21:58:46 +02:00
Kim Kulling
8b95479bb0
closes https://github.com/assimp/assimp/issues/2598 : introduce getEpsilon
2019-09-15 19:25:37 +02:00
Kim Kulling
28d0300dbe
Merge branch 'master' into gltf_add_ortho_cam
2019-09-11 09:32:14 +02:00
Kim Kulling
d91eebf347
Add ortho camera.
2019-09-10 22:13:54 +02:00
RevoluPowered
ddc26e1c46
Added maya stingray support for textures
2019-09-08 19:15:27 +01:00
RevoluPowered
da97f1be79
Implemented basic PBR materials into assimp.
...
This adds the following texture types:
- BASE_COLOR
- NORMAL_CAMERA
- EMISSION_COLOR
- METALNESS
- DIFFUSE_ROUGHNESS
This is the first small change required.
We only support maya right now.
2019-09-08 19:15:27 +01:00
Mike Samsonov
873a358ce4
A crash in the aiMesh descructor
2019-09-05 11:44:02 +01:00
Gordon MacPherson
abdd853ca5
FIX missing update call for scale to post process
2019-08-27 15:50:50 +01:00
Gordon MacPherson
db8606ba57
Fix typo
2019-08-21 23:32:31 +01:00
Gordon MacPherson
0d29203e24
Prototype unit system for assimp generic enough to be used across formats.
2019-08-21 21:41:41 +01:00
Kim Kulling
7ee7946dc5
Update scene.h
...
use #include <cstdlib> only if the compiler is used to compile c++ code.
2019-08-18 09:40:13 +02:00
Kim Kulling
a9b4909a2f
Merge branch 'master' into patch-1
2019-08-14 21:21:18 +02:00
Kim Kulling
a2ee19e86d
Merge branch 'master' into collada_zae
2019-08-14 20:02:53 +02:00
Kim Kulling
4c1e8fe9c3
Update config.h.in
...
closes https://github.com/assimp/assimp/issues/2570 : fix a typo.
2019-08-09 20:30:12 +02:00
follower
1e6eac9e65
Fix error when building assimp on older Mac OS X version.
...
Prevents this error when building with Mac OS X 10.9 SDK:
error: no member named 'atoi' in namespace 'std'; did you mean simply 'atoi'?
2019-08-02 04:44:21 +12:00
RichardTea
9b78060a4a
Add copyright headers to ZipArchiveIOSystem
2019-07-25 10:14:42 +01:00
Kim Kulling
41ea607739
Merge branch 'master' into collada_zae
2019-07-20 14:12:18 +02:00
kimkulling
8f74508e40
Fix missing doc in config.h
2019-07-12 16:28:36 +02:00
kimkulling
53c0f91305
Add unittest for json.
2019-07-12 16:08:51 +02:00
RichardTea
2c7f607e7c
Create ZipArchiveIOSystem
...
Moved IOSystem Unzip functionality out of D3MF Importer into include/assimp
Cleaned up and more efficient:
Don't map the archive until the caller opens a file or requests the contents list
Don't extract any files until they are opened
Store the location of the data within the ZIP and extract it later if the file is opened.
2019-07-12 11:22:17 +01:00
Kim Kulling
ae7b1f1a77
Merge branch 'master' into kimkulling_dev
2019-07-03 18:28:15 +02:00
Kim Kulling
96f16c7aea
closes https://github.com/assimp/assimp/issues/2527 : use correct macro for Assimp-exporter.
2019-07-02 19:48:53 +02:00
Martin Liska
ab55fb27c3
Fix a GCC 9 warning:
...
assimp/include/assimp/material.inl: In member function 'aiReturn aiMaterial::Get(const char*, unsigned int, unsigned int, aiColor3D&) const':
assimp/include/assimp/material.inl:176:33: error: implicitly-declared 'aiColor3D& aiColor3D::operator=(const aiColor3D&)' is deprecated [-Werror=deprecated-copy]
176 | pOut = aiColor3D(c.r,c.g,c.b);
2019-07-02 13:38:04 +02:00
Kim Kulling
af199c50aa
Merge branch 'master' into issue_2456_text_formats_precision
2019-06-26 17:31:11 +02:00
Kim Kulling
d7e442f78a
Add missing file.
2019-06-24 21:48:52 +02:00
Kim Kulling
1952144445
Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev
2019-06-24 21:46:05 +02:00
Kim Kulling
26bd54ae0b
PostProcesswing: add gen-aabb process to postprocessing.
2019-06-23 20:24:32 +02:00
RichardTea
bf252c4452
Add configuration of text format precision
...
Define ASSIMP_AI_REAL_TEXT_PRECISION
8 when ai_real is float
16 when ai_real is double
2019-06-20 18:11:11 +01:00
Rahul Sheth
dab8041bcd
rewrite include paths for Hunter packages
2019-06-13 21:32:36 -07:00
Kim Kulling
fe4fd00a82
Merge branch 'master' into slow_xml_load
2019-06-03 22:58:02 +02:00
Mark Gillard
dff92d7733
quality-of-life improvements for Visual Studio
2019-05-27 21:14:50 +03:00
RichardTea
45c12cd5fb
Update irrXMLWrapper.h
...
Use std::find to find and remove null characters from XML
2019-05-20 13:49:56 +01:00
Matias
575ef4d927
Added support for embedded textures to the FBXExporter (both binary and ASCII). Also made the FBX-namespaces more consistent (we had both Assimp::FBX:: and FBX::). Since we seem to support two types of embedded texture references (both asterisk+texture_id and filepath) I made the exporter use aiScene::GetEmbeddedTexture for looking up texture reference and integrated @loebl 's modification of the function to support the old ("*1") type of references ( https://github.com/loebl/assimp/commit/e217358 )
2019-05-09 14:50:22 +02:00
Kim Kulling
4155f005be
Add implementation to convert from cm to m.
2019-05-06 21:21:58 +02:00
Kim Kulling
02324123e5
Fix typo in comment.
2019-05-06 19:15:28 +02:00
Kim Kulling
1203d4658c
Add missing doc.
2019-05-06 18:44:30 +02:00
Kim Kulling
eb1a2586c3
add missing define in config.h.in
2019-05-05 17:44:15 +02:00
Kim Kulling
0b9c72fa94
Merge branch 'master' into collada_metadata
2019-04-29 18:49:31 +02:00
Jeongseok Lee
bcd17481e5
Fix element access operator of aiColor4D
2019-04-28 22:16:20 -07:00
RichardTea
2a3626577f
Merge pull request #2 from assimp/master
...
Update to Assimp Master 0973f50
2019-04-08 14:06:36 +01:00
Matias
4884cf2172
issue_2393: Added TransparencyFactor material key
2019-04-03 12:35:09 +02:00
Kim Kulling
145c3d1589
add missing changes.
2019-03-13 19:35:36 +01:00
Kim Kulling
0a731a0bff
closes https://github.com/assimp/assimp/issues/934 : introduce material keys for shader types.
2019-03-13 19:32:13 +01:00
RichardTea
7d7574f189
Merge branch 'master' into ETC_Inc
2019-03-05 12:07:10 +00:00
Kim Kulling
206004c7d6
introduce simple skin-test +some findings.
2019-02-25 22:06:24 +01:00
Kim Kulling
0810b2d51b
Merge branch 'master' into ETC_Inc
2019-02-15 10:20:30 +01:00
kimkulling
a06133ab52
Update copyrights.
2019-01-30 09:41:39 +01:00
Kim Kulling
4c2898c82b
Merge branch 'master' into issue_2251
2019-01-28 10:06:44 +01:00
Kim Kulling
5d6fc7a557
Closes https://github.com/assimp/assimp/issues/2251 : introduce AI_CONFIG_PP_FID_IGNORE_TEXTURECOORDS to avoid removing textures.
2019-01-27 21:05:58 +01:00
Kim Kulling
3aa5a61516
Merge branch 'master' into ETC_Inc
2019-01-23 19:53:43 +01:00
Kim Kulling
b04ed67288
Update MemoryIOWrapper.h
...
Make code more readable.
2019-01-22 17:22:18 -08:00
Kim Kulling
ad18cd9660
Update MemoryIOWrapper.h
...
Fix leak.
2019-01-22 11:13:26 +01:00
Adrian Perez
87112eefae
Fill in rest of interface; switch created_stream to a unique_ptr
2019-01-21 14:37:33 -08:00
Adrian Perez
8191080986
Adapt MemoryIOSystem to delegate unhandled calls to shadowed IO system
2019-01-21 14:14:48 -08:00
Richard
3c651be640
Exporter::ExportToBlob() Pass on preprocessing and properties. Issue #2302
2019-01-17 13:55:05 +00:00
rickomax
35a044bda3
Various additions/fixes (FBX blend-shapes support added)
...
Added animMesh name assignment at ColladaLoader
Fixed animMesh post-processing on ConvertToLhProcess (blend-shapes weren't being affected by post-processing)
Added WindowsStore define. This is used to change some incompatible WinRT methods
Added FBX blend-shapes and blend-shapes animations support
Added Maya FBX specific texture slots parsing
Added extra FBX metadata parsing
Added GLTF2 vertex color parsing
Fixed IFC-Loader zip-buffer reading rountine
Fixed OBJ file parsing line-breaker bug
Fixed IOStreamBuffer cache over-read bug
Added mName field to aiAnimMesh
Reverted EmissiveFactor, TransparencyFactor and SpecularFactor assignment on FBXConverter. Really, the commit #817 breaks a lot of old code.
2019-01-06 16:37:30 -02:00
Kim Kulling
96032ca341
Merge branch 'master' into Coverity-findings
2018-12-31 12:16:55 +01:00
Kim Kulling
425a784b23
fix finding: possible override.
2018-12-31 12:16:20 +01:00
Kim Kulling
281c191367
fix streamreader::end definition for iterators.
2018-12-30 10:44:43 +01:00
Kim Kulling
dd21e4023e
Merge branch 'master' into kimkulling-issue_2212
2018-12-01 09:49:03 +01:00
Kim Kulling
b16f7c98c0
Merge branch 'master' into dev
2018-11-30 09:25:30 +01:00
wxyu
19521d222b
Issue 1117: Smd load multiple animations
...
Read an animation list from a file
2018-11-30 14:42:05 +08:00
wxyu
8c2e975508
Fix smd animation mess
...
aiMatrix4x4t<TReal>::FromEulerAnglesXYZ modified to row order
2018-11-30 14:42:05 +08:00
Martin Jeřábek
4f767ecd13
Apply suggestions from code review
...
* make the copy constructors explicitly defaulted
* split compound assert
2018-11-28 14:19:46 +01:00
Martin Jeřábek
65a79029ec
eliminate some compiler warnings by making copy constructors implicitly defaulted
...
Addresses #2222
2018-11-26 12:06:38 +01:00
Martin Jeřábek
430fe98c53
AssbinLoader: hardening, exception safety
...
Fixes potential memory leaks and crashes on malformed input.
2018-11-26 12:06:08 +01:00
Kim Kulling
3f85a2ca07
Update vector2.h
...
Remove unused include to fix xcode build.
2018-11-13 16:11:13 +01:00
Kim Kulling
b6af80f2fd
closes https://github.com/assimp/assimp/issues/2199 : introduce first version for exporter.
2018-11-12 22:26:10 +01:00
escherstair
e97d07ce82
add clang to pushpack1.h
2018-11-08 09:25:48 +01:00
d
6d1dee606a
integrated DropFaceNormals process (cmake, poststepregistry)
2018-10-29 16:26:50 +01:00
d
95c0deaaff
added DropFaceNormals process
2018-10-29 16:23:11 +01:00
Matthias Moulin
716205fde0
Replaced "../Include/" include from irrXMLWrapper.h
2018-10-06 15:22:10 +02:00
Kim Kulling
abfc8fd048
Update texture.h
...
Fix array init for older compilers.
2018-09-21 18:51:45 +02:00
Kim Kulling
662f7086e3
Update types.h
...
Fix VS2013: array initialization does not work.
2018-09-21 18:46:30 +02:00
kimkulling
f75bf6d99c
MAke noexcept compiler-specific.
2018-09-21 16:25:27 +02:00
kimkulling
f818a909e5
Fix static-code-analysis findings.
2018-09-21 16:07:09 +02:00
Kim Kulling
6ee9b07c49
closes https://github.com/assimp/assimp/issues/212 : introduce unittest for line-splitter, will validate that the current behaviour is correct.
2018-09-16 17:13:34 +02:00
Kim Kulling
4f7bacd108
Collada: some reformatting + minor findings.
2018-09-11 20:01:16 +02:00
Turo Lamminen
c3d8464a37
Remove aiCreateAndRegisterDefaultMaterial, it's completely wrong
2018-09-10 16:41:12 +03:00
Kim Kulling
c3d043e761
FBX: some refactorings.
2018-08-09 21:51:53 +02:00
kimkulling
9a6b07e522
closes https://github.com/assimp/assimp/issues/1724 : add default material access to the material API.
2018-07-25 15:11:24 +02:00
Max Vollmer
52c017b595
Added check to BaseImporter::SearchFileHeaderForToken making sure that a detected token is not in fact just a fraction of a longer token. Microsoft exported binary gltf files were detected as OBJ, because the "gltf " in the string "Microsoft GLTF Exporter 2.4.1.7" was detected as the token "f ". I added a new bool parameter to the method enabling this check. It's default false, and only ObjFileImporter sets it to true, so no other code should be affected.
2018-06-25 12:05:37 +02:00
Sebastian Maisch
fbdb4b17fd
Merge branch 'force_generate_normals'
...
# solved Conflicts:
# code/GenFaceNormalsProcess.cpp
# code/GenVertexNormalsProcess.cpp
2018-06-04 10:51:12 +02:00
Sebastian Maisch
f15dcf7663
Added forced generation of normals with extra flag.
2018-06-01 17:32:02 +02:00
Turo Lamminen
6aa32b41a1
Replace type punning with explicit memcpys
2018-06-01 12:05:54 +03: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
8d42b31e20
Update metadata.h
...
Replace type pronning by a simple memcpy operation.
2018-05-08 09:46:32 +02:00
Kim Kulling
948cf4d3cc
Merge branch 'master' into master
2018-05-07 21:32:13 +02: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
Kim Kulling
037a213bb4
STL-Exporter: fix division by zero in normalize method during update
2018-05-01 15:06:56 +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
Sebastian Matusik
af8f9a97a9
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-04-27 12:45:47 +01:00