v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,782 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

356 Commits (267ff0b93cad258908ae5928517f9577ddfaab66)

Author SHA1 Message Date
Jonne Nauha 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
arkeon 3acf60f5d7 Correction on quaternion initialization values 
a 0 0 0 0 quaternion is not valid
 2014-05-27 11:26:55 +02:00
Kim Kulling 0f71d46c35 Merge pull request #276 from g-pechorin/master 
lt operator for aiVector3
 2014-05-14 21:35:48 +02:00
Peter LaValle 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
Peter LaValle 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
Kim Kulling fb1c9ab86d bugfix: fix cexport API for c compilers. 2014-05-11 16:50:35 +02:00
Kim Kulling 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
Jonne Nauha 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
Jonne Nauha 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
Kim Kulling 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
Jonne Nauha c329e81c94 Fix stdint.h include that broke the build for VC9 and below. 2014-04-30 05:58:19 +03:00
Léo Terziman 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
xantares f48c8eccce Fix for issue #177 with mingw 2014-04-21 21:58:29 +02:00
Kim Kulling 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
Kim Kulling 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
Léo Terziman ed586a35ae Fixed compilation error when using swig 2014-03-24 11:24:27 +01:00
Léo Terziman 1f3be52079 Merge remote-tracking branch 'official/master' into contrib 2014-03-24 10:44:57 +01:00
Léo Terziman 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
Frederik Aalund 595529ef8b Refactored the metadata for inner consistency. 2014-03-15 08:37:45 +01:00
Frederik Aalund 9b78a180d9 Added a convenience overload for aiMetadata::Get using std::string as key. 2014-03-14 17:12:22 +01:00
Frederik Aalund 56f37a0465 Deprecated some abstraction and fixed a memory leak. 2014-03-14 15:36:12 +01:00
Frederik Aalund fc39fe9f40 Fixed a compile error involving unnecessary enum resolution qualification. 2014-03-14 15:01:36 +01:00
Frederik Aalund a8401ba377 Added support for heterogenous metadata on the aiNodes. 2014-03-14 14:17:34 +01:00
Léo Terziman 796e072898 Fixed warnings when using swig 2014-03-03 15:36:49 +01:00
Léo Terziman f54c85d4e6 Added custom root transformation for pre-transform vertices post-process step 2014-02-28 15:32:43 +01:00
Léo Terziman 843e56c252 Added matrix properties 2014-02-28 15:21:10 +01:00
Léo Terziman b90718bd21 Merge remote-tracking branch 'official/master' into contrib 
Conflicts:
	code/IFCLoader.cpp
 2014-02-26 18:06:46 +01:00
Alexander Gessler 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
George Papadopoulos 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
David Greaves 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
Léo Terziman 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
Léo Terziman 34c3449cdd Always activate thread safety if possible 2014-01-17 12:03:18 +01:00
Léo Terziman 41175dacca Merge commit '6d630bec50fe7767296b0e5184a9c6c7b915df24' into contrib 2014-01-17 11:57:45 +01:00
Léo Terziman 7bc074857e Missing material functions for aiUVTransform added 2014-01-17 11:51:43 +01:00
Léo Terziman d28fc25c5c Merge commit 'cc3f8b82f9f6fb4b295a39a3f7ac55154145cc04' into contrib 
Conflicts:
	CMakeLists.txt
 2014-01-17 11:45:57 +01:00
Léo Terziman 4e7b59be55 Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio 2014-01-17 11:43:48 +01:00
Léo Terziman 2c4e55ac61 Fixed gcc /mingw building 2014-01-17 11:31:39 +01:00
Léo Terziman f5e3382d58 Correct some warnings when building with mingw 2014-01-17 11:30:51 +01:00
Léo Terziman bc40ebd730 Improved color comparison 2014-01-17 11:28:06 +01:00
Léo Terziman 365b3aa412 Improved math operation with epsilon support 2014-01-17 11:21:15 +01:00
Léo Terziman 6c0ebb679a Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib 
Conflicts:
	code/ColladaExporter.cpp
 2014-01-17 11:19:29 +01:00
Léo Terziman bbfd56046b Fixed constructor of aiMesh for improved lisibility 2014-01-17 10:33:54 +01:00
Léo Terziman 30c6a74e1d Improving constructors of aiNode & aiScene 2014-01-17 10:31:27 +01:00
Léo Terziman 6b471317d2 Adding support for matrix4x4 construction from position, rotation and scaling parameters 2014-01-17 10:27:11 +01:00
Léo Terziman 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
Nick Overdijk 5b076fe234 Fixes warnings in clang for unrecognized attribute 'gcc_struct' 2013-12-14 01:40:37 +01:00
Marcel Metz 93fd1133ff Fixed mingw cross compiler issues. 2013-11-20 14:40:20 +01:00
acgessler faaea5224f Exporter: update documentation. 2013-10-05 16:18:36 +02:00
acgessler 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
Alexander Gessler 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
Alexander Gessler 45572e8079 Merge branch 'master' of github.com:assimp/assimp 2013-09-04 21:52:17 +02:00
Alexander Gessler fd0b3490d1 Clarify exporter doc: how to get a modifiable copy of a previously imported scene. 2013-09-02 21:33:43 +02:00
Alexander Gessler 0edb78d940 Add aiFreeScene() API for symmetry with aiCopyScene. 2013-09-02 21:32:20 +02:00
abma 169e5b9f35 fix error "Chunk is too large" with gcc >=4.7.0 / mingw64 2013-08-29 06:31:10 +02:00
Sherief Farouk 0d57e659cb Added AI_WONT_RETURN_SUFFIX mainly for Clang's static analyzer. 2013-08-04 10:10:21 -04:00
YoheiKakiuchi 5470f5fb28 add AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION for not transforming position of vertices 2013-07-27 10:34:48 +09:00
Alexander Gessler 506d3fa154 Forward declare IOSystem in Exporter.hpp 2013-06-30 16:25:46 +02:00
Andy Maloney 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
Alexander Gessler 27c578675a Merge pull request #51 from asmaloney/init_fixes 
Prefer init list and add missing initializations
 2013-06-12 08:16:14 -07:00
Andy Maloney c6d1a73854 Fix a logging message and a comment 2013-06-12 09:01:05 -04:00
Andy Maloney 0e54b87b1e Prefer init list and add missing initializations 2013-06-12 08:59:47 -04:00
Dennis Schridde 2bdbcd78e7 Amend dd1a18149cac29a69a0242a5efc467498f5f05cd: Visibility attribute is needed for MSVC/C++ 2013-05-16 13:08:05 +02:00
Dennis Schridde 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
Dennis Schridde 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
Jared Duke 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
Alexander Gessler fa5831f41a - add metadata support to aiScene. Some doc cleanup. Add const versions of aiScene::aiNode. 2013-03-28 20:54:12 +01:00
Alexander Gessler 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
Alexander Gessler 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
Alexander Gessler 260568912c - Importer::ReadFileFromMemory/aiImportFileFromMemory() clarify wording in documentation 2013-03-10 19:15:14 +01:00
Andy Maloney b20023ed3d Pass by reference, not value 2013-02-10 22:23:13 -05:00
acgessler 7fd44f4ab7 Merge branch 'master' of git://github.com/assimp/assimp 2013-01-19 16:35:28 +01:00
Alexander Gessler ab9587dd1e Merge pull request #12 from ccxvii/master 
Precision fix and Collada robustness fix.
 2013-01-15 12:04:48 -08:00
Alexander Gessler bae9db2f03 Merge branch 'master' of git://github.com/assimp/assimp 2012-12-21 16:24:05 +01:00
ulfjorensen 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
ulfjorensen 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
Tor Andersson 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
ulfjorensen 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
aramis_acg 54040901f0 - update Assimp.NET 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1330 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-11-03 02:49:19 +00:00
Alexander Gessler 3e86e1b857 - fbx: add import settings to public assimp config interface. 2012-08-11 16:41:44 +02:00
Alexander Gessler 776d8e339b Merge branch 'master' of https://github.com/assimp/assimp 2012-07-24 03:30:47 +02:00
aramis_acg 1378579224 - remove aiProcess_Debone from aiProcessPreset_TargetRealtime_MaxQuality as it seems to be causing issues (read: is buggy, consider kicking it out again). See http://zfx.info/viewtopic.php?f=5&t=2439&p=32278#p32223 for more info. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1292 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 22:25:45 +00:00
Alexander Gessler 4e9a0bba20 + add AI_CONFIG_IMPORT_NO_SKELETON_MESHES flag to control skeleton mesh visualization. No need for this in Blender, and difficult to just ignore the geometry created by it. 2012-06-21 17:24:50 +02:00
jonathanklein 29243071fa Ogre: Importerproperty to set Texture Mode from Filename (bla_n.png -> Normalmap etc.) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1254 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-03 18:01:32 +00:00
aramis_acg ec6c62e005 - consistent use of ai_assert instead of assert. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1241 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:22:40 +00:00
aramis_acg adfef670cc - rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1240 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:14:39 +00:00
aramis_acg d3030b2aea Patch [3520366] Docs: Spelling and grammar fixes for postprocess.h by Andy Maloney. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1239 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:02:24 +00:00
aramis_acg 5a81b42ebe - add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1234 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 22:26:26 +00:00
aramis_acg e479355d0a + add aiImporterDesc API to hold importer meta information. 
- cleanup some Importer APIs: FindLoader -> GetImporter, add some utility APIs. Note that this is a breaking API change.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1232 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-18 23:07:52 +00:00
kimmi 71b8fa7cb5 Bugfix : Commit not saved changes. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1226 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-20 22:41:39 +00:00
kimmi 694cf75070 Bugfix : Fixed a possibly crash bug in ~aiExportDataBlob, was using a wrong delete. ( merged from GitHub, thanks to Riku Palomäki ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1224 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-20 21:12:38 +00:00
jonathanklein 6852eb6ffe - compiler error fixes for sample programs 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1171 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-18 10:53:58 +00:00
aramis_acg 6fa251c2f2 - unify naming of all header files. Obviously, this is a breaking change that affects all users. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1150 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 17:04:06 +00:00
aramis_acg 075b1acaf0 - move include/ to include/assimp/ to have consistent header locations between installed and trunk version. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1148 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 16:25:12 +00:00
aramis_acg 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
aramis_acg daf7c07ff1 # fix C issues in the headers. This fixes [3481648] (https://sourceforge.net/tracker/?func=detail&aid=3481648&group_id=226462&atid=1067632) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1137 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-02 13:56:45 +00:00
aramis_acg ea3f655c57 - templatize math library. All standard math classes (i.e. aiMatrix4x4) have been replaced by templates which are usually named like the old type with a 't' postfix. For compatibility, typedefs to replace the old types exist. For the C interface, these still map to raw structures. 
While principally backwards-compatible, this is still a breaking change since I also changed some method signatures (i.e. aiVector3t<TReal>(TReal) is now explicit). Normal users should not be affected, though.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1129 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-02 02:06:08 +00:00
aramis_acg 3f369342d6 - Redesign the C interface to allow per-import settings. 
- Make C-API threadsafe even without boost (no longer a global importer <-> scene map).
- Cleanup headers.
- Change the way how Importer::pimpl is accessed - all users are no longer friends of Importer to avoid spoiling the public interface. Rather, pimpl is exposed via a public member function and anyone having the definition of ImporterPimpl can access it.

THIS IS A BREAKING API CHANGE for anyone using properties with the C API. It is, however, a huge step forward and finally makes our C API functionally equivalent to the C++ interface.

I hope we can adapt all ports as soon as possible. I'd be grateful if the respective maintainers could do this.

Documentation is not yet up to date.

All this is in anticipation to the upcoming 3.0 release, which I'm actively working on.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1111 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-13 14:07:58 +00:00
aramis_acg 20495de804 + add aiString::C_Str 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1110 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-13 00:44:27 +00:00
aramis_acg d3d82030c7 Fix [3472966] "The public include export.h has a reference to boost" 
See http://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3472966&group_id=226462

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1109 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-13 00:31:21 +00:00
ulfjorensen a73397198c - Bugfix #3457587: correct decomposition of matrices with negative scaling. Thanks to anonymous google account user for the fix. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1099 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-12-12 08:44:48 +00:00