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
carmenfan
kim kulling
BuildTools
Kim Kulling
Alexis Breust
Christian Meurin
rickomax
Turo Lamminen
Daniel Löber
Unknown
Thomas Lemaire
Jared Mulconry
Sergio Acereda
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