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

72 Commits (931cb7da7132eadb0259b499a9528bfa45d52f73)

Author SHA1 Message Date
Kim Kulling 001eef2a9f Coverify: fix resource leak. 2015-07-03 18:58:02 +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
Kim Kulling 85e2f47dc8 Merge pull request #523 from turol/afl-fixes 
More crash fixes
 2015-06-22 16:56:51 +02:00
Alexander Gessler faea2ecccc OBJ: Support spaces in material names, fixes #545. 
Adding test file.
 2015-05-10 23:50:18 +02:00
Łukasz Twarduś 55ae853c2e Fix compilation with libc++ 2015-04-19 10:55:58 +02:00
abma 8c45a4dc3b Merge remote-tracking branch 'origin' 
Conflicts:
	code/C4DImporter.cpp
	code/OgreImporter.h
 2015-04-16 01:03:00 +02:00
abma bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
Turo Lamminen 3e728e80eb Obj: Change asserts to exceptions 
These can be triggered by malformed input file so they can't be assertions.
 2015-04-01 16:13:46 +03:00
Kim Kulling bd1168af30 fix invalid line endling handling. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 20:46:02 +01:00
Kim Kulling a5afbcf29c refactoring: remove duplicate code. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-23 23:34:05 +02:00
Tyson Grant Nottingham 0c5605d07d Don't use isspace() in OBJ file parser. 2014-07-22 21:59:23 -07:00
Tyson Grant Nottingham 36c82fe5b0 Allow several spaces between numbers in OBJ files. 2014-07-21 23:03:08 -07:00
Kim Kulling b3b732c12b update: some micro improvements, replace post-increment operator with pre-increment operator. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-07-03 20:33:52 +02:00
Kim Kulling fbaf89492d bugfix: Obj-importer is now able to deal with 3d-texture coordinates. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-04-29 00:04:54 +02:00
Jared Duke 931f0489bd Properly parse 'mg' keyword in .obj files 
The 'mg' keyword is currently being interpreted as a material library keyword,
when it really refers to the merging group.  Handle this case, in effect ignoring
the keyword as merging groups are currently unsupported.
 2013-11-26 14:24:15 -08:00
Kim Kulling 685612b9f4 - refactoring : remove not used mesh index from private method in obj-importer. 
- refactoring : remove commented code.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2013-10-11 15:29:17 +02:00
Calvin Hsu 32a10ec0a0 obj: Add support for relative vertex indexing 
obj files allow faces to specify indices relatively by using negative
integers. See vertex refering in http://www.martinreddy.net/gfx/3d/OBJ.spec
 2013-09-30 15:26:40 -07:00
Calvin Hsu c29109d1a4 obj: Fix tabs causing vertices to be skipped 
If an obj vertex definition 'v' is followed by a tab instead of a space,
the vertex definition is skipped.
 2013-09-30 15:16:26 -07:00
Alexander Gessler e80886f12c Obj: support line continuations with \ (fixes #91) 2013-09-18 19:34:03 +02:00
Andy Maloney d7c6cd9ece {OBJ} Allow spaces in group names 2013-06-20 08:40:08 -04:00
kimmi 648e8fe924 - Bugfix: Fix two possible reasons for bug ID 3039342 : On skipping an invalid material description in obj-loader avoid creating aiMaterial instance. Release obj-specific material instances. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1186 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-26 13:36:29 +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 2c0965795c [ 3460982] Patch for Bug 3460978 - Obj loader not generating new objects for material groups. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1108 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-11 13:38:56 +00:00
kimmi ab71ca60c3 - Feature : First buggy prototype of the M3-loader for starcraft models. 
- Bugfix  : Fix some typo's in the obj-loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1085 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-10-31 08:34:55 +00:00
aramis_acg df63b4b3ed [3298060] OBJ: Add support for p and l elements 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1070 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-23 16:23:13 +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 36d3a60c40 # fix obj crashes due to out-of-bounds indices in the input files. This fixes models/invalid/malformed.obj and models/invalid/malformed2.obj. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@982 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-07 11:14:06 +00:00
aramis_acg a83183d95f # fix transposed memset() parameters -> replace by fill_n 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@978 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-06 20:26:55 +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
aramis_acg cab35c496d [3053648] Obj: segfault when first line is a material. 
Add test file to reproduce the issues. Thanks to Ingo Kresse for providing the patch.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@807 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-27 12:36:02 +00:00
aramis_acg 7a50b03fc5 Obj: Remove deprecated assertion - empty object names are fine. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@796 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-23 15:34:48 +00:00
kimmi c38c91d28d Bugfix : Fixed not ANSI character in comment. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@746 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-30 18:35:55 +00:00
kimmi f3310b0f36 BUGFIX : Fix handling of multiple materials per object definition in Obj-Loader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@745 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-30 12:45:38 +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 70c4eb4d3a Fix buffer overrun in Obj-loader (this is related to [2970556]). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@610 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-16 00:04:17 +00:00
kimmi 78f27eef13 BUGFIX : Fix incorrect INSTALL target. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@558 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-27 14:04:14 +00:00
kimmi 21f948288c BUGFIX : Fix crash in material loader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@535 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-02 19:54:37 +00:00
kimmi 5c0432057a - REFACTORING : Removing deprecated code from obj-loader. 
- BUGFIX      : Fix memory leak in obj-loader, when an empty mesh was detected and ignored.
- BUGFIX      : Fix invalid material assignment in obj-loader, when groups are used instead of objects. 


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@534 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-31 16:53:08 +00:00
kimmi a870710f56 - REFACTORING : Remove not used header from ObjFileParser. 
- REFACTORING : Rename IO instance of ObjParser.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@509 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-06 12:14:47 +00:00
kimmi 1829481591 - UPDATE : Add group loading support to Obj-Loader. Many thanks to Robert Ramirez for this Patch. 
- UPDATE : Add Robert Ramirez to CREDITS file.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@506 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-11-27 14:33:29 +00:00
aramis_acg 64168ba975 FIX: ObjLoader failed to locate material files if the input path contained 'wrong' path delimiters. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@471 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-24 08:46:04 +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
kimmi d3ff282987 - Removed dead code. 
- Fixed some compiler warnings ( occurred with warning level 4 ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@467 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-19 20:45:51 +00:00
kimmi af725fd545 - Bugfix 2824877: Avoid handling of negative ids in face definitions. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@462 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-02 17:17:40 +00:00
kimmi eda47a6f0b - Add new helper funtion to detect end of buffer. 
- Bugfix Obj-loader: If material file is not ended with a newline material loader crashes: Check for end of buffer.
- Refactoring: Rename helper function isSpace to isSeparator to make sense of function much clearer!

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@461 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-02 17:11:38 +00:00