Commit Graph

875 Commits (b1f3c48551093f8ac2b2c3b508468fc0e0669667)

Author SHA1 Message Date
Kim Kulling bd2ffc8d58 Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml 2020-02-03 21:19:30 +01:00
Kim Kulling c1fcee9c5a XMl-Migration: Migration of IrrMesh. 2020-02-03 21:19:03 +01:00
Kim Kulling 02df65d541
Merge branch 'master' into pugi_xml 2020-01-28 13:13:47 +01:00
Kim Kulling 8ef106e185 xml-migration: introduce xmlnode. 2020-01-27 22:11:27 +01:00
Marc-Antoine Lortie 770c822621 Updated places to achFormatHint referencing array size. 2020-01-23 15:26:49 -05:00
Kim Kulling 02acb3f8c2 Merge branch 'master' into pugi_xml 2020-01-23 21:26:04 +01:00
Kim Kulling a905303764 IrrXml: replaced irrXml by pugixml. 2020-01-23 21:16:10 +01:00
Marc-Antoine Lortie 4e7e47bd43 Updated copyright dates.
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".

Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".

Changed copyright end year to 2020 in LICENCE.rtf.

Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
2020-01-20 08:53:12 -05:00
RichardTea ae7a0aa6ef
Merge branch 'master' into collada_modeller_metadata 2020-01-02 13:25:04 +00:00
Marc-Antoine Lortie eed0bd3ef6 Added support to load Half-Life 1 MDL files.
Added code to use Half-Life 1 MDL loader in MDLLoader.cpp.
Added Half-Life 1 MDL loader files to CMakeLists.
Added new options in config.h to use with Half-Life 1 MDL loader.
2019-12-16 10:26:46 -05:00
RichardTea f498a395e4 Add common metadata to Collada
Also add AI_METADATA_SOURCE_COPYRIGHT common metadata
2019-12-09 14:05:41 +00:00
Kim Kulling c1706d9bf8
Update metadata.h
Fix possible crashes.
2019-12-06 21:24:04 +01:00
Kim Kulling b2ab3fa35e
Merge branch 'master' into ModellerMetaData 2019-12-06 21:19:29 +01:00
Malcolm Tyrrell a2f8c84c6c Fix deletion issue in aiMetadata::Add. 2019-12-05 17:06:28 +00:00
Malcolm Tyrrell 24f0a400b7 Extra comments. 2019-12-05 15:11:46 +00:00
Malcolm Tyrrell 894b8e3519 Initial version 2019-12-05 12:32:22 +00:00
Gordon MacPherson 505769935e
Merge branch 'master' into remove-cout-2797 2019-12-04 22:38:50 +00:00
RichardTea e5b065da3e Formatter is a stringstream
Used wrong API. Sorry about that.
2019-12-03 13:35:53 +00:00
RichardTea 496382982a Remove cout calls from FBX, LWO and B3D
Fixes #2797
2019-12-02 11:56:55 +00:00
Mike Samsonov 631da3a3d1
Merge branch 'master' into preserve_error_string 2019-12-02 10:35:29 +00:00
Loïc 5cfb0fd633 Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags 2019-11-22 18:27:34 +01:00
Mike Samsonov 80f5283b2f Error string of Importer should contain a message in case of an exception 2019-11-18 16:57:01 +00:00
Justin Carpentier 28a9fb31fd
Merge branch 'master' into topic/c++11 2019-11-10 13:20:05 +01:00
Kim Kulling aa25c815bd closes https://github.com/assimp/assimp/issues/1320: make sure build works with all exporter disabled. 2019-11-10 09:47:50 +01:00
Justin Carpentier 031d3b648e
defs: use noexcept only for C++11 and more 2019-11-10 08:23:17 +01:00
RevoluPowered 5155efe888 Fixed bitmask issue
We are approaching the limit for the number of post processes
2019-10-27 14:16:39 +00:00
RevoluPowered 9c8d835704 Explicitly use nullptr 2019-10-27 14:16:39 +00:00
RevoluPowered 514257f587 Added unit tests for ArmaturePopulate when used (added huestos model to tests)
Added clear documentation for this too to explain, you need to enable it to make it available

Signed-off-by: RevoluPowered <gordon@gordonite.tech>
2019-10-27 14:16:39 +00:00
RevoluPowered 46cdd81d75 Added ArmaturePopulate scale process for all formats 2019-10-27 14:16:39 +00:00
RevoluPowered 93efe4197a Removed redundant rest matrix and fixed assert compile error 2019-10-27 14:16:39 +00:00
RevoluPowered 168ae22ad4 Implemented easy armature lookup
This lets you directly retrieve the node a bone links to and informs you of the armature directly

This also fixes a bug with bone name being made unique which causes them to become not 1:1 what the modeller has imported.
2019-10-27 14:16:39 +00:00
Kim Kulling b8321925c3
Merge branch 'master' into mingw-fix-2685 2019-10-27 10:43:00 +01:00
Paul Arden e6a051d953 Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678. 2019-10-16 19:06:57 +11:00
Kim Kulling d3ddf8de60
Merge branch 'master' into mingw-fix-2685 2019-10-12 11:24:33 +02:00
kimkulling 33af183bb8 Cleanup the public headers. 2019-10-11 13:27:36 +02:00
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
Sebastian Matusik 1f9d6f1ec4 Fix for blendshapes import when using the JoinIdenticalVertices optimization flag 2018-04-27 11:52:31 +01:00
kimkulling 30c20eb5fc INtroduce new log macros. 2018-04-26 14:10:18 +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 e57394a772 move log tools from blender to logger interface. 2018-04-12 16:09:01 +02:00
Kim Kulling 3bd80a2537 closes https://github.com/assimp/assimp/issues/1881: make template-based get and put in streamreader/writer public. 2018-04-06 12:05:30 +02:00
Kim Kulling d17047cfd1
Merge branch 'master' into fbx_export_ascii 2018-04-01 17:00:42 +02: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
Tommy e549705af0 StreamWriter: add a PutChar method to write a single char. 2018-03-28 21:38:22 +02:00
Kim Kulling 13ae0a0ac3 FBX: fix parse error for uv-coordinates. 2018-03-22 22:14:10 +01: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 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 317f3e2a59 3MF: Export metadata. 2018-03-20 14:10:08 +01:00
Marco Di Benedetto 9d813a48b0 fixed emply buffer stream write, removed some cast warnings. 2018-03-19 18:22:27 +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 6668eeb68e Fix possible nullptr dereferencing. 2018-03-09 19:03:05 +01: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 bdb3a73486
Merge branch 'master' into moffsetmatrix_documentation 2018-02-23 21:13:35 +01:00
Kim Kulling d00c4a54e6
Update fast_atof.h
fix typo
2018-02-23 18:59:38 +01:00
Kim Kulling 437ae0c839
Merge branch 'master' into 3mf_basematerial_support 2018-02-23 18:29:54 +01:00
Kim Kulling 9c663e9630 fast_a_to_f: add some brackets. 2018-02-23 18:14:46 +01:00
Kim Kulling 1d901f075c 3mf-importer: fix parsing of base-material color. 2018-02-23 17:49:29 +01:00
Kim Kulling 7c2f7c02ab
Merge branch 'master' into moffsetmatrix_documentation 2018-02-20 17:53:22 +01:00
Kim Kulling 219702597f
Merge branch 'master' into develop_kimkulling 2018-02-19 11:47:41 +01:00
Tommy 24d452e27c Fix aiBone->mOffsetMatrix documentation, which was incorrect.
Also elaborated a bit on what mOffsetMatrix is, and what it is for.
2018-02-19 11:34:26 +01:00
Kim Kulling 58c653c874
Merge branch 'master' into streamwriter_improvements 2018-02-17 16:35:33 +01:00
Sergio Acereda b9e60e674e define missing type,N params 2018-02-16 12:23:21 +01:00
Tommy c4ff978a2f Some StreamWriter improvements / additions.
Added the following functions:
 * Flush() to flush the internal StreamWriter buffer to the stream
 * Tell() gives the current stream position
 * Seek() seeks to a given offset in the stream
 * PutString(aiString&) to write an aiString
 * PutString(std::string&) to write a std::string
2018-02-16 12:06:16 +01:00
Kim Kulling b01795e453 Merge branch 'master' into develop_kimkulling 2018-02-13 20:37:02 +01:00
Kim Kulling f9b121c415 Merge branch 'develop_kimkulling' of https://github.com/assimp/assimp into develop_kimkulling 2018-02-13 20:36:59 +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 5ac415ff62
Merge branch 'master' into issue_1781 2018-02-13 13:11:03 +01:00
Kim Kulling 11a3ee109e
Update fast_atof.h
Remove unused variable.
2018-02-13 11:36:05 +01:00
Sergio Acereda 9a7611a93e AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h 2018-02-12 22:33:51 +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 76b981aa2a Make MemoryIOStream::Seek accept pos=length as valid
Fixes assimp/assimp#1781.
2018-02-12 10:52:49 +01:00
Turo Lamminen 123b9ca71a Initialize all members of aiMeshKey in constructor 2018-02-03 16:54:19 +02:00
Turo Lamminen e21b79a8bf Mark Importer assignment operator deleted 2018-02-03 16:45:07 +02:00
Turo Lamminen b0b125dfe6 Initialize all members of aiVertexWeight in constructor 2018-02-03 16:34:40 +02:00
Turo Lamminen 82980c8a9c Add missing assignment operator to aiBone 2018-02-03 16:24:45 +02:00
Turo Lamminen a64d515505 Fix varible shadowing issue 2018-02-03 16:04:14 +02:00
Turo Lamminen 6aafc58797 Add missing assignment operator to aiString 2018-02-03 15:51:20 +02:00
Tommy 35f2d8c907 Fix Matrix4x4t Decompose to rotation vector.
The calculation of the rotation matrix was for left-handed
coordinates with row-vectors, but assimp uses right-handed
coordinates and column-vectors.
2018-02-01 18:11:14 +01:00
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
Kim Kulling 6cde21bf2f
Merge branch 'master' into doc/find_degenerates_parameters 2018-01-25 20:34:28 +01:00
Daniel Löber cec006f74b Add note to aiProcess_FindDegenerates about AI_CONFIG_PP_FD_CHECKAREA 2018-01-25 14:56:37 +01:00
Kim Kulling 1037ac5b93
Merge branch 'master' into issue_1721 2018-01-24 21:57:53 +01:00
Kim Kulling 0b15d5cd46 closes https://github.com/assimp/assimp/issues/1721: set camera parameters instead of nonsense. 2018-01-24 21:20:34 +01:00
carmenfan 5b948e9cca add const to GetEmbeddedTexture 2018-01-24 11:32:58 +00:00
kim kulling 8ac1de3287 closes https://github.com/assimp/assimp/issues/1390: aiScene now stores metadata as well. 2018-01-23 15:12:57 +01:00
BuildTools f88572f572 fix includes 2018-01-15 19:14:44 -08:00
BuildTools d0c92e30be conflict resolution again, temp. move LogAux.h 2018-01-15 19:07:33 -08:00
Kim Kulling 0fff3b1232
Merge branch 'master' into master 2018-01-08 15:36:03 +01:00
Alexis Breust 559bc38e5d Embedding images post-process 2018-01-08 09:26:52 +01:00
Christian Meurin 5ef13e7b38
Merge branch 'master' into master 2018-01-07 11:34:18 -08:00
Christian Meurin 7b5c543b82
Merge branch 'master' into master 2018-01-06 14:48:23 -08:00
Kim Kulling abc01bcdf0 closes https://github.com/assimp/assimp/issues/1574: add API to get name of current branch. 2018-01-06 21:52:58 +01:00
Kim Kulling 01081765ad closes https://github.com/assimp/assimp/issues/1638: use memcpy instead of dynamic_cast. 2018-01-06 18:03:27 +01:00
BuildTools 66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Kim Kulling bd81869794 Fix some minor findings. 2018-01-01 20:57:59 +01:00