Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,455 Commits 19 Branches 43 Tags
8c6f18ea2af8ce6ecf6108c39de6ae12958d0bd1
Commit Graph

133 Commits

Author SHA1 Message Date
Kim Kulling
8c6f18ea2a Merge branch 'master' of https://github.com/assimp/assimp 2017-05-31 21:37:42 +02:00
Kim Kulling
1207a81b70 ObjImporter: remove dead code. 2017-05-31 21:37:16 +02:00
Kim Kulling
e501cc17c2 Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks 2017-05-31 20:18:39 +02:00
Kim Kulling
82380084c5 ObjImporter: next try for multiple line stuff. 2017-05-31 16:36:08 +02:00
Kim Kulling
813f3b8248 ObjLoader: improve performance of obj-import. 2017-05-30 21:10:33 +02:00
Kim Kulling
c121cec68a Obj-Importer: introduce working test for line breaks. 2017-05-29 22:00:13 +02:00
Kim Kulling
d30b1e585c Tests how o adress this topic. 2017-05-28 22:25:06 +02:00
Kim Kulling
3d99892b94 Opj-Importer: fix coverity finding. 2017-05-27 19:37:28 +02:00
Kim Kulling
1b4cbcc6ad Merge branch 'master' of https://github.com/assimp/assimp 2017-05-25 22:40:36 +02:00
Kim Kulling
a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Amit Cirt
dd1d10407e make array non static to support multithreaded 2017-05-01 16:54:07 +03:00
Amit Cirt
8b4e066ca5 Improve performance of obj line break 2017-05-01 16:32:49 +03:00
Amit Cirt
9fc7f72b55 fix line breakes in obj files 2017-04-11 17:16:18 +03:00
Antoine Bolvy
5dd1bb9d6c Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/ 2017-02-28 11:44:04 +09:00
Kim Kulling
b934331985 closes https://github.com/assimp/assimp/issues/1111: add warning when 
detecting invalid mat definition.
 2016-12-19 20:44:00 +01:00
Giuseppe Barbieri
fe7863d22f Update ObjFileParser.cpp 
Fixed error message
 2016-11-27 20:32:59 +01:00
Jared Mulconry
98e7eb476d Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix 
# Conflicts:
#	code/ObjFileImporter.cpp
 2016-11-27 13:00:33 +11:00
Albin Bernhardsson
347c09c539 Put back unused line (in comments) 2016-11-24 15:15:17 +01:00
Albin Bernhardsson
bd6f94b926 Remove unused variable 2016-11-24 14:15:13 +01:00
Jared Mulconry
f206249fbf Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix 
# Conflicts:
#	code/AMFImporter_Postprocess.cpp
#	code/FBXConverter.cpp
#	code/IFCLoader.cpp
#	code/NDOLoader.cpp
#	code/glTFAsset.inl
 2016-11-23 22:24:04 +11:00
Kim Kulling
ba2f377b52 Fix coverity findings. 2016-11-22 22:03:31 +01:00
Jared Mulconry
0c13322089 Fixed build warnings on MSVC14 x64 in the Obj format sources. 2016-11-20 12:29:26 +11:00
Alberto Taiuti
cf7059f074 Fix obj .mtl file loading 
Fix the obj file loader by adding a new method which allows
a name to be read considering the space in the middle between two
words and use that for parsing the "mtlib" line in the .obj file
parsing method.

Before, the method used in the obj parsing function would have
returned the string "mtlib NAME_OF_MTL" instead of "mtlib" only,
which resulted in the .mtl file being never parsed.
 2016-11-10 23:12:36 +00:00
Kim Kulling
c5d6ac2c30 ObjParser: remove deprecated code. 2016-11-10 21:39:32 +01:00
Kim Kulling
c07aee21b7 Fix build 2016-11-09 20:18:26 +01:00
Kim Kulling
568b459e24 Fix review findings. 2016-11-09 20:16:45 +01:00
Kim Kulling
ae956044aa ObjImporter: remove unnecessary allocations of std::vector in obj-specific 
face.
 2016-11-09 20:09:45 +01:00
Kim Kulling
b9261f01a3 Obj-Stream-Handling: fix compiler-errors and warnings. 2016-10-29 21:41:24 +02:00
Kim Kulling
949a27a743 New streaming interface: fix build. 2016-10-22 23:34:56 +02:00
Kim Kulling
cbe2e9af49 Merge branch 'master' into new_obj_stream_handling 2016-10-22 21:04:02 +02:00
John Senneker
acd2802f22 Check for std::string::npos before applying std::string::substr 2016-10-18 10:48:47 -04:00
John Senneker
4b15dfd9af Fix OBJ parser mtllib statement parsing bug. 
Since `getName` returns the whole line (including spaces) parse out the
first word for comparison.
 2016-10-17 18:48:04 -04:00
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