Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,751 Commits 19 Branches 43 Tags
6668eeb68eaeeff2b0686d07d7ec6e1cdf88c882
Commit Graph

570 Commits

Author SHA1 Message Date
Kim Kulling
6668eeb68e Fix possible nullptr dereferencing. 2018-03-09 19:03:05 +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
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