e01e77a6c7
Merge branch 'master' into develop_kimkulling
2018-03-21 21:20:28 +01:00
5814e6f9f0
Optimize some std::string usages.
2018-03-20 18:43:54 +01:00
b66bee8d79
Export: Copy metadata to be able to export it properly.
2018-03-20 14:09:07 +01:00
ccbcaa2ee8
fix some static-analysis findings.
2018-02-13 20:36:22 +01:00
b049933d2f
update license dates.
2018-01-28 19:42:05 +01:00
66171de915
Successful lib build, unit testing still WIP
2018-01-05 16:18:33 -08: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
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
439409bef2
SceneCombiner: fix the build.
2017-06-21 15:24:06 +02:00
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
f206249fbf
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
...
# Conflicts:
# code/AMFImporter_Postprocess.cpp
# code/FBXConverter.cpp
# code/IFCLoader.cpp
# code/NDOLoader.cpp
# code/glTFAsset.inl
2016-11-23 22:24:04 +11:00
a446d75250
Ue new alloc semantic when using aiMetadata + increase test coverage.
2016-11-22 21:06:14 +01:00
ff31abf57c
Fixed build warnings on MSVC14 x64 in the scene combiner.
2016-11-20 14:07:24 +11:00
d4223d1fce
closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057
2016-11-06 19:36:37 +01: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
4f7b624fe8
fix precision issue within memory copy
2016-08-16 16:03:56 +10:00
2f7e3dcdcc
Basic changes to introduce optional double precision
2016-07-16 18:23:33 +10:00
7207e5117c
Use new include bracktes.
2016-06-06 22:04:29 +02:00
5a8c15d826
fix SceneCombiner copy of aiNode not setting mParent field
2016-04-18 11:28:21 +02:00
a1bd83d797
ai_assert: split 2 checks in one macro to 2 separate ai_assert tests.
2016-02-01 16:16:09 +01:00
6bfdeb6a12
sprintf replacement: introduce au_snprintf to support snprintf for v2013
...
and earier ( closes https://github.com/assimp/assimp/issues/743 )
2016-01-06 15:35:25 +01:00
c3d4be1dce
sprintf: replace more sprintf by snprintf.
2016-01-04 22:24:25 +01:00
1191d03405
Update license info.
2016-01-01 21:07:24 +01:00
4e9ee4e406
coverity findings: add missing initialization.
2015-12-31 16:00:19 +01:00
83de707587
Refactor: Expand tabs to 4 spaces
2015-06-28 16:04:15 -06:00
a96a595a7a
Refactor: Trim trailing whitespace
2015-06-28 16:01:32 -06:00
4c1a0507fe
Refactor: Line endings are LF, not CRLF
2015-06-28 15:59:33 -06:00
2bfc353fde
License info: update year info.
2015-06-28 21:48:25 +02:00
c99bd9825a
Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...)
2015-04-29 18:13:16 +02:00
02ee002878
fix build for vs2013
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:38: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
e2f234707a
Fix possible crash in SceneCombiner when the destinations scene has mPrivate==null. Fixes #401 .
2015-04-12 19:53:24 +02:00
75fd29ac19
SceneCombiner: implement proper copying of meta data. This entire module will need to be revamped in future as it is highly likely to cause further regressions as assimp data structures are modified.
2014-06-17 15:18:10 +02:00
9b25749536
Fixed bug in merging of materials
2014-02-10 15:11:13 +01:00
ec3ef0c9d6
Assimp: fixed 3 memory leaks
2014-01-17 11:55:59 +01:00
bb9288fa26
Improved Q3BSPZipArchive + added material merging
2014-01-17 11:38:01 +01:00
4dbf539b44
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 03:38:30 +00:00
67e8e52a00
Fix a compiler warning.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1102 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-12-27 17:22:47 +00:00
9d85c8834d
- extract MaterialHelper and move all of its members to aiMaterial in /include.
...
- pull in IOhannes' patch to set the gcc default visibility for all symbols to NO and to mark ASSIMP_API with __attribute__ ((visibility("default"))).
- drop unneeded ASSIMP_API from most internal classes in /code, we just need to keep some exports on Windows to keep AssimpView alive.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1066 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-22 20:22:51 +00:00
36b3695a31
- improve symmetry between Assimp::Importer and Assimp::Exporter.
...
+ aiCopyScene -- a bit dysfunctional because we will also need getters and setters for all other scene components to avoid running into ownership & heap issues when users modify scenes.
# fix handling of postprocessing during exporting
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1061 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-04 08:53:59 +00:00
665f73861e
- move importer and postprocessing step construction chain to separate files to make them available to the exporter part.
...
+ introduce aiScene::mPrivate. This is a potentially breaking API change. The new member is added at the end of the structure though, so serious regressions are not to be expected.
+ add a mPreprocessing parameter to all Export API calls. Allow exporters to specify further PP steps to be executed prior to handing control to them. The entire export API now operates on a copy of the scene that the user passed in.
- mass refactoring: all constructors of BaseProcess/BaseImporter inherited classes are public now and Importer will perhaps feel a bit sad after having loft all of its friends.
# fix const correctness in SceneCombiner
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1060 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-01 20:58:31 +00:00
9edc0a9b8e
merge with git://github.com/tonttu/assimp.git
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1029 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 14:29:32 +00:00
6f30639d7f
- refraing from using magic numbers like 0xffffffff all over the repository, rather use UINT_MAX/SIZE_MAX ..
...
- minor re-formatting and refactoring at some old code spots.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@970 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 21:29:18 +00:00
0fc965da91
Rename strtolxxx family of functions, all functions returning unsigned integers now carry an 'u' in their name (this is for compatibility with Irrlicht's fast_atof see http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?p=243079#243079 ).
...
strtol10 -> strtoul10
strtol16 -> strtoul16
strtol8 -> strtoul8
strtol10_64 -> strtoul10_64
strtol_cppstyle -> strtoul_cppstyle
strtol10_s -> strtol10
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@923 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-23 14:26:19 +00:00
685d2b83c5
Fix error in aiString documentation. MAXLEN includes the terminal NULL. This is unusual, but true.
...
Fix overflow vulnerability in SceneCombiner. Thanks to Krishty to point it out.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@683 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-14 21:45:00 +00:00
7cea2eb497
Change date in license header to 2006-2010. This involves updating quite a few files, sorry.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@661 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-10 15:30:22 +00:00
df13041f42
Remove randomness from SceneCombiner.
...
This offers two advantages: firstly, boost::random isn't used by Assimp at all with these changes. Secondly, the results of the IRR/LWS loaders are guaranteed to be identical on each run now. That's crucial of course, I just failed to recognize it in the past.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@559 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-28 01:28:00 +00:00
17326515d4
Get rid of warnings on GCC4.4 with -wall
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@541 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-06 23:52:41 +00:00
Kim Kulling
Kim Kulling
BuildTools
Kim Kulling
Jared Mulconry
Alexandr Arutjunov
Chris Russ
tomacd
Richard
Léo Terziman
abma
Alexander Gessler
Alexander Gessler
aramis_acg
kimmi