Commit Graph

611 Commits (c3e6a01397ad3fee54d4a9b7aa0d256429db60f8)

Author SHA1 Message Date
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
Kim Kulling 2294390917
Merge branch 'master' into iosystem-patch 2017-12-20 09:57:54 +01:00
rickomax 9c9e7a2e82 Fixed char comparision
Fixed char comparision
2017-12-18 19:18:11 -02:00
rickomax 987d315089 Fixed config file
Fixed config file
2017-12-18 18:53:25 -02:00
rickomax 4623c2f14c FBX Embedding Fix
FBX files may use a texture reference from an embedded texture that hasn't been loaded yet. This patch fixes this issue, storing all texture filenames, that can be acessed later via "scene::GetEmbeddedTexture", when all textures are already loaded.
Some warnings have been added to other file formats that uses embedded data.
2017-12-18 18:14:54 -02:00
Kim Kulling 04dc52fcf0
Merge branch 'master' into iosystem-patch 2017-12-18 08:59:14 +01:00
Kim Kulling d081b4ab4e
Merge branch 'master' into fix_clang5_issue 2017-12-17 16:11:44 +01:00
Turo Lamminen 87462165b5 Fix bad pointer arithmetic in aiVector2
Trying to reference 'y' via pointer arithmetic on 'x' is UB
2017-12-16 15:48:01 +02:00
Turo Lamminen 45ad63f373 Remove packed attribute from aiVector2
Returning a reference to a member of packed member is UB
2017-12-16 15:48:01 +02:00
Turo Lamminen 276fc5f466 Remove packed attribute from aiUVTransform
It would cause a warning when removing packed from aiVector2
2017-12-16 15:48:01 +02:00
Kim Kulling bef219a2d9 fix access violation in vector2. 2017-12-14 17:59:23 +01:00
Kim Kulling 245b9b4bb1 fix typo. 2017-12-14 17:52:47 +01:00
Kim Kulling e0649b6822 fix misalignment in vector2 [] operator, the non-const one. 2017-12-14 17:42:59 +01:00
Kim Kulling 151d71bc69 fix misalignment in vector2 [] operator. 2017-12-14 17:21:17 +01:00
Daniel Löber 2f93cd77f8 added path conversion code for unicode on windows 2017-12-11 10:28:50 +01:00
Kim Kulling 95e9cd75fa 3MF: fix working test for 3MF-export. 2017-12-06 21:41:48 +01:00
Kim Kulling 8e413ac1e3
Merge branch 'master' into export_3mf 2017-11-27 22:50:17 +01:00
Kim Kulling 6c59c83e0f add missing include 2017-11-24 19:48:21 +01:00
Kim Kulling 09a5946dbd Prepare archive structure. 2017-11-23 22:47:18 +01:00
Kim Kulling 2a9f79f958 check for 0 properties before copy them 2017-11-19 19:05:51 +01:00
Kim Kulling 9707fde709 check for nullptr dereferencing before copying scene data 2017-11-19 17:41:31 +01:00
Kim Kulling 24b728b3ea FindDegeneratives: adapt unittests and add configs 2017-11-12 22:09:18 +01:00
Unknown 12dbbd4ce9 Misc. typos
Some are doxy comments, some are just trivial source comment typos. 
Found using `codespell -q 3 --skip="./contrib" -I ../assimp-whitelist.txt`
whereby whitelist contained:
```
childs
iff
lod
nto
ot
whitespaces
```
2017-11-09 17:19:26 -05:00
Kim Kulling d279a3cc02
Merge branch 'master' into fix_trivial_warnings 2017-11-03 10:35:02 +01:00
Thomas Lemaire 5b76a31485 fix trivial warnings
mainly unused parameter and unused function
some parameters are indeed used in a debug built, I used the
(void)(param) trick
warnings reported by clang 4
2017-11-02 11:13:52 +01:00
Kim Kulling d6f5ad66b2 closes https://github.com/assimp/assimp/issues/1514: add misisng flag to enable global scaling. 2017-10-29 20:32:44 +01:00
Kim Kulling f49de6ecfe closes https://github.com/assimp/assimp/issues/1514: add postprocess step for scaling 2017-10-29 20:28:59 +01:00
Jared Mulconry 7e91ac3443 Suppressed warning on gcc caused by the 'visibility' attribute being ignored on types. 2017-09-25 20:22:06 +10:00
Kim Kulling c143d2e02c closes https://github.com/assimp/assimp/issues/1404: set name with merged meshes for output mesh. 2017-09-07 20:30:17 +02:00
Kim Kulling 3fe8c72f5d new release: update to 4.0.1. 2017-07-28 22:27:36 +02:00
Kim Kulling 2cb1a9efc6 Profiler: add a unittest. 2017-07-25 00:00:43 +02:00
Sergio Acereda a965414ceb not compiling when using ASSIMP_DOUBLE_PRECISION 2017-07-19 14:05:54 +02:00
rickomax c86013b08d Fixed many FBX bugs
Fixed a bug where FBX loader won´t load embedded textures that don´t have the Content data filled. Some FBX files only fill this data once, so any embedded texture with the same source filename, should use the pre-loaded data.

Fixed another bug where FBX Texture "Filename" field came different than  on some files than the one defined by the code. One suggestion is load all properties by the case-insensitive function created.

Added the "AI_CONFIG_IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES" flag to tell the importer to load embedded texture data from already loaded ones.
2017-07-15 00:27:33 -03:00
Kim Kulling b26add35a0 Merge pull request #1311 from PetrPPetrov/master
Fixed bug in material color processing
2017-06-22 08:30:11 +02:00
Kim Kulling 612ac234c5 SceneCombiner: move header for scenecombiner to public folder. 2017-06-21 14:21:16 +02:00
Petr Petrovich Petrov 323e470b3e Fixed bug in material color processing
Thanks to @evgeny-panasyuk
2017-06-20 14:29:16 +03:00
Kim Kulling ab9aa67c49 travis: exclose some build env to avoid double tests. 2017-06-07 21:10:52 +02:00
Kim Kulling 0d3e826182 Matrix: some reformattings. 2017-06-07 20:23:50 +02:00
Kim Kulling f3407ef804 aiMetaData: introduce aiMetaData::Dealloc. 2017-05-25 22:35:27 +02:00
Kim Kulling a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Kim Kulling d02a4c36a9 Mesh: fix coverity finding. 2017-05-06 11:08:57 +02:00
Kim Kulling c1b56715fe Mesh: fix coverity bug. 2017-05-06 11:04:40 +02:00
Andy Maloney b64882f4c7 Fix spelling 2017-04-11 16:33:13 -04:00
Kim Kulling 6d71e4d5d7 Config.h.in: fix typo. 2017-03-29 21:08:40 +02:00
Kim Kulling 29b5d075e2 Closes https://github.com/assimp/assimp/issues/1205: fix typo in docu. 2017-03-29 20:56:30 +02:00
Leo Terziman d4ead31c18 Merge remote-tracking branch 'github/master' into contrib 2017-03-17 12:13:52 +01:00
Leo Terziman 9ef234b842 Added parameter to control cylindrical shapes tessellation
+ renamed smoothing angle parameter for better user understanding
2017-03-17 11:58:50 +01:00
girinon 78a58ef5f0 operators to add and multiply by floats 2017-03-16 12:03:04 +01:00
Kim Kulling bb7f387bcf Merge branch 'master' of https://github.com/assimp/assimp 2017-03-11 22:13:48 +01:00
Kim Kulling 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
Leo Terziman bd33bcaa0d Fixed some formatting 2017-03-10 14:46:28 +01:00
Leo Terziman 8bc183182c Added new option to IFC importer to control tessellation angle
+ removed unused IFC option
2017-03-10 14:42:17 +01:00
Leo Terziman bbd487308b Merge remote-tracking branch 'github/master' into contrib 2017-03-09 17:28:47 +01:00
Kim Kulling b725d7dbf5 Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes 2017-03-08 10:27:57 +01:00
Kim Kulling 3bd9efa82c Cleanup_includes: fix linux build. 2017-03-08 09:55:44 +01:00
Kim Kulling 8d27945619 Merge branch 'master' into cleanup_includes 2017-03-05 15:15:29 +01:00
Kim Kulling f312d8709e More cleanup 2017-02-28 16:37:07 +01:00
Antoine Bolvy 5dd1bb9d6c Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/ 2017-02-28 11:44:04 +09:00
Kim Kulling a75eb86af4 Issue-1169: fix clang build. 2017-02-27 21:59:50 +01:00
Kim Kulling 0f3731ab20 Issue-1169: add a unittest. 2017-02-21 17:12:22 +01:00
Kim Kulling d43d9368f2 Issue-1169: fix travis build. 2017-02-21 11:17:09 +01:00
Kim Kulling 695439fad0 Issue-1169: fix [] operator of vector3. 2017-02-21 10:58:27 +01:00
JonAllee 5deb441a9c Fix memory leak in Collada importer
Affects Collada files with morph Controller Elements.
2017-02-13 11:25:30 -08:00
Kim Kulling da34ffd6ce Fix the build: next try ( with full namespaces ). 2017-02-05 20:51:18 +01:00
Kim Kulling 6ed1f7570e Merge branch 'master' of https://github.com/assimp/assimp 2017-02-05 19:30:11 +01:00