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

584 Commits

Author SHA1 Message Date
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