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

89 Commits (2466ae6c2ec09f9eb19b659f7346d3954b55a8c0)

Author SHA1 Message Date
Kim Kulling 37a3976b30 Revert "Fix issue: OBJ import takes forever (#759) (attempt 2)" 2016-02-07 20:03:24 +01:00
Andrew Parlane 109f6feb6e ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code. 
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.

This time I've fixed the order of evaluation bug in the call to getFace().
 2016-01-25 20:44:31 -04:00
Andrew Parlane 1632f1fbb9 ObjImporter: Added better progress reporting during file import. 
There are two stages to this:
1) Processing '\'s - this accounts for 1/3rd of the file import progress.
2) Parsing the file data - this accounts for the other 2/3rds.
 2016-01-11 12:21:24 -04:00
Kim Kulling 1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Łukasz Twarduś 3274bcf8d6 Properly build path to the mtl file when loading loading obj 2015-10-25 20:04:50 +01:00
Francesco Guastella 2750f8da24 Added support for reflection maps for OBJ files 2015-10-15 15:46:35 +02:00
Kim Kulling e4510c26ba Obj-Importer: fix https://github.com/assimp/assimp/issues/641 2015-08-30 15:21:53 +02:00
Turo Lamminen 0b0ba2ec4d Refactor logic which checks for too large allocations 
It's now easier to change the limit
 2015-08-14 11:53:16 +03:00
Turo Lamminen 5575a54466 Add various checks to avoid either too large or zero-sized memory allocations 2015-08-14 11:53:16 +03:00
Kim Kulling 5a207dbb19 Merge branch 'master' of https://github.com/assimp/assimp 2015-07-10 01:21:57 +02:00
Kim Kulling 14a849b398 Obj-loader: change include brackets. 2015-07-10 01:21:10 +02:00
Kim Kulling e138a02dd5 Obj: fix issue 121 - set group names as the mesh names. 2015-07-09 20:15:44 +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
Kim Kulling 995bc41d57 color node handling opengex 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-29 11:57:39 +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
Kim Kulling c0e3540ec1 use size_t instead of unsigned int ( static code analysis finding ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-05 21:19:07 +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 c3e2fa0761 - untabify obj parser. 
- bugfix openddl: latest version

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 19:31:23 +01:00
Kim Kulling b359deb7fd update: 
- add assert test in obj-import
- fix material token in Obj.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-21 20:37:36 +02:00
Kim Kulling 49c9786b0a update: avoid mesh generation on heap, when the mesh will be empty ( obj-loader ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-12 15:40:50 +02:00
Kim Kulling 7dff0c6d52 refactoring: remove not use iosystem. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-12 12:05:42 +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
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
Judith Hartmann 7d1a704ed7 saves value in the 'Ke'-Attribute in ObjMtl Files in COLOR_EMISSIVE 2014-03-16 21:30:10 +01:00
Nick Overdijk f433746bfa Add support for emissive and gloss-maps 
Conflicts:
	code/ObjFileMtlImporter.cpp
	Someone added support for loading more bump maps, I added support for emmissive-maps. Easy merge.
 2013-12-14 01:40:37 +01:00
gongwei 0b88f72be2 refactor the code, also parse texture option explictly 2013-12-02 22:58:15 +08:00
gongwei 0860254a2b Fix Obj texture parsing error: where obj texture map statement contains texture option, it will fail to parse the correct image url, as a result, the texture won't be shown. Besides, we also add clamp texture mode for obj 2013-12-02 22:55:51 +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
Kim Kulling e4fca83237 refactoring : remove dead code. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2013-10-08 16:30:17 +02:00
acgessler 7aa966e204 Obj: fix texture coordinate indexing bug, fixes #41 2013-10-04 13:07:59 +02:00
Alexander Gessler 0f5272cb50 Obj: set aiMesh::mPrimitiveTypes 2013-09-18 18:35:41 +02:00
Kim fbe408dd2e update : implement obj-support for normal maps. 
refactoring : some improvements for more readable code.

Signed-off-by: Kim <Kulling>
 2013-01-26 14:11:57 +01:00
kimmi cc88a3a0de update : add displacement map support to obj-material importer. this feature is supported by some special exporters. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1347 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2013-01-07 21:05:53 +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
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 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
kimmi d5bd7009a6 - Update : Apply simple patch for debian-specific build-fixes: adapt architecture-macro. 
- Bugfix : Fix a type in FixNormalStep.
- Bugfix : Fix a missing exception in Obj-Importer, texture coordinate import.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1079 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-23 16:45:17 +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 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 799ae75d67 # Obj: add missing check for empty normals, which caused models with no or partial normal sets to fail in some cases. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1010 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-29 20:38:46 +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
kimmi efc5c91746 - BUGFIX : Fix CanRead-method of obj-file-importer class: add missing token for a format validation. 
- REFACTORING : Make token list static.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@920 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-03-18 12:21:26 +00:00
kimmi a6a1d57781 BUGFIX : Set the object name in assimp-node instance. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@888 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-01-09 19:36:18 +00:00
kimmi d4f563c795 - UPDATE : Add bugfixes for the correct topology import from a bsp-level. 
- UPDATE : Add the first pk3-archive for the bsp-loader.
- UPDATE : Add missing license info to aiAssert-file.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@818 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-09-26 15:56:52 +00:00