e01e77a6c7
Merge branch 'master' into develop_kimkulling
2018-03-21 21:20:28 +01:00
af3bba1572
fix review findings.
2018-03-20 23:38:08 +01:00
f898f40486
Merge branch 'master' into master
2018-03-20 20:33:17 +01:00
5814e6f9f0
Optimize some std::string usages.
2018-03-20 18:43:54 +01:00
317f3e2a59
3MF: Export metadata.
2018-03-20 14:10:08 +01:00
9d813a48b0
fixed emply buffer stream write, removed some cast warnings.
2018-03-19 18:22:27 +01:00
a3ad45f3b3
Merge branch 'master' into 3mf_basematerial_support
2018-03-11 20:16:40 +01:00
c8ae0bbb3d
3MF: fix model folder desc.
2018-03-11 20:15:49 +01:00
6668eeb68e
Fix possible nullptr dereferencing.
2018-03-09 19:03:05 +01:00
f4c37fa245
Collada: add importer property that forces the use of collada names. Closes #1375 .
2018-03-06 00:30:33 +01:00
bdb3a73486
Merge branch 'master' into moffsetmatrix_documentation
2018-02-23 21:13:35 +01:00
d00c4a54e6
Update fast_atof.h
...
fix typo
2018-02-23 18:59:38 +01:00
437ae0c839
Merge branch 'master' into 3mf_basematerial_support
2018-02-23 18:29:54 +01:00
9c663e9630
fast_a_to_f: add some brackets.
2018-02-23 18:14:46 +01:00
1d901f075c
3mf-importer: fix parsing of base-material color.
2018-02-23 17:49:29 +01:00
7c2f7c02ab
Merge branch 'master' into moffsetmatrix_documentation
2018-02-20 17:53:22 +01:00
219702597f
Merge branch 'master' into develop_kimkulling
2018-02-19 11:47:41 +01:00
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
58c653c874
Merge branch 'master' into streamwriter_improvements
2018-02-17 16:35:33 +01:00
b9e60e674e
define missing type,N params
2018-02-16 12:23:21 +01:00
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
b01795e453
Merge branch 'master' into develop_kimkulling
2018-02-13 20:37:02 +01:00
f9b121c415
Merge branch 'develop_kimkulling' of https://github.com/assimp/assimp into develop_kimkulling
2018-02-13 20:36:59 +01:00
ccbcaa2ee8
fix some static-analysis findings.
2018-02-13 20:36:22 +01:00
cdfe33e3f2
Merge branch 'master' into pbrmaterial_h
2018-02-13 19:17:18 +01:00
5ac415ff62
Merge branch 'master' into issue_1781
2018-02-13 13:11:03 +01:00
11a3ee109e
Update fast_atof.h
...
Remove unused variable.
2018-02-13 11:36:05 +01:00
9a7611a93e
AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h
2018-02-12 22:33:51 +01:00
78173177e8
closes https://github.com/assimp/assimp/issues/1564 : remove copy constructor.
2018-02-12 21:45:47 +01:00
76b981aa2a
Make MemoryIOStream::Seek accept pos=length as valid
...
Fixes assimp/assimp#1781 .
2018-02-12 10:52:49 +01:00
123b9ca71a
Initialize all members of aiMeshKey in constructor
2018-02-03 16:54:19 +02:00
e21b79a8bf
Mark Importer assignment operator deleted
2018-02-03 16:45:07 +02:00
b0b125dfe6
Initialize all members of aiVertexWeight in constructor
2018-02-03 16:34:40 +02:00
82980c8a9c
Add missing assignment operator to aiBone
2018-02-03 16:24:45 +02:00
a64d515505
Fix varible shadowing issue
2018-02-03 16:04:14 +02:00
6aafc58797
Add missing assignment operator to aiString
2018-02-03 15:51:20 +02:00
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
b049933d2f
update license dates.
2018-01-28 19:42:05 +01:00
6cde21bf2f
Merge branch 'master' into doc/find_degenerates_parameters
2018-01-25 20:34:28 +01:00
cec006f74b
Add note to aiProcess_FindDegenerates about AI_CONFIG_PP_FD_CHECKAREA
2018-01-25 14:56:37 +01:00
1037ac5b93
Merge branch 'master' into issue_1721
2018-01-24 21:57:53 +01:00
0b15d5cd46
closes https://github.com/assimp/assimp/issues/1721 : set camera parameters instead of nonsense.
2018-01-24 21:20:34 +01:00
5b948e9cca
add const to GetEmbeddedTexture
2018-01-24 11:32:58 +00:00
8ac1de3287
closes https://github.com/assimp/assimp/issues/1390 : aiScene now stores metadata as well.
2018-01-23 15:12:57 +01:00
f88572f572
fix includes
2018-01-15 19:14:44 -08:00
d0c92e30be
conflict resolution again, temp. move LogAux.h
2018-01-15 19:07:33 -08:00
0fff3b1232
Merge branch 'master' into master
2018-01-08 15:36:03 +01:00
559bc38e5d
Embedding images post-process
2018-01-08 09:26:52 +01:00
5ef13e7b38
Merge branch 'master' into master
2018-01-07 11:34:18 -08:00
7b5c543b82
Merge branch 'master' into master
2018-01-06 14:48:23 -08:00
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
01081765ad
closes https://github.com/assimp/assimp/issues/1638 : use memcpy instead of dynamic_cast.
2018-01-06 18:03:27 +01:00
66171de915
Successful lib build, unit testing still WIP
2018-01-05 16:18:33 -08:00
bd81869794
Fix some minor findings.
2018-01-01 20:57:59 +01:00
2294390917
Merge branch 'master' into iosystem-patch
2017-12-20 09:57:54 +01:00
9c9e7a2e82
Fixed char comparision
...
Fixed char comparision
2017-12-18 19:18:11 -02:00
987d315089
Fixed config file
...
Fixed config file
2017-12-18 18:53:25 -02:00
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
04dc52fcf0
Merge branch 'master' into iosystem-patch
2017-12-18 08:59:14 +01:00
d081b4ab4e
Merge branch 'master' into fix_clang5_issue
2017-12-17 16:11:44 +01:00
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
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
276fc5f466
Remove packed attribute from aiUVTransform
...
It would cause a warning when removing packed from aiVector2
2017-12-16 15:48:01 +02:00
bef219a2d9
fix access violation in vector2.
2017-12-14 17:59:23 +01:00
245b9b4bb1
fix typo.
2017-12-14 17:52:47 +01:00
e0649b6822
fix misalignment in vector2 [] operator, the non-const one.
2017-12-14 17:42:59 +01:00
151d71bc69
fix misalignment in vector2 [] operator.
2017-12-14 17:21:17 +01:00
2f93cd77f8
added path conversion code for unicode on windows
2017-12-11 10:28:50 +01:00
95e9cd75fa
3MF: fix working test for 3MF-export.
2017-12-06 21:41:48 +01:00
8e413ac1e3
Merge branch 'master' into export_3mf
2017-11-27 22:50:17 +01:00
6c59c83e0f
add missing include
2017-11-24 19:48:21 +01:00
09a5946dbd
Prepare archive structure.
2017-11-23 22:47:18 +01:00
2a9f79f958
check for 0 properties before copy them
2017-11-19 19:05:51 +01:00
9707fde709
check for nullptr dereferencing before copying scene data
2017-11-19 17:41:31 +01:00
24b728b3ea
FindDegeneratives: adapt unittests and add configs
2017-11-12 22:09:18 +01:00
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
d279a3cc02
Merge branch 'master' into fix_trivial_warnings
2017-11-03 10:35:02 +01:00
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
d6f5ad66b2
closes https://github.com/assimp/assimp/issues/1514 : add misisng flag to enable global scaling.
2017-10-29 20:32:44 +01:00
f49de6ecfe
closes https://github.com/assimp/assimp/issues/1514 : add postprocess step for scaling
2017-10-29 20:28:59 +01:00
7e91ac3443
Suppressed warning on gcc caused by the 'visibility' attribute being ignored on types.
2017-09-25 20:22:06 +10:00
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
3fe8c72f5d
new release: update to 4.0.1.
2017-07-28 22:27:36 +02:00
2cb1a9efc6
Profiler: add a unittest.
2017-07-25 00:00:43 +02:00
a965414ceb
not compiling when using ASSIMP_DOUBLE_PRECISION
2017-07-19 14:05:54 +02:00
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
b26add35a0
Merge pull request #1311 from PetrPPetrov/master
...
Fixed bug in material color processing
2017-06-22 08:30:11 +02:00
612ac234c5
SceneCombiner: move header for scenecombiner to public folder.
2017-06-21 14:21:16 +02:00
323e470b3e
Fixed bug in material color processing
...
Thanks to @evgeny-panasyuk
2017-06-20 14:29:16 +03:00
ab9aa67c49
travis: exclose some build env to avoid double tests.
2017-06-07 21:10:52 +02:00
0d3e826182
Matrix: some reformattings.
2017-06-07 20:23:50 +02:00
f3407ef804
aiMetaData: introduce aiMetaData::Dealloc.
2017-05-25 22:35:27 +02:00
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
d02a4c36a9
Mesh: fix coverity finding.
2017-05-06 11:08:57 +02:00
c1b56715fe
Mesh: fix coverity bug.
2017-05-06 11:04:40 +02:00
b64882f4c7
Fix spelling
2017-04-11 16:33:13 -04:00
6d71e4d5d7
Config.h.in: fix typo.
2017-03-29 21:08:40 +02:00
29b5d075e2
Closes https://github.com/assimp/assimp/issues/1205 : fix typo in docu.
2017-03-29 20:56:30 +02:00
d4ead31c18
Merge remote-tracking branch 'github/master' into contrib
2017-03-17 12:13:52 +01:00
9ef234b842
Added parameter to control cylindrical shapes tessellation
...
+ renamed smoothing angle parameter for better user understanding
2017-03-17 11:58:50 +01:00
78a58ef5f0
operators to add and multiply by floats
2017-03-16 12:03:04 +01:00
bb7f387bcf
Merge branch 'master' of https://github.com/assimp/assimp
2017-03-11 22:13:48 +01:00
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
bd33bcaa0d
Fixed some formatting
2017-03-10 14:46:28 +01:00
8bc183182c
Added new option to IFC importer to control tessellation angle
...
+ removed unused IFC option
2017-03-10 14:42:17 +01:00
bbd487308b
Merge remote-tracking branch 'github/master' into contrib
2017-03-09 17:28:47 +01:00
b725d7dbf5
Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes
2017-03-08 10:27:57 +01:00
3bd9efa82c
Cleanup_includes: fix linux build.
2017-03-08 09:55:44 +01:00
8d27945619
Merge branch 'master' into cleanup_includes
2017-03-05 15:15:29 +01:00
f312d8709e
More cleanup
2017-02-28 16:37:07 +01:00
5dd1bb9d6c
Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/
2017-02-28 11:44:04 +09:00
a75eb86af4
Issue-1169: fix clang build.
2017-02-27 21:59:50 +01:00
0f3731ab20
Issue-1169: add a unittest.
2017-02-21 17:12:22 +01:00
d43d9368f2
Issue-1169: fix travis build.
2017-02-21 11:17:09 +01:00
695439fad0
Issue-1169: fix [] operator of vector3.
2017-02-21 10:58:27 +01:00
5deb441a9c
Fix memory leak in Collada importer
...
Affects Collada files with morph Controller Elements.
2017-02-13 11:25:30 -08:00
da34ffd6ce
Fix the build: next try ( with full namespaces ).
2017-02-05 20:51:18 +01:00
6ed1f7570e
Merge branch 'master' of https://github.com/assimp/assimp
2017-02-05 19:30:11 +01:00
31bb9f7ba6
Obj: fix code review findings.
2017-02-04 18:32:04 +01:00
11e2ca173d
Fix the build.
2017-02-04 18:15:50 +01:00
35b95ba710
API: Fix build
2017-01-19 11:41:43 +01:00
f121e2eb66
Fixes https://github.com/assimp/assimp/issues/1143 : fix build.
2017-01-19 11:18:33 +01:00
2e0db8cfd5
Merge branch 'master' of https://github.com/assimp/assimp
2017-01-15 18:29:49 +01:00
c6cceef867
Scene: add method to add children.
2017-01-15 17:37:45 +01:00
9621dff027
Morph animation support for collada
2017-01-12 13:41:32 +02:00
cae9e532a0
Merge remote-tracking branch 'github/master' into contrib
...
# Conflicts:
# include/assimp/metadata.h
2017-01-11 16:52:07 +01:00
c3d40810b5
Cleared majority of codepage warnings in Visual Studio 14.
2017-01-09 00:41:10 +08:00
161cdd4038
Merge pull request #1119 from rdb/master
...
Replace use of nullptr in headers with NULL
2016-12-28 18:20:50 +01:00
5c2bd47fd8
Avoid unneeded copy-ctor calls when calling getAiType
...
Specially for aiString, which does a memcpy.
Found with clazy static analyzer.
2016-12-26 12:43:45 +00:00
5bb35f3af6
Replace use of nullptr in headers with NULL
2016-12-20 17:27:36 +01:00
edfb3fc410
New tests for importers.
2016-12-01 10:29:39 +01:00
2193a93875
Exporter: fix some review findings.
2016-11-30 17:17:07 +01:00
d82fd0d750
closes https://github.com/assimp/assimp/issues/1076 : use ai_assert instead
...
of assert.
2016-11-24 21:15:07 +01:00
1939aca31c
anim-header: fix some review findings + andd base tests.
2016-11-23 22:00:52 +01:00
83e472cef3
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-23 20:20:45 +01:00
d87400b76a
Fix some findings in animation header.
2016-11-23 20:20:11 +01:00
ba2f377b52
Fix coverity findings.
2016-11-22 22:03:31 +01:00
a446d75250
Ue new alloc semantic when using aiMetadata + increase test coverage.
2016-11-22 21:06:14 +01:00
566aa1ae00
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-21 23:55:14 +01:00
c61146f52e
Add unittest fixure for aiMetadata.
2016-11-21 23:54:39 +01:00
9e07701f3e
Merge branch 'master' into coverity_scan
2016-11-21 10:18:17 +01:00
91e4d029dc
Update material.h
...
Fixed grammar
2016-11-18 13:08:00 +01:00
cae8a172c3
Merge branch 'master' into coverity_scan
2016-11-18 11:38:45 +01:00
c21c70ade6
added void to aiGetErrorString's args
2016-11-09 22:43:01 +01:00
6d58926046
Code reformatting.
2016-11-08 10:38:57 +01:00
a43634ebd0
Fix build:
2016-11-06 20:39:33 +01:00
d4223d1fce
closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057
2016-11-06 19:36:37 +01:00
fe1af5af7d
Merge pull request #1038 from ystreet/cfileio-defs
...
cfileio: fix function typedefs to have struct/enum
2016-10-17 17:28:04 +02:00
6ed1bcd41b
cfileio: fix function typedefs to have struct/enum
...
Otherwise building with cfileio.h would result in:
/usr/include/assimp/cfileio.h:61:58: error: unknown type name ‘aiOrigin’
typedef aiReturn (*aiFileSeek)(C_STRUCT aiFile*, size_t, aiOrigin);
^~~~~~~~
/usr/include/assimp/cfileio.h:64:9: error: unknown type name ‘aiFile’
typedef aiFile* (*aiFileOpenProc) (C_STRUCT aiFileIO*, const char*, const char*);
^~~~~~
/usr/include/assimp/cfileio.h:122:5: error: unknown type name ‘aiFileSeek’
aiFileSeek SeekProc;
^~~~~~~~~~
2016-10-18 00:20:28 +11:00
25cda401c5
use cmath and C++ (std::) versions of functions
2016-10-15 03:29:45 +03:00
728c11ebb9
[*] MSVS2013 do not like constexpr
2016-10-06 17:49:08 +03:00
8c6ee48af5
[*] Merged fresh master and resolved conflicts.
2016-10-06 17:12:56 +03:00
96887e1aa6
[F] vRows in fact is columns.
...
[+] More variants for Decompose.
2016-10-06 17:02:09 +03:00
70614ce205
[+] Added few functions for conveniance. Decompose overload.
2016-10-05 00:01:53 +03:00
9e0f594aa3
[F] In that place fixed typo in list.
2016-10-05 00:01:06 +03:00
9d40f36f87
[F] Fixed type in list.
...
[+] Added function to metadata class for conveniance.
[*] Enumeration AI_INT changed to AI_INT32.
2016-10-04 23:58:51 +03:00
d27cce513b
Scene: remove redundant pragma once statement.
2016-10-03 19:23:52 +02:00
a93a230f9e
[*] More suitable for array size of which can vary at compilation time.
2016-09-29 17:13:14 +03:00
0a25b076b8
Merge branch 'master' into import_amf
2016-09-28 17:51:59 +03:00
9069ea20fa
[*] Format hint for embedded textures improvement.
2016-09-28 17:50:17 +03:00
6a9ccf2016
[+] Flag for scene for supporting formats where more than one face can reference to one vertex.
2016-09-26 13:01:38 +03:00
ed35882ee9
[*] Embedded texture prefix in separate define.
2016-09-26 12:59:12 +03:00
ce2532e93b
ModelDiffer: use Equal-method to compare vectors.
2016-09-20 19:48:03 +02:00
96fab1cf55
122219-122218 Big parameter passed by value
2016-09-19 22:23:13 +02:00
61419cc0ae
Unittest: add first approach for modeldiffer.
2016-09-19 21:35:45 +02:00
a29f562241
Doc: add uml-diagrams for import and export.
2016-09-17 10:07:14 +02:00
b68ad60b52
Merge remote-tracking branch 'official/master' into contrib
2016-08-23 12:00:32 +02:00
6db06f117a
In metadata: added method to append new metadata to structure
2016-08-23 11:59:49 +02:00
3f08cebfab
include config.h to always have the correct types (float/double) exposed
2016-08-17 07:57:31 +10:00
4f7b624fe8
fix precision issue within memory copy
2016-08-16 16:03:56 +10:00
6128987210
add explicit config.h include to export
2016-08-16 16:03:56 +10:00
6613b6382f
renaming define for double precision to be picked up by cmake correctly
2016-08-16 16:03:56 +10:00
63a4591683
Fixing bugs related to 64-bit upgrade in materials
2016-08-16 16:03:56 +10:00
e7ed352078
Added documentation for embedded textures
2016-08-09 01:06:43 +02:00
5fe4b975ba
Removes MSVC warning with explicit cast.
2016-07-24 15:54:16 +03:00
ad8bb32561
Properly defining build-time defines in config.h
2016-07-16 18:23:33 +10:00
05a6ee6473
Adding double precision import support for formats that can be exported
2016-07-16 18:23:33 +10:00
fa1d6d8c55
propagating precision requirments into operations
2016-07-16 18:23:33 +10:00
2f7e3dcdcc
Basic changes to introduce optional double precision
2016-07-16 18:23:33 +10:00
9678da72c9
Public includes: add pragma statement and formalize include guard schema.
2016-07-11 20:56:38 +02:00
e439b16689
Includes: update header to latest greatest.
2016-07-08 18:38:33 +02:00
398595225e
Closes issue888: fix compiler warnings for using a gnu-extension (
...
anonymous structs ).
2016-06-05 21:06:05 +02:00
25d84a6aff
Adds support for area lights.
2016-05-16 13:04:43 +02:00
301b6798c5
aiLight: fix a typo.
2016-05-07 11:16:33 +02:00
f59cba13eb
Try fixing clang builds
2016-04-06 11:10:12 +02:00
4836a2993e
Replaced boost::thread with std::thread
2016-04-05 22:28:21 +02:00
87e7cf00a2
Fix spelling mistakes
2016-04-03 01:38:00 +01:00
17f0e09bd1
Fix warning when compiling using -Wswitch-enum
2016-03-02 00:07:17 -08:00
6de709410f
Fix special case in aiMatrix3x3t::FromToMatrix.
2016-02-15 20:53:39 +01:00
bf74a5a662
Update pstdint.h to version 0.1.12 ( solve #795 )
2016-02-14 22:39:37 +03:00
59ece7b9fa
Datatypes: add missing unions for vector + color types.
2016-02-02 00:59:47 +01:00
aaec1656f3
Closes https://github.com/assimp/assimp/issues/43 : provide different
...
matrix scheme via union.
2016-02-01 16:16:48 +01:00
f1666d22ce
Closes https://github.com/assimp/assimp/issues/778 : export android system.
2016-01-31 13:44:15 +01:00
9f9f69d6cc
AndroidJNIIOSystem: update license info to 2016.
2016-01-31 13:43:05 +01:00
8bbd55a790
PostProcessing: first prototype of customized post processing.
2016-01-27 18:49:01 +01:00
c02a1dd11a
closes assimp/assimp/issues/710: use correct include for importerdesc in
...
cimport.h
2016-01-20 21:25:47 +01:00
430b614a69
coverity scan: make place of false positive more understandable.
2016-01-08 16:18:32 +01:00
346bf9375b
ai_assert: add missing license info.
2016-01-07 15:02:41 +01:00
b6673c3fca
Update license info in public headers
2016-01-01 21:08:28 +01:00
5847576f41
Merge pull request #703 from terziman/master
...
Improvement of collada transparency handling
2015-12-20 15:59:42 +01:00
7e85f45abc
Merge pull request #713 from ov/normalize-safe
...
GenVertexNormalsProcess produces invalid results for specific input
2015-12-20 00:06:58 +01:00
957426ed72
Tiny misc fixes for documentation
2015-12-13 22:12:25 -08:00
6e2b0b4fd1
a speedup
2015-12-14 15:37:27 +13:00
b6f14eb917
Normalize() is replaced with NormalizeSafe() to prevent invalid vectors generation
2015-12-14 15:31:49 +13:00
210764a6ff
Correct spelling
2015-12-10 16:19:33 +00:00
6eebf8455a
Merge remote-tracking branch 'official/master' into contrib
2015-12-08 15:25:13 +01:00
445ae1fec3
In collada: implemented all missing transparency features from standard (ie RGB_ZERO, RGB_ONE and A_ZERO)
...
+ removed user option to invert transparency as it does not seem to be needed anymore
+ fixed bug in default reflectivity value
2015-12-08 15:24:07 +01:00
91a6ff7f0e
Importer: fix doxygen comment style to default.
2015-11-28 12:05:55 +01:00
ba35c97e9d
assimp/assimp/issues/698: Increase upper limits for hints.
2015-11-28 10:06:26 +01:00
65d366dad0
Merge pull request #694 from OtgerRP/master
...
Support for FBX embedded textures
2015-11-24 21:26:34 +01:00
3c358a8e34
Updated dumps for FBX files
2015-11-24 16:33:31 +01:00
70540616ce
issue 693: add missing release call in c-export interface.
2015-11-23 21:28:35 +01:00
f94bc8d66e
Initial support for FBX embedded textures
2015-11-23 19:49:54 +01:00
02ad376631
assimp/issues/685: add test for correct usage.
2015-11-07 10:00:55 +01:00
6f75ea5702
Merge branch 'master' of https://github.com/assimp/assimp
2015-10-31 09:07:21 +01:00
46121a1559
Mark single-parameter constructors explicit
...
Suggested by cppcheck
2015-10-29 14:04:23 +02:00
a1be9285b4
Merge branch 'master' of https://github.com/assimp/assimp
2015-10-08 10:25:35 +02:00
4a8b459706
OpenDDLParser: latest greatest.
2015-10-01 20:29:15 +02:00
6f0bc9bcb2
remove memory.h dependancy
...
Some embedded (or exotic) systems won't provide this header, and it seems to be unused (since memcpy is in string.h).
Tested on MinGW and VS2015.
2015-09-30 09:16:18 -04:00
e9937ab0f7
IOSystem: add missing documentation.
2015-08-30 15:37:56 +02:00
e4510c26ba
Obj-Importer: fix https://github.com/assimp/assimp/issues/641
2015-08-30 15:21:53 +02:00
0b0ba2ec4d
Refactor logic which checks for too large allocations
...
It's now easier to change the limit
2015-08-14 11:53:16 +03:00
524834c307
Fix line endings.
2015-08-08 18:02:37 +02:00
e4b0c27a2e
Refactor: Strip trailing whitespace
2015-06-28 16:09:18 -06:00
54a2d0808c
Refactor: Expand tabs to 4 spaces
2015-06-28 16:08:06 -06:00
6da45599c0
Refactor: Strip trailing whitespace
2015-06-28 16:08:06 -06:00
5dbd676c01
Refactor: Use LF line endings
2015-06-28 16:08:06 -06:00
9d736cc1c5
Implemented: Add editor config file
2015-06-28 16:04:15 -06:00
2bfc353fde
License info: update year info.
2015-06-28 21:48:25 +02:00
de6f0f2a7d
Creating the functionality to list all Importer descriptions and the number of importers available.
2015-05-26 08:40:43 -03:00
4cbce374b6
Code Cleanups
...
- add initializers to classes
- fix %i/%u for unsigned ints
- remove unused vars
- pass by reference
2015-05-24 11:55:37 -04:00
2c194f629a
fix macro for be uesed with expression
2015-05-19 21:57:51 +02:00
ca2e47b205
Fixed some typos
2015-04-29 09:26:11 +02:00
5b9af11f9b
Merge remote-tracking branch 'official/master' into contrib
2015-04-28 12:04:53 +02:00
8c45a4dc3b
Merge remote-tracking branch 'origin'
...
Conflicts:
code/C4DImporter.cpp
code/OgreImporter.h
2015-04-16 01:03:00 +02:00
bf4913b5c9
remove AssimpPCH.h: fixes #534
2015-04-16 01:00:17 +02:00
470ad98281
fix "headercheck":
...
part of https://github.com/assimp/assimp/issues/534
2015-04-15 21:22:26 +02:00
454b85a0ad
Improved prototype of Importer & Exporter SetProperty* functions for better integration with tools such as SWIG
2015-03-27 10:56:03 +01:00
60d58901a5
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
code/ColladaParser.cpp
include/assimp/config.h
2015-03-27 09:55:21 +01:00
a7e4babd9d
gcc_struct, old fish, but reinterpreted: 92f4c84488
2015-03-21 11:10:33 +01:00
56da80bc6e
Copy constructor ExportProperties
...
Fix name dummy node in PreTransformVertices
2015-03-14 19:03:44 +01:00
290a16eea5
Copy constructor for ExportProperties
...
Export Propertie defines in config.h
Remove unnecessary
2015-03-14 16:31:33 +01:00
37572f0f52
Missing include map
2015-03-14 14:22:55 +01:00
8b1b12682f
Add ExportProperties
2015-03-14 14:03:14 +01:00
8ae9e2b555
In Collada: Added missing description of importer specific options
2015-03-10 09:20:00 +01:00
18ef31cc06
Merge remote-tracking branch 'official/master' into contrib
2015-03-09 11:31:15 +01:00
b1e8c192db
Merge pull request #464 from turol/master
...
Clean up some warnings
2015-02-28 14:41:26 +01:00
db6d8a4dc5
Use attribute noreturn on both GCC and Clang
...
Both GCC and Clang define __GNUC__ and both also understand
attribute noreturn.
2015-02-27 23:09:12 +02:00
308884f144
Remove unnecessary semicolons after function definition
...
Picked up by clang -Wextra-semi
2015-02-27 23:09:12 +02:00
2274c96e3b
Merge remote-tracking branch 'official/master' into contrib
2015-02-18 17:22:44 +01:00
d9a2293491
Improved handling of transparency in collada importer
...
+ started preliminary support for RGB_ZERO collada transparency mode
+ added option to manually invert transparency values to deal with broken exporters that don't follow the specs
2015-02-18 17:20:03 +01:00
7bab42f55f
Fixed many doxygen errors
2015-02-18 17:02:30 +09:00
1bdb31f8aa
Fixed error of aiQuaterniont::Rotate()
...
The function rotates a point to opposite direction.
Conjugate() should be applied to inverse of the quaternion.
2015-01-26 21:09:54 +09:00
50dbb867ec
Include stdint.h for uint64_t
2015-01-22 21:27:43 +00:00
7494cb6e4b
Use correct include file for INT_MAX
...
INT_MAX is defined in limits.h, not stdint.h
2015-01-22 20:19:34 +00:00
b367d9b390
Fixed some warnings related to empty statement when using assert & building in release mode
2014-12-18 11:01:16 +01:00
951431db94
add missing documentation.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-12-01 21:27:48 +01:00
7a31a68cfc
adapt c-api to get ImporterDesc for a given loader ( see https://github.com/assimp/assimp/issues/412 ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-12-01 20:34:15 +01:00
7224476ee1
Android JNI asset extraction support (API 9+)
...
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 16:33:43 +02:00
775b26e614
use std:: namespace for most cmath functions:
...
http://en.cppreference.com/w/cpp/header/cmath
2014-09-23 00:43:33 +02:00
ae7aba3647
+ comment
2014-08-28 16:34:39 +02:00
d333e08343
add ambient light type, allow collada to load it
2014-08-28 16:27:29 +02:00
6c5f9ecb06
fix most warnings with -pendantic
2014-08-18 02:09:06 +02:00
8f960f0ed2
avoid division by zero
2014-08-05 19:36:18 +02:00
dbc553343c
Granulate file loading too
2014-08-05 00:05:18 +02:00
dfe1f03e5b
Split off postprocessing progress
2014-08-04 23:57:08 +02:00
1207f84f7b
Merge pull request #298 from Madrich/master
...
Collada fixes, adding XFile Exporter
2014-06-21 18:54:11 +02:00
1cb01c54a3
Fix IOSFixed
...
Fix Author/AuthoringTool in Collada by MetaData
2014-06-20 00:08:11 +02:00
be5fc42e16
Fix memory corruption in the aiGetExportFormatDescription() API. Clarify Exporter doc.
2014-06-17 16:10:55 +02:00
edc7a950c4
ReFix the stuff before
...
Fix XFileExporter Normal
Fix Collada (Triangle->Poly)
2014-06-11 00:41:18 +02:00
272a59cd36
Fix convertToLH for uv coordinates
...
Fix Collada export
Fix XFile export
2014-06-10 13:14:41 +02:00
ec2ce90654
Add Scene Author + AuthorTool
...
Add XFileExporter
Add Collada Triangle+Line export
Fix Obj Comment
2014-06-06 01:56:54 +02:00
199d455261
Make aiMatrix4x4t ctor that takes in pos, rot and scale take in const refs. Fixes #284 .
2014-05-30 02:01:29 +03:00
fe87b09246
Move pstdint.h for <= VC9 under include. Apps that include the Assimp headers need to have this available, as its pulled in by metadata.h. Fixes #290 .
2014-05-30 01:57:21 +03:00
3acf60f5d7
Correction on quaternion initialization values
...
a 0 0 0 0 quaternion is not valid
2014-05-27 11:26:55 +02:00
0f71d46c35
Merge pull request #276 from g-pechorin/master
...
lt operator for aiVector3
2014-05-14 21:35:48 +02:00
057a7ffe60
added a lt operator to the inline
...
added a lt operator to the inline, so that I can use aiVectors as stl keys and such
2014-05-14 14:16:53 +01:00
09fffac068
added a lt operator to the header
...
added a lt operator to the header, so that I can use aiVectors as stl keys and such
2014-05-14 14:16:49 +01:00
fb1c9ab86d
bugfix: fix cexport API for c compilers.
2014-05-11 16:50:35 +02:00
8c8c5329e9
bugfix:
...
- fix c-api: insert a missing typedef for the metadata api enum.
- gix c-api: move cpp-include to cpp-part of the api.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 15:24:12 +02:00
283394d695
OgreImporter: Cleanup skeleton related code and code that populates the assimp scene. Tested skeleton/animation imports and it seems to work correctly now.
2014-05-02 00:28:14 +03:00
6ea07f39e1
OgreImporter: Rewrote documentation for AI_CONFIG_IMPORT_OGRE_MATERIAL_FILE and AI_CONFIG_IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME to reflect the current logic. And to be honest the earlier one was very confusing english and was not very clear what is happening with these config options.
2014-05-02 00:28:11 +03:00
825a61fbc0
update:
...
- update version info for 3.1
- aiGetVersionRevision will now return the git tag.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-01 11:32:15 +02:00
c329e81c94
Fix stdint.h include that broke the build for VC9 and below.
2014-04-30 05:58:19 +03:00
7c3a039349
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
include/assimp/matrix4x4.inl
include/assimp/vector2.h
include/assimp/vector3.h
2014-04-22 14:32:59 +02:00
f48c8eccce
Fix for issue #177 with mingw
2014-04-21 21:58:29 +02:00
38de6a658d
bugfix:
...
- fix redundant checks against nullptr ( see https://github.com/assimp/assimp/issues/241 ).
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-27 20:33:08 +01:00
f9d5852ef9
bugfix:
...
- add global namespace statement to sqrt.
refactoring:
- include cmath instead of math.h in c++ API.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-27 19:19:25 +01:00
ed586a35ae
Fixed compilation error when using swig
2014-03-24 11:24:27 +01:00
1f3be52079
Merge remote-tracking branch 'official/master' into contrib
2014-03-24 10:44:57 +01:00
358819c1a0
Fixed error in GetProperty when accessed from external libraries using a different language (using swig for example)
2014-03-20 15:32:12 +01:00
595529ef8b
Refactored the metadata for inner consistency.
2014-03-15 08:37:45 +01:00
9b78a180d9
Added a convenience overload for aiMetadata::Get using std::string as key.
2014-03-14 17:12:22 +01:00
56f37a0465
Deprecated some abstraction and fixed a memory leak.
2014-03-14 15:36:12 +01:00
fc39fe9f40
Fixed a compile error involving unnecessary enum resolution qualification.
2014-03-14 15:01:36 +01:00
a8401ba377
Added support for heterogenous metadata on the aiNodes.
2014-03-14 14:17:34 +01:00
796e072898
Fixed warnings when using swig
2014-03-03 15:36:49 +01:00
f54c85d4e6
Added custom root transformation for pre-transform vertices post-process step
2014-02-28 15:32:43 +01:00
843e56c252
Added matrix properties
2014-02-28 15:21:10 +01:00
b90718bd21
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
code/IFCLoader.cpp
2014-02-26 18:06:46 +01:00
de914d375f
Merge pull request #223 from VirusFree/master
...
[FBX ] Use AiNode's metadata to keep objects UserDefinedProperties
2014-02-22 16:40:38 -05:00
5ef8c09dbb
Use AiNode's metadata to keep per-node(and per-instance) FBX (3dsmax) UserDefinedProperties
...
Also simplify metadata structure to avoid unnecessary allocations (and make it easier for wrappers like AssimpNET to read it)
2014-02-22 21:57:01 +02:00
660d5c4e84
docs: clarify the use of Importer properties in post processing steps
...
Signed-off-by: David Greaves <david@dgreaves.com>
2014-02-17 23:09:56 +00:00
ad55783f56
Boost libraries on windows are too much a hassle to handle, so thread safety is not worth all the trouble => think to move to c++11 thread support
2014-01-17 12:03:24 +01:00
34c3449cdd
Always activate thread safety if possible
2014-01-17 12:03:18 +01:00
41175dacca
Merge commit '6d630bec50fe7767296b0e5184a9c6c7b915df24' into contrib
2014-01-17 11:57:45 +01:00
7bc074857e
Missing material functions for aiUVTransform added
2014-01-17 11:51:43 +01:00
d28fc25c5c
Merge commit 'cc3f8b82f9f6fb4b295a39a3f7ac55154145cc04' into contrib
...
Conflicts:
CMakeLists.txt
2014-01-17 11:45:57 +01:00
4e7b59be55
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
2c4e55ac61
Fixed gcc /mingw building
2014-01-17 11:31:39 +01:00
f5e3382d58
Correct some warnings when building with mingw
2014-01-17 11:30:51 +01:00
bc40ebd730
Improved color comparison
2014-01-17 11:28:06 +01:00
365b3aa412
Improved math operation with epsilon support
2014-01-17 11:21:15 +01:00
6c0ebb679a
Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib
...
Conflicts:
code/ColladaExporter.cpp
2014-01-17 11:19:29 +01:00
bbfd56046b
Fixed constructor of aiMesh for improved lisibility
2014-01-17 10:33:54 +01:00
30c6a74e1d
Improving constructors of aiNode & aiScene
2014-01-17 10:31:27 +01:00
6b471317d2
Adding support for matrix4x4 construction from position, rotation and scaling parameters
2014-01-17 10:27:11 +01:00
5e603d9ed8
Correcting a bug where the constructor & destructor of aiScene were not exported correctly in the assim library
2014-01-17 10:26:48 +01:00
5b076fe234
Fixes warnings in clang for unrecognized attribute 'gcc_struct'
2013-12-14 01:40:37 +01:00
93fd1133ff
Fixed mingw cross compiler issues.
2013-11-20 14:40:20 +01:00
faaea5224f
Exporter: update documentation.
2013-10-05 16:18:36 +02:00
9c3a0727c6
Material API: fix regression caused by previous commit 69e9e7c403
...
. Lots of importers use explicit template syntax for AddProperty(), changing to overloads now called the fallback template version. This caused material properties to be often registered as BINARY (instead of FLOAT, INT).
2013-10-03 17:10:01 +02:00
69e9e7c403
aiMaterial: use overloads instead of template specializations. This fixes multiple instances of int material properties being accidentally registered as BINARY because the given type was unsigned int.
2013-09-18 15:17:04 +02:00
45572e8079
Merge branch 'master' of github.com:assimp/assimp
2013-09-04 21:52:17 +02:00
fd0b3490d1
Clarify exporter doc: how to get a modifiable copy of a previously imported scene.
2013-09-02 21:33:43 +02:00
0edb78d940
Add aiFreeScene() API for symmetry with aiCopyScene.
2013-09-02 21:32:20 +02:00
169e5b9f35
fix error "Chunk is too large" with gcc >=4.7.0 / mingw64
2013-08-29 06:31:10 +02:00
0d57e659cb
Added AI_WONT_RETURN_SUFFIX mainly for Clang's static analyzer.
2013-08-04 10:10:21 -04:00
5470f5fb28
add AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION for not transforming position of vertices
2013-07-27 10:34:48 +09:00
506d3fa154
Forward declare IOSystem in Exporter.hpp
2013-06-30 16:25:46 +02:00
1da281c1f8
Make sure members are initialized properly
...
Prefer initialization lists
Assignment operator should not return a const ref
2013-06-21 10:56:11 -04:00
27c578675a
Merge pull request #51 from asmaloney/init_fixes
...
Prefer init list and add missing initializations
2013-06-12 08:16:14 -07:00
c6d1a73854
Fix a logging message and a comment
2013-06-12 09:01:05 -04:00
0e54b87b1e
Prefer init list and add missing initializations
2013-06-12 08:59:47 -04:00
2bdbcd78e7
Amend dd1a18149cac29a69a0242a5efc467498f5f05cd: Visibility attribute is needed for MSVC/C++
2013-05-16 13:08:05 +02:00
a65a69fdc9
Fixes a bunch of errors with -pedantic -std=c99 and GCC 4.7.2: ISO C restricts enumerator values to range of ‘int’
2013-05-16 13:08:05 +02:00
bcc311515a
Fixes an error with -pedantic -std=c99 and GCC 4.7.2: ‘visibility’ attribute ignored on types
2013-05-16 13:08:05 +02:00
6551fd4903
Update material.inl
...
aiMaterial::AddProperty template specializations are used by import methods in B3DImporter and SceneProcessor; they should be defined accordingly even when ASSIMP_BUILD_NO_EXPORT is defined.
2013-04-17 18:47:52 -07:00
fa5831f41a
- add metadata support to aiScene. Some doc cleanup. Add const versions of aiScene::aiNode.
2013-03-28 20:54:12 +01:00
bdfcb4b0cb
- add ASSIMP_BUILD_NO_COMPRESSED_IFC option. Properly integrate Q3BSP's unzip dependency into the build configuration.
2013-03-28 13:38:42 +01:00
c016198191
aiMesh: fix copy constructor so issue [3572335] (and any further instances of the same pattern in creating face arrays) is resolved.
2013-03-21 20:17:09 +01:00
260568912c
- Importer::ReadFileFromMemory/aiImportFileFromMemory() clarify wording in documentation
2013-03-10 19:15:14 +01:00
b20023ed3d
Pass by reference, not value
2013-02-10 22:23:13 -05:00
7fd44f4ab7
Merge branch 'master' of git://github.com/assimp/assimp
2013-01-19 16:35:28 +01:00
ab9587dd1e
Merge pull request #12 from ccxvii/master
...
Precision fix and Collada robustness fix.
2013-01-15 12:04:48 -08:00
bae9db2f03
Merge branch 'master' of git://github.com/assimp/assimp
2012-12-21 16:24:05 +01:00
84939d5aec
- fixed preprocessor checks for some importers
...
- fixed warning about shadowing variables in quaternion.h
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1346 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-20 11:43:09 +00:00
e88f6ef227
- copy&paste error in aiColor3D::operator- apparently nobody's using these. Thanks to Robin Tucker for pointing this out
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1342 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-03 12:00:36 +00:00
c40b767016
Matrix to Quaternion conversion precision fix.
...
See below links for reasoning, but in short, avoid sqrt and division
of small values. It's also possible to normalize the quaternion after
the conversion, but better precision is preferable.
http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/index.htm
http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/ethan.htm
2012-11-28 13:02:51 +01:00
81aef90f4a
- manually pulled the three smaller change requests from Github.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1331 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-05 09:13:09 +00:00
Kim Kulling
Kim Kulling
Marco Di Benedetto
Daniel Kirchner
Tommy
Sergio Acereda
mbuchner
Turo Lamminen
Daniel Löber
carmenfan
BuildTools
Alexis Breust
Christian Meurin
rickomax
Unknown
Thomas Lemaire
Jared Mulconry
Petr Petrovich Petrov
Kim Kulling
Andy Maloney
Leo Terziman
girinon
Kim Kulling
Antoine Bolvy
JonAllee
Antti Määttä
Tan Li Boon
Sergio Martins
rdb
Giuseppe Barbieri
byteblob
Matthew Waters
Eshed
Alexandr Arutjunov
wise86Android
Chris Russ
nyorain
Adi Shavit @ MacBookPro
ciechowoj
mensinda
Eric Engestrom
Thiago Goulart
boxdot
afiskon
Alexander Gessler
rmitton
Vitaly Ovchinnikov
Joe Hermaszewski
Otger
Lectem
Richard
Jaime Machado Neto
abma
Ser Lev Arris
Madrich
mbp566
yeonseok-yi
Joe Hermaszewski
Filip Wasil
Gargaj
Madrich
Jonne Nauha
arkeon
Peter LaValle
xantares
Frederik Aalund
George Papadopoulos
David Greaves
Nick Overdijk
Marcel Metz
Sherief Farouk
YoheiKakiuchi
Andy Maloney
Dennis Schridde
Jared Duke
ulfjorensen
Tor Andersson