Kim Kulling [Sat, 22 Oct 2016 20:15:00 +0000 (22:15 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 22 Oct 2016 20:14:01 +0000 (22:14 +0200)]
QtViewer: fix review findings.
Kim Kulling [Fri, 21 Oct 2016 17:44:31 +0000 (19:44 +0200)]
Remove redundant file.
Kim Kulling [Fri, 21 Oct 2016 17:43:56 +0000 (19:43 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 21 Oct 2016 10:50:41 +0000 (12:50 +0200)]
Qt5-based Viewer: fix build.
Kim Kulling [Thu, 20 Oct 2016 20:25:39 +0000 (22:25 +0200)]
Q3BSP-Loader: reformat include.
Kim Kulling [Thu, 20 Oct 2016 15:04:37 +0000 (17:04 +0200)]
Q3BSP: fix license dates.
Kim Kulling [Thu, 20 Oct 2016 14:43:38 +0000 (16:43 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 20 Oct 2016 14:42:00 +0000 (16:42 +0200)]
Q3BSP-Importer: remove commented code.
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
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
Kim Kulling [Tue, 18 Oct 2016 19:16:44 +0000 (21:16 +0200)]
3MF: fix nullptr access.
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.
John Senneker [Tue, 18 Oct 2016 14:48:47 +0000 (10:48 -0400)]
Check for std::string::npos before applying std::string::substr
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.
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
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
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
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
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.
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;
^~~~~~~~~~
Kim Kulling [Sun, 16 Oct 2016 15:14:22 +0000 (17:14 +0200)]
3MF-Importer: remove unused variable.
Angelo Scandaliato [Sun, 16 Oct 2016 01:12:02 +0000 (18:12 -0700)]
merge upstream/master and fix conflicts
Angelo Scandaliato [Sun, 16 Oct 2016 00:21:55 +0000 (17:21 -0700)]
check if bones exist before creating skin
Kim Kulling [Sat, 15 Oct 2016 19:45:58 +0000 (21:45 +0200)]
C++11-combat: hopefully the last std::to_string to replace.
Kim Kulling [Sat, 15 Oct 2016 19:45:09 +0000 (21:45 +0200)]
OpenGEXImporter: fix compiler warning.
Kim Kulling [Sat, 15 Oct 2016 19:30:02 +0000 (21:30 +0200)]
C++11-Combat: last replacements of std::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
Kim Kulling [Sat, 15 Oct 2016 18:36:51 +0000 (20:36 +0200)]
C++11: Replace std::to_string by assimp-specific implementation.
Eshed [Sat, 15 Oct 2016 09:05:57 +0000 (12:05 +0300)]
replace more math.h functions occurences with std::
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)
Eshed [Sat, 15 Oct 2016 00:52:50 +0000 (03:52 +0300)]
fix mingw build (mingw supports stat64 nowadays)
Eshed [Sat, 15 Oct 2016 00:29:45 +0000 (03:29 +0300)]
use cmath and C++ (std::) versions of functions
Angelo Scandaliato [Fri, 14 Oct 2016 22:47:21 +0000 (15:47 -0700)]
find the correct index in jointNames
Rosario Leonardi [Fri, 14 Oct 2016 16:47:10 +0000 (17:47 +0100)]
Added support for 64 bit version header introduced in FbxSdk2016
Angelo Scandaliato [Fri, 14 Oct 2016 02:49:59 +0000 (19:49 -0700)]
test combining skins
Angelo Scandaliato [Tue, 11 Oct 2016 22:33:52 +0000 (15:33 -0700)]
added some comments
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
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
amit512 [Tue, 11 Oct 2016 10:04:41 +0000 (13:04 +0300)]
fix bug when reading strings in quote in MD5 models
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
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
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
Kim Kulling [Sun, 9 Oct 2016 16:09:19 +0000 (18:09 +0200)]
Merge pull request #1025 from smalcom/issue_768
Issue 768
Angelo Scandaliato [Sun, 9 Oct 2016 02:18:13 +0000 (19:18 -0700)]
try to find root joint node for skeleton
Kim Kulling [Sat, 8 Oct 2016 23:32:31 +0000 (01:32 +0200)]
Update setup script.
Angelo Scandaliato [Sat, 8 Oct 2016 22:36:01 +0000 (15:36 -0700)]
fix bug when exporting mRotationKeys data
Angelo Scandaliato [Sat, 8 Oct 2016 22:34:00 +0000 (15:34 -0700)]
add skeleton and mesh to node containing the mesh
Angelo Scandaliato [Sat, 8 Oct 2016 22:23:59 +0000 (15:23 -0700)]
deleted code/MakeFile and added to .gitignore
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'.
Kim Kulling [Fri, 7 Oct 2016 11:05:02 +0000 (13:05 +0200)]
Merge pull request #1021 from smalcom/export_x3d
Export x3d
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
Angelo Scandaliato [Fri, 7 Oct 2016 07:26:08 +0000 (00:26 -0700)]
removed obsolete commented out code
Angelo Scandaliato [Fri, 7 Oct 2016 06:57:16 +0000 (23:57 -0700)]
removed cout debugging statements and older ExportSkins function
Angelo Scandaliato [Fri, 7 Oct 2016 01:59:53 +0000 (18:59 -0700)]
export vertex joint and weight information
Angelo Scandaliato [Thu, 6 Oct 2016 22:18:33 +0000 (15:18 -0700)]
moved ExportSkins function into ExportMeshes function
Angelo Scandaliato [Thu, 6 Oct 2016 20:01:03 +0000 (13:01 -0700)]
removed duplicate function for ExportData
Angelo Scandaliato [Thu, 6 Oct 2016 19:56:34 +0000 (12:56 -0700)]
export inverseBindMatrix Data for skins
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
Alexandr Arutjunov [Thu, 6 Oct 2016 16:02:37 +0000 (19:02 +0300)]
[F] Small doc changes.
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.
Alexandr Arutjunov [Thu, 6 Oct 2016 14:49:08 +0000 (17:49 +0300)]
[*] MSVS2013 do not like constexpr
Alexandr Arutjunov [Thu, 6 Oct 2016 14:44:54 +0000 (17:44 +0300)]
[+] Few models for AMF and X3D.
Alexandr Arutjunov [Thu, 6 Oct 2016 14:12:56 +0000 (17:12 +0300)]
[*] Merged fresh master and resolved conflicts.
Alexandr Arutjunov [Thu, 6 Oct 2016 14:04:37 +0000 (17:04 +0300)]
[+] Export to X3D format.
Alexandr Arutjunov [Thu, 6 Oct 2016 14:04:08 +0000 (17:04 +0300)]
[-] Removed unneeded logging.
[F] Invalid metadata type used in postprocessing.
Alexandr Arutjunov [Thu, 6 Oct 2016 14:02:09 +0000 (17:02 +0300)]
[F] vRows in fact is columns.
[+] More variants for Decompose.
Angelo Scandaliato [Thu, 6 Oct 2016 09:54:49 +0000 (02:54 -0700)]
removed Makefiles and added them to .gitignore
Angelo Scandaliato [Thu, 6 Oct 2016 09:34:11 +0000 (02:34 -0700)]
fixed issues to get node animations working
Angelo Scandaliato [Thu, 6 Oct 2016 01:16:32 +0000 (18:16 -0700)]
set bindShapeMatrix to identity
Angelo Scandaliato [Thu, 6 Oct 2016 00:30:02 +0000 (17:30 -0700)]
added skins and jointNames
Angelo Scandaliato [Wed, 5 Oct 2016 20:32:06 +0000 (13:32 -0700)]
finished first version of extport animation data
Kim Kulling [Wed, 5 Oct 2016 18:14:42 +0000 (20:14 +0200)]
New animation file for OpenGEX.
Kim Kulling [Wed, 5 Oct 2016 07:56:39 +0000 (09:56 +0200)]
Merge pull request #1019 from abma/patch-1
fix compile warning
abma [Wed, 5 Oct 2016 00:07:42 +0000 (02:07 +0200)]
fix compile warning
Kim Kulling [Tue, 4 Oct 2016 21:12:05 +0000 (23:12 +0200)]
Merge pull request #1018 from johnmaf/bugfix/obj-homogeneous_coords
Parse homogeneous vertex coordinates in OBJs
Kim Kulling [Tue, 4 Oct 2016 21:10:30 +0000 (23:10 +0200)]
Merge pull request #1015 from ascandal/feature/fix-glTF-validator-errors
Fix glTF validator errors
Kim Kulling [Tue, 4 Oct 2016 21:09:16 +0000 (23:09 +0200)]
Merge pull request #1016 from johnmaf/bugfix/glTF-sort_ptypes
Sort by primitive type before exporting as glTF
John Senneker [Tue, 4 Oct 2016 21:06:31 +0000 (17:06 -0400)]
Parse homogeneous vertex coordinates in OBJs
Alexandr Arutjunov [Tue, 4 Oct 2016 21:01:53 +0000 (00:01 +0300)]
[+] Added few functions for conveniance. Decompose overload.
Alexandr Arutjunov [Tue, 4 Oct 2016 21:01:06 +0000 (00:01 +0300)]
[F] In that place fixed typo in list.
Alexandr Arutjunov [Tue, 4 Oct 2016 20:58:51 +0000 (23:58 +0300)]
[F] Fixed type in list.
[+] Added function to metadata class for conveniance.
[*] Enumeration AI_INT changed to AI_INT32.
Alexandr Arutjunov [Tue, 4 Oct 2016 20:55:08 +0000 (23:55 +0300)]
[+] Call for X3D exporter.
Kim Kulling [Tue, 4 Oct 2016 16:41:25 +0000 (18:41 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Tue, 4 Oct 2016 16:40:58 +0000 (18:40 +0200)]
X3D: Some more reformattings and missing initializations.
Angelo Scandaliato [Tue, 4 Oct 2016 14:09:01 +0000 (07:09 -0700)]
created the asset writer function for animations export gltf
Kim Kulling [Tue, 4 Oct 2016 11:03:33 +0000 (13:03 +0200)]
Merge pull request #1017 from mgerhardy/patch-1
removed BOM
Martin Gerhardy [Tue, 4 Oct 2016 10:45:28 +0000 (12:45 +0200)]
removed BOM
Kim Kulling [Tue, 4 Oct 2016 09:45:08 +0000 (11:45 +0200)]
Some small format changes for assimp-style :-).
Angelo Scandaliato [Tue, 4 Oct 2016 02:29:37 +0000 (19:29 -0700)]
created exportAnimation function
John Senneker [Mon, 3 Oct 2016 21:19:44 +0000 (17:19 -0400)]
Sort by primitive type before exporting as glTF
Kim Kulling [Mon, 3 Oct 2016 17:24:14 +0000 (19:24 +0200)]
AMF: add missing license info.
Kim Kulling [Mon, 3 Oct 2016 17:23:52 +0000 (19:23 +0200)]
Scene: remove redundant pragma once statement.
Angelo Scandaliato [Mon, 3 Oct 2016 16:34:16 +0000 (09:34 -0700)]
Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors
Alexandr Arutjunov [Mon, 3 Oct 2016 16:14:11 +0000 (19:14 +0300)]
Merge branch 'master' of https://github.com/assimp/assimp into export_x3d
Kim Kulling [Mon, 3 Oct 2016 08:41:52 +0000 (10:41 +0200)]
Merge pull request #1014 from smalcom/import_x3d
Import x3d
Alexandr Arutjunov [Sun, 2 Oct 2016 19:03:26 +0000 (22:03 +0300)]
Merge branch 'import_x3d' into export_x3d
Alexandr Arutjunov [Sun, 2 Oct 2016 19:03:18 +0000 (22:03 +0300)]
Merge branch 'master' into export_x3d
Alexandr Arutjunov [Sun, 2 Oct 2016 17:00:57 +0000 (20:00 +0300)]
[*] Set float type for constants: less warnings, less type truncations.
Alexandr Arutjunov [Sun, 2 Oct 2016 16:52:24 +0000 (19:52 +0300)]
[*] Pull fresh data.
[F] Using ssize_t is bad idea.