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

85 Commits (73174b7081625efe6020ea0e7a2d7809ee0331c5)

Author SHA1 Message Date
DenisMikhalev c410512173 Use material names, set default direction to UP_Y, process extra tag 2015-03-08 22:37:48 +03:00
Tom Mettam a09de30d83 Add support for component controlled matrix transforms, i.e transform(0)(0) etc. 2015-01-21 01:45:35 +00:00
abma 775b26e614 use std:: namespace for most cmath functions: 
http://en.cppreference.com/w/cpp/header/cmath
 2014-09-23 00:43:33 +02:00
acgessler 1a594b861a Collada: use a counter instead of clock() to generate unique names. Closes #357 2014-09-04 18:50:37 -07:00
Gargaj d333e08343 add ambient light type, allow collada to load it 2014-08-28 16:27:29 +02:00
Gregory Jaegy 16ae05eeeb obj loader: added multiline support 
collada loaded: bug fixed when importing several files, whith one containing animation
 2014-06-13 10:56:10 +02:00
Sherief Farouk d23430c4bd Collada mesh name is copied from id only if there was no name attribute in the <geometry> node. 2013-08-15 00:21:00 -04:00
Sherief Farouk 57e34cc90a Added loading of mesh name from Collada mesh to aiMesh struct. 2013-08-15 00:14:19 -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
Andy Maloney a03cb84d0c {COLLADA} Add detail to some errors/warnings & prefer '<>' for elements for readability 2013-06-15 18:00:40 -04:00
Matt Lilley d411cbfbf4 Make use of unit tag in asset info to scale the whole model 2013-05-23 12:15:14 +12:00
ulf 368092174b Merge branch 'master' of https://github.com/assimp/assimp 2013-03-27 12:52:28 +01:00
ulf 1cfd3b93fe - Bugfix: Collada URL parser now does read 2 digits of a %xy char only, as the spec says. 2013-03-27 12:52:22 +01:00
Alexander Gessler b4f666083a - collada: avoid unsafe float comparison against a magic number. 2013-03-21 20:00:33 +01:00
Alexander Gessler 0b9d6bec0d - drop a few swear words from documentation. Some of these are years old and I think the authors (me included) don't want them associated with their commits. 2013-03-21 19:54:55 +01:00
Alexander Gessler bae9db2f03 Merge branch 'master' of git://github.com/assimp/assimp 2012-12-21 16:24:05 +01:00
ulfjorensen 62b0284100 - applied patch by peteredc to make the Collada loader write mesh names 
- applied patch by asmaloney for better error messages in the Collada parser

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1301 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-09-21 08:44:37 +00:00
Alexander Gessler 30422fa683 - fix confusion between ASSIMP_BUILD_NO_COLLADA_IMPORTER and ASSIMP_BUILD_NO_DAE_IMPORTER (in favour of the first). 2012-07-07 20:53:24 +02: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
ulfjorensen 6d2857ed4a Bugfix: collada loader now preserves empty data arrays to work around stupid exporters writing empty animation channels 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1246 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-05 07:38:14 +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
ulfjorensen 5975f3eff2 - Bugfix: fixed Collada parser to accept empty data elements again 
- Workaround: added a little extra code to handle texture filenames of Maxon Cinema Collada Exporter 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1231 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-02 10:43:18 +00:00
kimmi 6caf98d945 Bugfix : Changed ColladaParser to be non-const in ColladaLoader::BuildMaterials. ( merged from GitHub, thanks to Riku Palomäki ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1229 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-21 22:17:42 +00:00
kimmi d17071746d Bugfix : Removed some unnecessary const_casts. ( merged from GitHub, thanks to Riku Palomäki ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1223 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-20 21:11:05 +00:00
aramis_acg 25fbc9989c # fix VS10 Debug Runtime check Failure due to data loss on type conversion. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1205 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-19 17:33:21 +00:00
ulfjorensen f633437d88 - Bugfix: Collada loader writes "zero transparency" to material now 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1202 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-16 13:06:56 +00:00
ulfjorensen 6970307b4e - Collada Exporter id naming scheme once again revised to exclude any potential invalid chars 
- Collada Exporter outputs proper URLs for texture file names now.
- Updated Collada Loader to understand and convert texture file name URLs

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1191 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-08 16:08:46 +00:00
aramis_acg 06bfcbf22d # [3191607] ColladaLoader error: attempt to copy-construct an iterator from a singular (see https://sourceforge.net/tracker/?func=detail&aid=3191607&group_id=226462&atid=1067632) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1156 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 18:05:38 +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
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
ulfjorensen 487071be77 Bugfix: FCollada's special texture tag "bump" now maps to aiTEXTURE_NORMAL. Thanks to agent8261 for the hint 
Bugfix: AssimpView now properly skips the leading quotation mark when being executed with a file

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1078 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-14 09:41:48 +00:00
aramis_acg 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
aramis_acg 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
aramis_acg 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
aramis_acg 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
ulfjorensen ec6ef9f145 Added a workaround to the Collada parser to handle certain XML tags which irrxml doesn't handle well. Corrected formatting on the way. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@842 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-19 14:06:32 +00:00
ulfjorensen fba2f78e06 Added a workaround to guess which material applies to anonymous Collada geometry subgroups. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@841 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-19 12:49:51 +00:00
kimmi bbca6ce865 Fix g++ specific compiler warning: Usage of temporary object. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@817 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-09-15 20:29:48 +00:00
aramis_acg bd4a4fd608 further work on http://sourceforge.net/tracker/index.php?func=detail&aid=3054873&group_id=226462&atid=1067632 - first try the old node resolving algorithm (which checks for node IDs), if this fails switch to a workaround which takes both node names and IDs into account. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@815 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-09-13 14:40:25 +00:00
aramis_acg e440fb2769 NDOLoader: improve reusability of some temporary vectors. 
ColladaLoader: fix http://sourceforge.net/tracker/?func=detail&aid=3054873&group_id=226462&atid=1067632, thanks to Adario for the report.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@814 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-09-11 19:44:06 +00:00
ulfjorensen 960f7defd7 Workaround: Collada loader combines alot of animations each affecting a single node into a combined animation. The stupidity of some export plugins knows no bounds. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@812 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-09-04 15:36:38 +00:00
ulfjorensen a9161ede18 Bugfix WIP: collada instanced nodes, still working on it. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@751 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-06-04 14:36:41 +00:00
ulfjorensen 219f9fadc6 Bugfix: removed misuse of "static" attribute preventing multithreaded usage of the importer 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@750 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-06-04 14:05:06 +00:00
adario 35c97d169e Fixed camera FOV computation in the ColladaLoader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@675 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-13 15:45:18 +00:00
aramis_acg 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
aramis_acg 762a7df46a Revamp exception handling. ImportErrorException renamed to DeadlyImportError to avoid silent regressions. Exceptions now thrown by value, and caught by reference. Put guards in all C++ and C API functions to avoid unwanted exception propagation across module and language boundaries. 
PLEASE TEST CAREFULLY IF THIS SHOULD CAUSE REGRESSIONS.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@617 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-18 17:00:12 +00:00
aramis_acg 5738860990 - Change BaseImporter::GetExtensionList to add all known file extensions to a std::set, so uniqueness is guaranteed. Also rewrite all related functions in Importer. NOTE: This does *not* change the public interface. 
- FIX build error on vc8/release-noboost x64, ConvertUTF.c had wrong PCH settings.
- ADD knowext and listext verbs to assimp_cmd, add some raw docs.
- Update unit tests to reflect these changes. Currently I keep getting failures in some tests, this needs to be resolved *urgently*.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@567 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-02 17:38:01 +00:00
ulfjorensen 3e529ac1fc Bugfix: Collada animation parser now handles multi-value data types correctly. Or at least I hope so. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@555 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-26 15:17:19 +00:00