Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,642 Commits 19 Branches 43 Tags
495ae70cc5423b1cda7c5999c4b44cf9fb9de0cd
Commit Graph

57 Commits

Author SHA1 Message Date
Kim Kulling
495ae70cc5 XFileParser: release x-file-based scene when throwing an exception. 2018-02-06 19:21:56 +01:00
Kim Kulling
dceb7257dd Update XFileParser.cpp 
Fix the build.
 2018-02-05 13:53:06 +01:00
Kim Kulling
eb23946fe7 Update XFileParser.cpp 
Fix alignment for float and double.
 2018-02-05 13:44:19 +01:00
Kim Kulling
ff556027ef X: fix some review findings. 2018-02-05 00:33:41 +01:00
Kim Kulling
3685791e0d closes https://github.com/assimp/assimp/issues/1729: check for bit flip when unsigned int overflow happens in x-file parsing. 2018-02-04 22:15:18 +01:00
Kim Kulling
b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
BuildTools
66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Kim Kulling
af216ec294 X-Importer: make it deal with lines. 2017-07-07 16:34:08 +02:00
Kim Kulling
a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Kim Kulling
e0dde73018 C++11-combat: replace more std::to_string by assimp-specific to_string 2016-10-15 21:25:16 +02:00
Chris Russ
05a6ee6473 Adding double precision import support for formats that can be exported 2016-07-16 18:23:33 +10:00
Kim Kulling
7207e5117c Use new include bracktes. 2016-06-06 22:04:29 +02:00
Kim Kulling
037fec275c std::to_string: add replacement for android build chain. 2016-05-25 00:26:41 +02:00
mensinda
ae99f99b99 Replaced boost::tuple with std::tuple 2016-04-06 00:17:21 +02:00
mensinda
b37e25cd7d Replaced boost::format with internal formater 2016-04-06 00:03:05 +02:00
Eric Engestrom
87e7cf00a2 Fix spelling mistakes 2016-04-03 01:38:00 +01:00
Kim Kulling
1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Kim Kulling
3af8014055 INcreas readability. 2015-07-03 19:00:21 +02:00
Richard
83de707587 Refactor: Expand tabs to 4 spaces 2015-06-28 16:04:15 -06:00
Richard
a96a595a7a Refactor: Trim trailing whitespace 2015-06-28 16:01:32 -06:00
Richard
4c1a0507fe Refactor: Line endings are LF, not CRLF 2015-06-28 15:59:33 -06:00
Kim Kulling
2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
Henry Stratmann III
328cae8a81 Added mesh name importing to .X ascii format. 2015-06-20 17:35:30 -05:00
U-ORADEV\albihern
7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05:00
abma
bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
Turo Lamminen
5a74e07f5f Mark some more functions with AI_WONT_RETURN 2015-02-27 23:09:12 +02:00
Turo Lamminen
f971b66c47 Fix out-of-bounds read in invalid compressed X file 2015-01-31 21:36:08 +02:00
James Lupiani
427eaad642 Fixes #158 via anonymous user 2014-05-12 12:04:19 -05:00
ulfjorensen
2944e7b210 - Added a workaround for some XFileExporter omitting separator chars at the end of data vectors 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1302 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-09-21 18:53:36 +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
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
c12fadc93b - make fast_atof_move a template and rename it to fast_atoreal_move. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1125 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-31 16:18:32 +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
ulfjorensen
2de55ee880 Bugfix: apply transformation as well when filtering out empty proxy nodes in XFile imports. Thanks to Magnus Norddahl for the patch 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1028 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-06-08 12:25:03 +00:00
aramis_acg
228be125cf # really fix false negative reading compressed x files. Silently ignore out-of-bounds indices. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1017 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-31 13:27:52 +00:00
aramis_acg
73a7fdf200 # fix potential off-by-one error when reading compressed X files. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1008 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-29 11:11:47 +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
aramis_acg
94767ecf8c Merge https://github.com/tonttu/assimp 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@903 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-02-20 00:01:52 +00:00
ulfjorensen
f601309db5 - anonym XFile materials are named now, to prevent them from being merged somehow 
- added another boost dependency - lexical_cast - and a little replacement for all those boost haters out there

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@826 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-10-08 17:27:59 +00:00
ulfjorensen
8aac702e1e - Workaround: ASCII XFiles aren't as strict on separator chars as before anymore. Should allow some more files to be parsed correctly. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@825 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-10-08 16:51:54 +00:00
aramis_acg
3204cf2736 Add conditional define to allow users to compile against their own zlib's. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@784 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-16 17:49:04 +00:00
aramis_acg
1b87557fd1 update to zlib 1.2.5. 
blenderloader now reads gzip compressed files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@737 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-26 00:21:07 +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
kimmi
5c1804f3ad - BUGFIX : Fixed compiler warning ( constant condition ). 
- BUGFIX : Fixed compiler warning ( not referenced parameter ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@490 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-10-10 11:59:00 +00:00
aramis_acg
a251827cb9 Adding support for Unicode input files to most text file loaders (BVH and MD5 missing for now). 
IrrXML receives memmapped UTF-8 input data now, it's own (faulty) conversion is not used anymore.
aiString's are explicitly UTF-8 now.
Slight refactorings and improvements.
Adding UTF-8/UTF-16 text files for ASE,obj,collada,ac3d. These contain various japanese/chinese character sequences.
Changing assimp_view's node view to display UTF-8 multibyte sequences correctly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@469 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-21 22:49:58 +00:00
ulfjorensen
ddbb8ab856 Bugfix: XFiles exported from kwxPort with vertex colors load correctly now. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@363 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-03-10 20:47:55 +00:00
aramis_acg
d41f570dc0 Added support for compressed x files (all files from dx sdk, except car2.x, work, no further tests yet). 
Added a working makefile for mingw, provides more configs now. Not perfect yet.
Added decompression part of zlib (inflate).
Moved IrrXML to ./contrib dir.
Moved some IRR/IRRmesh shared code.
FIXME: makefile for gnu/linux is untested yet.
Code cleanup.
Unified #ifndef ASSIMP_BUILD_nnn_IMPORTER directives.
OBJ loader supports map_bump, map_ka, map_ks, map_ns now.
Endianess conversion in the ply loader is correct now.
Changed IRR/IRRMESH coordinate system conversion. Not absolutely right now, but better than before.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@305 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-01-18 23:48:25 +00:00
ulfjorensen
342ea0188a - Bugfix: handling of XFile vertex colors is more forgiving now 
- Bugfix: XFileImporter filters empty animation sets now. 
- updated VC9 project files


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@239 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-11-14 12:44:03 +00:00
aramis_acg
1db46c242f Added temporary boost workaround - some assimp features work with reduced functionality in this case. 
Added AC-loader, WIP version.
PLY loader is now able to load models from blender, test model added. Refactoring.
Added FindInvalidData step.
Added support for precompiled headers, the release builds in VC8 are configued to use PCH now.
Added separate makefile for mingw, no -FPic warning anymore, -clear works now.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@176 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2008-10-13 16:45:48 +00:00