platform/upstream/assimp.git
7 years agoFix obj .mtl file loading
Alberto Taiuti [Thu, 10 Nov 2016 23:12:36 +0000 (23:12 +0000)]
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.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 10 Nov 2016 20:40:05 +0000 (21:40 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoObjParser: remove deprecated code.
Kim Kulling [Thu, 10 Nov 2016 20:39:32 +0000 (21:39 +0100)]
ObjParser: remove deprecated code.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 10 Nov 2016 15:26:57 +0000 (16:26 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoRemove some whitespaces.
Kim Kulling [Thu, 10 Nov 2016 15:26:17 +0000 (16:26 +0100)]
Remove some whitespaces.

7 years agoMerge pull request #1062 from byteblob/patch-1
Kim Kulling [Thu, 10 Nov 2016 12:47:19 +0000 (13:47 +0100)]
Merge pull request #1062 from byteblob/patch-1

added void to aiGetErrorString's args

7 years agoMake travis build faster.
Kim Kulling [Thu, 10 Nov 2016 09:33:07 +0000 (10:33 +0100)]
Make travis build faster.

7 years agoadded void to aiGetErrorString's args
byteblob [Wed, 9 Nov 2016 21:43:01 +0000 (22:43 +0100)]
added void to aiGetErrorString's args

7 years agoMerge pull request #1061 from assimp/optimized_faces_in_obj
Kim Kulling [Wed, 9 Nov 2016 19:52:22 +0000 (20:52 +0100)]
Merge pull request #1061 from assimp/optimized_faces_in_obj

ObjImporter: remove unnecessary allocations of std::vector

7 years agoFix build
Kim Kulling [Wed, 9 Nov 2016 19:18:26 +0000 (20:18 +0100)]
Fix build

7 years agoFix review findings.
Kim Kulling [Wed, 9 Nov 2016 19:16:45 +0000 (20:16 +0100)]
Fix review findings.

7 years agoObjImporter: remove unnecessary allocations of std::vector in obj-specific
Kim Kulling [Wed, 9 Nov 2016 19:09:45 +0000 (20:09 +0100)]
ObjImporter: remove unnecessary allocations of std::vector in obj-specific
face.

7 years agoMerge pull request #1060 from assimp/issue_1059
Kim Kulling [Tue, 8 Nov 2016 20:31:47 +0000 (21:31 +0100)]
Merge pull request #1060 from assimp/issue_1059

Issue 1059

7 years agoObjParser: remove dead code.
Kim Kulling [Tue, 8 Nov 2016 19:35:21 +0000 (20:35 +0100)]
ObjParser: remove dead code.

7 years agoObj-Parser: Fix performance issue.
Kim Kulling [Tue, 8 Nov 2016 19:34:55 +0000 (20:34 +0100)]
Obj-Parser: Fix performance issue.

7 years agoQtViewer: some refactorings.
Kim Kulling [Tue, 8 Nov 2016 13:53:52 +0000 (14:53 +0100)]
QtViewer: some refactorings.

7 years agoCode reformatting.
Kim Kulling [Tue, 8 Nov 2016 09:38:57 +0000 (10:38 +0100)]
Code reformatting.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 7 Nov 2016 16:20:27 +0000 (17:20 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoFix BlenderDNA for clang cross compiler.
Kim Kulling [Mon, 7 Nov 2016 16:19:49 +0000 (17:19 +0100)]
Fix BlenderDNA for clang cross compiler.

7 years agoFix build:
Kim Kulling [Sun, 6 Nov 2016 19:39:33 +0000 (20:39 +0100)]
Fix build:

7 years agocloses https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues...
Kim Kulling [Sun, 6 Nov 2016 18:36:37 +0000 (19:36 +0100)]
closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 5 Nov 2016 17:41:52 +0000 (18:41 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoScenePreprocessor: fix invalid index counter.
Kim Kulling [Sat, 5 Nov 2016 17:41:19 +0000 (18:41 +0100)]
ScenePreprocessor: fix invalid index counter.

7 years agoMerge pull request #1056 from AndrzejKozik/patch-1
Kim Kulling [Fri, 4 Nov 2016 17:51:55 +0000 (18:51 +0100)]
Merge pull request #1056 from AndrzejKozik/patch-1

Keys interpolation fix

7 years agoUpdate FBXConverter.cpp
AndrzejKozik [Fri, 4 Nov 2016 08:20:04 +0000 (09:20 +0100)]
Update FBXConverter.cpp

7 years agoKeys interpolation fix
AndrzejKozik [Fri, 4 Nov 2016 07:48:14 +0000 (08:48 +0100)]
Keys interpolation fix

In line 3073 there was an unproper scope of cast to double.

7 years agoMaterialSystem: fix some findings.
Kim Kulling [Thu, 3 Nov 2016 22:29:03 +0000 (23:29 +0100)]
MaterialSystem: fix some findings.

7 years agoMerge pull request #1055 from assimp/issue_957
Kim Kulling [Thu, 3 Nov 2016 18:11:56 +0000 (19:11 +0100)]
Merge pull request #1055 from assimp/issue_957

Fix compiler warnings related to issue 957.

7 years agoFix compiler warnings related to issue 957.
Kim Kulling [Thu, 3 Nov 2016 17:37:02 +0000 (18:37 +0100)]
Fix compiler warnings related to issue 957.

7 years agoMerge pull request #1054 from mgerhardy/patch-2
Kim Kulling [Thu, 3 Nov 2016 11:35:56 +0000 (12:35 +0100)]
Merge pull request #1054 from mgerhardy/patch-2

Fixes compile issue for 3ds exporter

7 years agoMerge pull request #1053 from rdb/patch-2
Kim Kulling [Wed, 2 Nov 2016 19:12:59 +0000 (20:12 +0100)]
Merge pull request #1053 from rdb/patch-2

Fix compile error with MSVC 2015

7 years agoFixes compile issue for 3ds exporter
Martin Gerhardy [Wed, 2 Nov 2016 18:54:53 +0000 (19:54 +0100)]
Fixes compile issue for 3ds exporter

... when you have disabled the 3ds importer

7 years agoFix compile error with MSVC 2015
rdb [Wed, 2 Nov 2016 17:42:16 +0000 (18:42 +0100)]
Fix compile error with MSVC 2015

This patch fixes compilation with MSVC 2015.  WIN32 is not a preprocessor symbol that is defined by MSVC, but _WIN32 is.

7 years agoMerge pull request #1048 from tomacd/keep_materials_names
Kim Kulling [Mon, 31 Oct 2016 08:42:45 +0000 (09:42 +0100)]
Merge pull request #1048 from tomacd/keep_materials_names

Keep original materials names in RemoveRedundantMaterials, ColladaExporter

7 years agoBlender: fix compiler warning: FAIL already defined.
Kim Kulling [Sun, 30 Oct 2016 18:21:38 +0000 (19:21 +0100)]
Blender: fix compiler warning: FAIL already defined.

7 years agoMerge pull request #1043 from assimp/new_obj_stream_handling
Kim Kulling [Sun, 30 Oct 2016 11:30:52 +0000 (12:30 +0100)]
Merge pull request #1043 from assimp/new_obj_stream_handling

New obj stream handling

7 years agoFix rounding issue in unittest for block calculation.
Kim Kulling [Sun, 30 Oct 2016 10:16:31 +0000 (11:16 +0100)]
Fix rounding issue in unittest for block calculation.

7 years agoFix build.
Kim Kulling [Sun, 30 Oct 2016 08:06:45 +0000 (09:06 +0100)]
Fix build.

7 years agoFix unittest.
Kim Kulling [Sun, 30 Oct 2016 07:55:11 +0000 (08:55 +0100)]
Fix unittest.

7 years agoObj-Stream-Handling: fix compiler-errors and warnings.
Kim Kulling [Sat, 29 Oct 2016 19:41:24 +0000 (21:41 +0200)]
Obj-Stream-Handling: fix compiler-errors and warnings.

7 years agoMerge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_o...
Kim Kulling [Sat, 29 Oct 2016 18:07:53 +0000 (20:07 +0200)]
Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_obj_stream_handling

7 years agoAdd missing license info.
Kim Kulling [Sat, 29 Oct 2016 17:11:00 +0000 (19:11 +0200)]
Add missing license info.

7 years agoObj: Fix some small issues
Kim Kulling [Sat, 29 Oct 2016 17:07:30 +0000 (19:07 +0200)]
Obj: Fix some small issues

7 years agoKeep original materials names after RemoveRedundant materials process and export...
tomacd [Thu, 27 Oct 2016 17:23:43 +0000 (19:23 +0200)]
Keep original materials names after RemoveRedundant materials process and export to collada

7 years agoNew streaming interface: fix build.
Kim Kulling [Sat, 22 Oct 2016 21:34:56 +0000 (23:34 +0200)]
New streaming interface: fix build.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 22 Oct 2016 20:15:00 +0000 (22:15 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoQtViewer: fix review findings.
Kim Kulling [Sat, 22 Oct 2016 20:14:01 +0000 (22:14 +0200)]
QtViewer: fix review findings.

7 years agoMerge branch 'master' into new_obj_stream_handling
Kim Kulling [Sat, 22 Oct 2016 19:04:02 +0000 (21:04 +0200)]
Merge branch 'master' into new_obj_stream_handling

7 years agoBUgfixes regarding filepos setupBUgfixes regarding filepos setup.
Kim Kulling [Sat, 22 Oct 2016 19:03:11 +0000 (21:03 +0200)]
BUgfixes regarding filepos setupBUgfixes regarding filepos setup.

7 years agoObj-Stream-Handling: fix readin of linewise import.
Kim Kulling [Fri, 21 Oct 2016 19:14:35 +0000 (21:14 +0200)]
Obj-Stream-Handling: fix readin of linewise import.

7 years agoRemove redundant file.
Kim Kulling [Fri, 21 Oct 2016 17:44:31 +0000 (19:44 +0200)]
Remove redundant file.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 21 Oct 2016 17:43:56 +0000 (19:43 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoQt5-based Viewer: fix build.
Kim Kulling [Fri, 21 Oct 2016 10:50:41 +0000 (12:50 +0200)]
Qt5-based Viewer: fix build.

7 years agoQ3BSP-Loader: reformat include.
Kim Kulling [Thu, 20 Oct 2016 20:25:39 +0000 (22:25 +0200)]
Q3BSP-Loader: reformat include.

7 years agoQ3BSP: fix license dates.
Kim Kulling [Thu, 20 Oct 2016 15:04:37 +0000 (17:04 +0200)]
Q3BSP: fix license dates.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 20 Oct 2016 14:43:38 +0000 (16:43 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoQ3BSP-Importer: remove commented code.
Kim Kulling [Thu, 20 Oct 2016 14:42:00 +0000 (16:42 +0200)]
Q3BSP-Importer: remove commented code.

7 years agoMerge pull request #903 from dontbmh/upstream
Kim Kulling [Thu, 20 Oct 2016 14:18:30 +0000 (16:18 +0200)]
Merge pull request #903 from dontbmh/upstream

fix strncpy not null terminated string

7 years agoMerge pull request #1042 from VeganPower/Fix_988
Kim Kulling [Wed, 19 Oct 2016 14:03:53 +0000 (16:03 +0200)]
Merge pull request #1042 from VeganPower/Fix_988

Added support for 64 bit version header introduced in FbxSdk2016

7 years ago3MF: fix nullptr access.
Kim Kulling [Tue, 18 Oct 2016 19:16:44 +0000 (21:16 +0200)]
3MF: fix nullptr access.

7 years agoMerge pull request #1040 from johnmaf/bugfix/obj-mtllib-parse
Kim Kulling [Tue, 18 Oct 2016 15:09:06 +0000 (17:09 +0200)]
Merge pull request #1040 from johnmaf/bugfix/obj-mtllib-parse

Fix OBJ parser mtllib statement parsing bug.

7 years agoCheck for std::string::npos before applying std::string::substr
John Senneker [Tue, 18 Oct 2016 14:48:47 +0000 (10:48 -0400)]
Check for std::string::npos before applying std::string::substr

7 years agoSome more fixes.
Kim Kulling [Tue, 18 Oct 2016 12:02:58 +0000 (14:02 +0200)]
Some more fixes.

7 years agoFix OBJ parser mtllib statement parsing bug.
John Senneker [Mon, 17 Oct 2016 22:48:04 +0000 (18:48 -0400)]
Fix OBJ parser mtllib statement parsing bug.

Since `getName` returns the whole line (including spaces) parse out the
first word for comparison.

7 years agoMerge pull request #1034 from ascandal/feature/gltf-compact-skins
Kim Kulling [Mon, 17 Oct 2016 19:45:50 +0000 (21:45 +0200)]
Merge pull request #1034 from ascandal/feature/gltf-compact-skins

glTF compact skins

7 years agoMerge pull request #1037 from ystreet/cfileio-leaks
Kim Kulling [Mon, 17 Oct 2016 15:29:38 +0000 (17:29 +0200)]
Merge pull request #1037 from ystreet/cfileio-leaks

cfileio: fix leaks by not closing files in the destructor

7 years agoMerge pull request #1038 from ystreet/cfileio-defs
Kim Kulling [Mon, 17 Oct 2016 15:28:04 +0000 (17:28 +0200)]
Merge pull request #1038 from ystreet/cfileio-defs

cfileio: fix function typedefs to have struct/enum

7 years agoMerge pull request #1032 from ashdnazg/master
Kim Kulling [Mon, 17 Oct 2016 15:26:32 +0000 (17:26 +0200)]
Merge pull request #1032 from ashdnazg/master

use cmath and C++ (std::) versions of math functions

7 years agocfileio: fix leaks by not closing files in the destructor
Matthew Waters [Mon, 17 Oct 2016 13:28:14 +0000 (00:28 +1100)]
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.

7 years agocfileio: fix function typedefs to have struct/enum
Matthew Waters [Mon, 17 Oct 2016 13:20:28 +0000 (00:20 +1100)]
cfileio: fix function typedefs to have struct/enum

Otherwise building with cfileio.h would result in:

/usr/include/assimp/cfileio.h:61:58: error: unknown type name ‘aiOrigin’
 typedef aiReturn (*aiFileSeek)(C_STRUCT aiFile*, size_t, aiOrigin);
                                                          ^~~~~~~~
/usr/include/assimp/cfileio.h:64:9: error: unknown type name ‘aiFile’
 typedef aiFile* (*aiFileOpenProc)  (C_STRUCT aiFileIO*, const char*, const char*);
         ^~~~~~
/usr/include/assimp/cfileio.h:122:5: error: unknown type name ‘aiFileSeek’
     aiFileSeek SeekProc;
     ^~~~~~~~~~

7 years ago3MF-Importer: remove unused variable.
Kim Kulling [Sun, 16 Oct 2016 15:14:22 +0000 (17:14 +0200)]
3MF-Importer: remove unused variable.

7 years agomerge upstream/master and fix conflicts
Angelo Scandaliato [Sun, 16 Oct 2016 01:12:02 +0000 (18:12 -0700)]
merge upstream/master and fix conflicts

7 years agocheck if bones exist before creating skin
Angelo Scandaliato [Sun, 16 Oct 2016 00:21:55 +0000 (17:21 -0700)]
check if bones exist before creating skin

7 years agoC++11-combat: hopefully the last std::to_string to replace.
Kim Kulling [Sat, 15 Oct 2016 19:45:58 +0000 (21:45 +0200)]
C++11-combat: hopefully the last std::to_string to replace.

7 years agoOpenGEXImporter: fix compiler warning.
Kim Kulling [Sat, 15 Oct 2016 19:45:09 +0000 (21:45 +0200)]
OpenGEXImporter: fix compiler warning.

7 years agoC++11-Combat: last replacements of std::to_string.
Kim Kulling [Sat, 15 Oct 2016 19:30:02 +0000 (21:30 +0200)]
C++11-Combat: last replacements of std::to_string.

7 years agoC++11-combat: replace more std::to_string by assimp-specific to_string
Kim Kulling [Sat, 15 Oct 2016 19:25:16 +0000 (21:25 +0200)]
C++11-combat: replace more std::to_string by assimp-specific to_string

7 years agoC++11: Replace std::to_string by assimp-specific implementation.
Kim Kulling [Sat, 15 Oct 2016 18:36:51 +0000 (20:36 +0200)]
C++11: Replace std::to_string by assimp-specific implementation.

7 years agoreplace more math.h functions occurences with std::
Eshed [Sat, 15 Oct 2016 09:05:57 +0000 (12:05 +0300)]
replace more math.h functions occurences with std::

7 years agoMerge pull request #1033 from ashdnazg/fix_mingw
Kim Kulling [Sat, 15 Oct 2016 05:51:19 +0000 (07:51 +0200)]
Merge pull request #1033 from ashdnazg/fix_mingw

Fix mingw build (mingw supports stat64 nowadays)

7 years agofix mingw build (mingw supports stat64 nowadays)
Eshed [Sat, 15 Oct 2016 00:52:50 +0000 (03:52 +0300)]
fix mingw build (mingw supports stat64 nowadays)

7 years agouse cmath and C++ (std::) versions of functions
Eshed [Sat, 15 Oct 2016 00:29:45 +0000 (03:29 +0300)]
use cmath and C++ (std::) versions of functions

7 years agofind the correct index in jointNames
Angelo Scandaliato [Fri, 14 Oct 2016 22:47:21 +0000 (15:47 -0700)]
find the correct index in jointNames

7 years agoAdded support for 64 bit version header introduced in FbxSdk2016
Rosario Leonardi [Fri, 14 Oct 2016 16:47:10 +0000 (17:47 +0100)]
Added support for 64 bit version header introduced in FbxSdk2016

7 years agotest combining skins
Angelo Scandaliato [Fri, 14 Oct 2016 02:49:59 +0000 (19:49 -0700)]
test combining skins

7 years agoObj-Streaming: add new io-stream for line-wise cached reading + first
Kim Kulling [Wed, 12 Oct 2016 13:30:04 +0000 (15:30 +0200)]
Obj-Streaming: add new io-stream for line-wise cached reading + first
bugfixes.

7 years agoadded some comments
Angelo Scandaliato [Tue, 11 Oct 2016 22:33:52 +0000 (15:33 -0700)]
added some comments

7 years agofind skeleton root joint and only allow four joint weights per vertex
Angelo Scandaliato [Tue, 11 Oct 2016 22:28:04 +0000 (15:28 -0700)]
find skeleton root joint and only allow four joint weights per vertex

7 years agoMerge pull request #1029 from samitc/master
Kim Kulling [Tue, 11 Oct 2016 11:48:24 +0000 (13:48 +0200)]
Merge pull request #1029 from samitc/master

fix bug when reading strings in quote in MD5 models

7 years agoBuffered stream API for big files: add next try of a prototype.^
Kim Kulling [Tue, 11 Oct 2016 10:29:40 +0000 (12:29 +0200)]
Buffered stream API for big files: add next try of a prototype.^

7 years agofix bug when reading strings in quote in MD5 models
amit512 [Tue, 11 Oct 2016 10:04:41 +0000 (13:04 +0300)]
fix bug when reading strings in quote in MD5 models

7 years agoMerge pull request #1026 from ascandal/feature/gltf-skins-animation
Kim Kulling [Mon, 10 Oct 2016 20:20:10 +0000 (22:20 +0200)]
Merge pull request #1026 from ascandal/feature/gltf-skins-animation

glTF skinning animation

7 years agoMerge pull request #1027 from corporateshark/master
Kim Kulling [Mon, 10 Oct 2016 17:39:40 +0000 (19:39 +0200)]
Merge pull request #1027 from corporateshark/master

Fixed: unzip.h was still included even if the D3MF importer is disabled

7 years agoFixed: unzip.h was still included even if the D3MF importer is disabled
Sergey Kosarevsky [Mon, 10 Oct 2016 15:58:06 +0000 (17:58 +0200)]
Fixed: unzip.h was still included even if the D3MF importer is disabled

7 years agoMerge branch 'master' into new_obj_stream_handling
Kim Kulling [Mon, 10 Oct 2016 08:19:45 +0000 (10:19 +0200)]
Merge branch 'master' into new_obj_stream_handling

7 years agoObj-Import: finish first prototype of IOStreamBuffer.
Kim Kulling [Mon, 10 Oct 2016 08:18:14 +0000 (10:18 +0200)]
Obj-Import: finish first prototype of IOStreamBuffer.

7 years agoMerge pull request #1025 from smalcom/issue_768
Kim Kulling [Sun, 9 Oct 2016 16:09:19 +0000 (18:09 +0200)]
Merge pull request #1025 from smalcom/issue_768

Issue 768

8 years agotry to find root joint node for skeleton
Angelo Scandaliato [Sun, 9 Oct 2016 02:18:13 +0000 (19:18 -0700)]
try to find root joint node for skeleton

8 years agoUpdate setup script.
Kim Kulling [Sat, 8 Oct 2016 23:32:31 +0000 (01:32 +0200)]
Update setup script.

8 years agofix bug when exporting mRotationKeys data
Angelo Scandaliato [Sat, 8 Oct 2016 22:36:01 +0000 (15:36 -0700)]
fix bug when exporting mRotationKeys data