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

2339 Commits

Author SHA1 Message Date
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
888ea72f20 Merge pull request #1061 from assimp/optimized_faces_in_obj 
ObjImporter: remove unnecessary allocations of std::vector
 2016-11-09 20:52:22 +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
1d08c9e2e2 Merge pull request #1060 from assimp/issue_1059 
Issue 1059
 2016-11-08 21:31:47 +01:00
Kim Kulling
9f96126362 ObjParser: remove dead code. 2016-11-08 20:35:21 +01:00
Kim Kulling
5ff1c39e02 Obj-Parser: Fix performance issue. 2016-11-08 20:34:55 +01:00
Kim Kulling
1aafe6287c Merge branch 'master' of https://github.com/assimp/assimp 2016-11-07 17:20:27 +01:00
Kim Kulling
8ffd94937e Fix BlenderDNA for clang cross compiler. 2016-11-07 17:19:49 +01:00
Kim Kulling
d4223d1fce closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057 2016-11-06 19:36:37 +01:00
Kim Kulling
cc7b7723c1 Merge branch 'master' of https://github.com/assimp/assimp 2016-11-05 18:41:52 +01:00
Kim Kulling
499886f89e ScenePreprocessor: fix invalid index counter. 2016-11-05 18:41:19 +01:00
AndrzejKozik
dcb7478785 Update FBXConverter.cpp 2016-11-04 09:20:04 +01:00
AndrzejKozik
a074ca58b3 Keys interpolation fix 
In line 3073 there was an unproper scope of cast to double.
 2016-11-04 08:48:14 +01:00
Kim Kulling
dfaea27dfc MaterialSystem: fix some findings. 2016-11-03 23:29:03 +01:00
Kim Kulling
c849e0108d Merge pull request #1055 from assimp/issue_957 
Fix compiler warnings related to issue 957.
 2016-11-03 19:11:56 +01:00
Kim Kulling
02e038bbb6 Fix compiler warnings related to issue 957. 2016-11-03 18:37:02 +01:00
Martin Gerhardy
b30dc8ffc9 Fixes compile issue for 3ds exporter 
... when you have disabled the 3ds importer
 2016-11-02 19:54:53 +01:00
Kim Kulling
3e05d13827 Merge pull request #1048 from tomacd/keep_materials_names 
Keep original materials names in RemoveRedundantMaterials, ColladaExporter
 2016-10-31 09:42:45 +01:00
Kim Kulling
fcac614ad0 Blender: fix compiler warning: FAIL already defined. 2016-10-30 19:21:38 +01:00
Kim Kulling
810fc405a8 Fix build. 2016-10-30 09:06:45 +01:00
Kim Kulling
293654fe7c Fix unittest. 2016-10-30 08:55:11 +01:00
Kim Kulling
b9261f01a3 Obj-Stream-Handling: fix compiler-errors and warnings. 2016-10-29 21:41:24 +02:00
Kim Kulling
186f3f091f Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_obj_stream_handling 2016-10-29 20:07:53 +02:00
Kim Kulling
b13c30f50e Obj: Fix some small issues 2016-10-29 19:07:30 +02:00
tomacd
8e8757f800 Keep original materials names after RemoveRedundant materials process and export to collada 2016-10-27 19:23:43 +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
Kim Kulling
d3a3bd9c12 BUgfixes regarding filepos setupBUgfixes regarding filepos setup. 2016-10-22 21:03:11 +02:00
Kim Kulling
33e370a8b7 Obj-Stream-Handling: fix readin of linewise import. 2016-10-21 21:14:35 +02:00
Kim Kulling
1724cc9e66 Remove redundant file. 2016-10-21 19:44:31 +02:00
Kim Kulling
50803b897c Merge branch 'master' of https://github.com/assimp/assimp 2016-10-21 19:43:56 +02:00
Kim Kulling
fe0cfc52bc Q3BSP-Loader: reformat include. 2016-10-20 22:25:39 +02:00
Kim Kulling
af54cb8a29 Q3BSP: fix license dates. 2016-10-20 17:04:37 +02:00
Kim Kulling
6a31e3528e Merge branch 'master' of https://github.com/assimp/assimp 2016-10-20 16:43:38 +02:00
Kim Kulling
91e833056e Q3BSP-Importer: remove commented code. 2016-10-20 16:42:00 +02:00
Kim Kulling
b0f09ee6e2 Merge pull request #903 from dontbmh/upstream 
fix strncpy not null terminated string
 2016-10-20 16:18:30 +02:00
Kim Kulling
74ab4afd01 Merge pull request #1042 from VeganPower/Fix_988 
Added support for 64 bit version header introduced in FbxSdk2016
 2016-10-19 16:03:53 +02:00
Kim Kulling
bac28061ea 3MF: fix nullptr access. 2016-10-18 21:16:44 +02:00
John Senneker
acd2802f22 Check for std::string::npos before applying std::string::substr 2016-10-18 10:48:47 -04:00
Kim Kulling
a54e42cb5a Some more fixes. 2016-10-18 14:02:58 +02: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
5cd16a0aa6 Merge pull request #1034 from ascandal/feature/gltf-compact-skins 
glTF compact skins
 2016-10-17 21:45:50 +02:00
Kim Kulling
ea0424de18 Merge pull request #1037 from ystreet/cfileio-leaks 
cfileio: fix leaks by not closing files in the destructor
 2016-10-17 17:29:38 +02:00
Kim Kulling
862dfd5a05 Merge pull request #1032 from ashdnazg/master 
use cmath and C++ (std::) versions of math functions
 2016-10-17 17:26:32 +02:00
Matthew Waters
cbcaa107eb cfileio: fix leaks by not closing files in the destructor 
Numerous importers rely on the default C++ IOSystem implementation
having the destructor close the file for them.  The C IOSystem wrapper
wasn't and instead assumed that the Close() method was going to be
called.

This brings the C IOSystem wrapper in line with the default C++ IOSystem
by having the destructor close the file.
 2016-10-18 00:35:56 +11:00
Kim Kulling
09ad67f469 3MF-Importer: remove unused variable. 2016-10-16 17:14:22 +02:00
Angelo Scandaliato
6ce2a37b82 merge upstream/master and fix conflicts 2016-10-15 18:12:02 -07:00