Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,802 Commits 19 Branches 43 Tags
905e48a35c0f84d4931c2ad7ef5c6c6783b8bd1b
Commit Graph

101 Commits

Author SHA1 Message Date
Kim Kulling
905e48a35c Buffered stream API for big files: add next try of a prototype.^ 2016-10-11 12:29:40 +02:00
Alexandr Arutjunov
0359ded946 [F] Checking directive name with start from symbol 'm'. And checking argument of 'mtllib'. 2016-10-07 16:40:51 +03:00
John Senneker
c3ebdc56de Parse homogeneous vertex coordinates in OBJs 2016-10-04 17:06:31 -04:00
Kim Kulling
ffdca3593b ObjImporter: remove unused code. 2016-09-06 15:41:37 +02:00
Volodymyr Boichentsov
5c5acae92e Delete reduntal 'g ' from actual name of Group. (we don't have 'usemtl' in material name) 
Fixed issue in case 'usemtl' goes straight after 'g'.
 2016-07-22 14:10:06 +01:00
Chris Russ
05a6ee6473 Adding double precision import support for formats that can be exported 2016-07-16 18:23:33 +10:00
Roy Shilkrot
7d98643bcf adding support for per-vertex colors. 2016-06-27 20:08:22 -04:00
Robert Liebo
124fc9ae27 [VCS-1030] add log info about .mtl fallback 2016-03-22 18:39:52 +01:00
Robert Liebo
abb3e6b854 [VCS-1030] fallback for non-found .mtl file: try file name of original obj with just the file extension replaced by "mtl" 2016-03-22 18:38:28 +01:00
Kim Kulling
d9017299a8 iObjParser: refactorings. 2016-02-10 10:40:39 +01:00
Kim Kulling
8681abe845 Obj_Importer: remove dead code. 2016-02-09 17:50:08 +01:00
Kim Kulling
1550191256 Closes https://github.com/assimp/assimp/issues/777: fix invalid skipping 
of line during face defintion parsing.
 2016-02-08 18:07:00 +01:00
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
Kim Kulling
87b3af4c3b Merge branch 'issue-707' of https://github.com/ov/assimp into ov-issue-707 2015-12-14 17:46:54 +01:00
rmitton
b9a4e99607 Added support for empty .MTL files. 
Some programs such as Silo export an empty .MTL file if you export a
.OBJ that doesn't use any materials. This patch allows the loading of
such files.
 2015-12-13 22:13:25 -08:00
Vitaly Ovchinnikov
af40c99a6a trimming spaces around material names 2015-12-14 08:32:09 +13:00
Vitaly Ovchinnikov
c9ef6132a8 a small fix 2015-12-13 23:10:31 +13:00
Vitaly Ovchinnikov
6214fbfbbe this patch fixes multiple objects generation in OBJ reader if faces are prepended with 'usemtl' line 2015-12-13 22:54:50 +13:00
Łukasz Twarduś
3274bcf8d6 Properly build path to the mtl file when loading loading obj 2015-10-25 20:04:50 +01:00
Kim Kulling
e9937ab0f7 IOSystem: add missing documentation. 2015-08-30 15:37:56 +02:00
Kim Kulling
e4510c26ba Obj-Importer: fix https://github.com/assimp/assimp/issues/641 2015-08-30 15:21:53 +02: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
Kim Kulling
891c17ee7b Obj: remove dead code. 2015-07-09 19:59:47 +02:00
Kim Kulling
4a77170399 Coverity finding: fix 2 more resource leaks. 2015-07-06 20:47:45 +02:00
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