platform/upstream/assimp.git
8 years agoFix build:
Kim Kulling [Sun, 6 Nov 2016 19:39:33 +0000 (20:39 +0100)]
Fix build:

8 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

8 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

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

8 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

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

8 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.

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

8 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.

8 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.

8 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

8 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

8 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

8 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.

8 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

8 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.

8 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

8 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.

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

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

8 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.

8 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

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

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

8 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

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

8 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

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

8 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

8 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.

8 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.

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

8 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

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

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

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

8 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

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

8 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

8 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

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

8 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.

8 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

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

8 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.

8 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

8 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

8 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

8 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

8 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.

8 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;
     ^~~~~~~~~~

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

8 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

8 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

8 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.

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

8 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.

8 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

8 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.

8 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::

8 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)

8 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)

8 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

8 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

8 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

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

8 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.

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

8 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

8 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

8 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.^

8 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

8 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

8 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

8 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

8 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

8 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.

8 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

8 years agoadd skeleton and mesh to node containing the mesh
Angelo Scandaliato [Sat, 8 Oct 2016 22:34:00 +0000 (15:34 -0700)]
add skeleton and mesh to node containing the mesh

8 years agodeleted code/MakeFile and added to .gitignore
Angelo Scandaliato [Sat, 8 Oct 2016 22:23:59 +0000 (15:23 -0700)]
deleted code/MakeFile and added to .gitignore

8 years ago[F] Checking directive name with start from symbol 'm'. And checking argument of...
Alexandr Arutjunov [Fri, 7 Oct 2016 13:40:51 +0000 (16:40 +0300)]
[F] Checking directive name with start from symbol 'm'. And checking argument of 'mtllib'.

8 years agoMerge pull request #1021 from smalcom/export_x3d
Kim Kulling [Fri, 7 Oct 2016 11:05:02 +0000 (13:05 +0200)]
Merge pull request #1021 from smalcom/export_x3d

Export x3d

8 years agoMerge pull request #1024 from ascandal/feature/glTF-animations
Kim Kulling [Fri, 7 Oct 2016 08:30:42 +0000 (10:30 +0200)]
Merge pull request #1024 from ascandal/feature/glTF-animations

Export glTF node animations

8 years agoremoved obsolete commented out code
Angelo Scandaliato [Fri, 7 Oct 2016 07:26:08 +0000 (00:26 -0700)]
removed obsolete commented out code

8 years agoObj-Importer: start new streaming handling.
Kim Kulling [Fri, 7 Oct 2016 07:19:10 +0000 (09:19 +0200)]
Obj-Importer: start new streaming handling.

8 years agoremoved cout debugging statements and older ExportSkins function
Angelo Scandaliato [Fri, 7 Oct 2016 06:57:16 +0000 (23:57 -0700)]
removed cout debugging statements and older ExportSkins function

8 years agoexport vertex joint and weight information
Angelo Scandaliato [Fri, 7 Oct 2016 01:59:53 +0000 (18:59 -0700)]
export vertex joint and weight information

8 years agomoved ExportSkins function into ExportMeshes function
Angelo Scandaliato [Thu, 6 Oct 2016 22:18:33 +0000 (15:18 -0700)]
moved ExportSkins function into ExportMeshes function

8 years agoremoved duplicate function for ExportData
Angelo Scandaliato [Thu, 6 Oct 2016 20:01:03 +0000 (13:01 -0700)]
removed duplicate function for ExportData

8 years agoexport inverseBindMatrix Data for skins
Angelo Scandaliato [Thu, 6 Oct 2016 19:56:34 +0000 (12:56 -0700)]
export inverseBindMatrix Data for skins

8 years agoExport Nodes before meshes to avoid issue if node id's are changed
Angelo Scandaliato [Thu, 6 Oct 2016 18:29:09 +0000 (11:29 -0700)]
Export Nodes before meshes to avoid issue if node id's are changed

8 years ago[F] Small doc changes.
Alexandr Arutjunov [Thu, 6 Oct 2016 16:02:37 +0000 (19:02 +0300)]
[F] Small doc changes.

8 years agoMerge pull request #1022 from smalcom/new_models
Kim Kulling [Thu, 6 Oct 2016 15:26:21 +0000 (17:26 +0200)]
Merge pull request #1022 from smalcom/new_models

[+] Few models for AMF and X3D.

8 years ago[*] MSVS2013 do not like constexpr
Alexandr Arutjunov [Thu, 6 Oct 2016 14:49:08 +0000 (17:49 +0300)]
[*] MSVS2013 do not like constexpr

8 years ago[+] Few models for AMF and X3D.
Alexandr Arutjunov [Thu, 6 Oct 2016 14:44:54 +0000 (17:44 +0300)]
[+] Few models for AMF and X3D.

8 years ago[*] Merged fresh master and resolved conflicts.
Alexandr Arutjunov [Thu, 6 Oct 2016 14:12:56 +0000 (17:12 +0300)]
[*] Merged fresh master and resolved conflicts.

8 years ago[+] Export to X3D format.
Alexandr Arutjunov [Thu, 6 Oct 2016 14:04:37 +0000 (17:04 +0300)]
[+] Export to X3D format.