Angelo Scandaliato
|
6ce2a37b82
|
merge upstream/master and fix conflicts
|
2016-10-15 18:12:02 -07:00 |
Angelo Scandaliato
|
fcf2d6357e
|
check if bones exist before creating skin
|
2016-10-15 17:21:55 -07:00 |
Kim Kulling
|
5cb4df80ad
|
C++11-combat: hopefully the last std::to_string to replace.
|
2016-10-15 21:45:58 +02:00 |
Kim Kulling
|
46d78f57d5
|
OpenGEXImporter: fix compiler warning.
|
2016-10-15 21:45:09 +02:00 |
Kim Kulling
|
7681089abc
|
C++11-Combat: last replacements of std::to_string.
|
2016-10-15 21:30:02 +02:00 |
Kim Kulling
|
e0dde73018
|
C++11-combat: replace more std::to_string by assimp-specific to_string
|
2016-10-15 21:25:16 +02:00 |
Kim Kulling
|
b90669c45e
|
C++11: Replace std::to_string by assimp-specific implementation.
|
2016-10-15 20:36:51 +02:00 |
Eshed
|
a84bf869c2
|
replace more math.h functions occurences with std::
|
2016-10-15 12:05:57 +03:00 |
Eshed
|
3b6ffc3ef5
|
fix mingw build (mingw supports stat64 nowadays)
|
2016-10-15 03:52:50 +03:00 |
Eshed
|
25cda401c5
|
use cmath and C++ (std::) versions of functions
|
2016-10-15 03:29:45 +03:00 |
Angelo Scandaliato
|
9c4bb1c9bc
|
find the correct index in jointNames
|
2016-10-14 15:47:21 -07:00 |
Rosario Leonardi
|
2505f02263
|
Added support for 64 bit version header introduced in FbxSdk2016
|
2016-10-14 17:47:10 +01:00 |
Angelo Scandaliato
|
1c03aebfb8
|
test combining skins
|
2016-10-13 19:49:59 -07:00 |
Kim Kulling
|
084a6f6415
|
Obj-Streaming: add new io-stream for line-wise cached reading + first
bugfixes.
|
2016-10-12 15:30:04 +02:00 |
Angelo Scandaliato
|
dc1e11c8be
|
added some comments
|
2016-10-11 15:33:52 -07:00 |
Angelo Scandaliato
|
57a00d5faa
|
find skeleton root joint and only allow four joint weights per vertex
|
2016-10-11 15:28:04 -07:00 |
Kim Kulling
|
ccf32aaf57
|
Merge pull request #1029 from samitc/master
fix bug when reading strings in quote in MD5 models
|
2016-10-11 13:48:24 +02:00 |
Kim Kulling
|
905e48a35c
|
Buffered stream API for big files: add next try of a prototype.^
|
2016-10-11 12:29:40 +02:00 |
amit512
|
96a64a353a
|
fix bug when reading strings in quote in MD5 models
|
2016-10-11 13:04:41 +03:00 |
Kim Kulling
|
6a0d4bac35
|
Merge pull request #1026 from ascandal/feature/gltf-skins-animation
glTF skinning animation
|
2016-10-10 22:20:10 +02:00 |
Sergey Kosarevsky
|
1c78f1be03
|
Fixed: unzip.h was still included even if the D3MF importer is disabled
|
2016-10-10 17:58:06 +02:00 |
Kim Kulling
|
bf06ee3ed4
|
Merge branch 'master' into new_obj_stream_handling
|
2016-10-10 10:19:45 +02:00 |
Kim Kulling
|
ad4d1f717f
|
Obj-Import: finish first prototype of IOStreamBuffer.
|
2016-10-10 10:18:14 +02:00 |
Kim Kulling
|
47dd1eb227
|
Merge pull request #1025 from smalcom/issue_768
Issue 768
|
2016-10-09 18:09:19 +02:00 |
Angelo Scandaliato
|
1f377bc99d
|
try to find root joint node for skeleton
|
2016-10-08 19:18:13 -07:00 |
Angelo Scandaliato
|
c49971e120
|
fix bug when exporting mRotationKeys data
|
2016-10-08 15:36:01 -07:00 |
Angelo Scandaliato
|
71de606770
|
add skeleton and mesh to node containing the mesh
|
2016-10-08 15:34:00 -07:00 |
Angelo Scandaliato
|
57b9232075
|
deleted code/MakeFile and added to .gitignore
|
2016-10-08 15:23:59 -07: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 |
Kim Kulling
|
6f6dd69270
|
Merge pull request #1021 from smalcom/export_x3d
Export x3d
|
2016-10-07 13:05:02 +02:00 |
Kim Kulling
|
d474c24753
|
Merge pull request #1024 from ascandal/feature/glTF-animations
Export glTF node animations
|
2016-10-07 10:30:42 +02:00 |
Angelo Scandaliato
|
574abd3c01
|
removed obsolete commented out code
|
2016-10-07 00:26:08 -07:00 |
Kim Kulling
|
0bae2bbfa7
|
Obj-Importer: start new streaming handling.
|
2016-10-07 09:19:10 +02:00 |
Angelo Scandaliato
|
84803bd51a
|
removed cout debugging statements and older ExportSkins function
|
2016-10-06 23:57:16 -07:00 |
Angelo Scandaliato
|
d128837a3a
|
export vertex joint and weight information
|
2016-10-06 18:59:53 -07:00 |
Angelo Scandaliato
|
ae36ca0e44
|
moved ExportSkins function into ExportMeshes function
|
2016-10-06 15:18:33 -07:00 |
Angelo Scandaliato
|
83c9addbc9
|
removed duplicate function for ExportData
|
2016-10-06 13:01:03 -07:00 |
Angelo Scandaliato
|
f59b8b3a59
|
export inverseBindMatrix Data for skins
|
2016-10-06 12:56:34 -07:00 |
Angelo Scandaliato
|
42a8d58f45
|
Export Nodes before meshes to avoid issue if node id's are changed
|
2016-10-06 11:29:09 -07:00 |
Alexandr Arutjunov
|
c6d233768f
|
[F] Small doc changes.
|
2016-10-06 19:02:37 +03:00 |
Alexandr Arutjunov
|
8c6ee48af5
|
[*] Merged fresh master and resolved conflicts.
|
2016-10-06 17:12:56 +03:00 |
Alexandr Arutjunov
|
9a4d693773
|
[+] Export to X3D format.
|
2016-10-06 17:04:37 +03:00 |
Alexandr Arutjunov
|
85d5fc2169
|
[-] Removed unneeded logging.
[F] Invalid metadata type used in postprocessing.
|
2016-10-06 17:04:08 +03:00 |
Angelo Scandaliato
|
4ac57f1fab
|
fixed issues to get node animations working
|
2016-10-06 02:34:11 -07:00 |
Angelo Scandaliato
|
0313328a92
|
set bindShapeMatrix to identity
|
2016-10-05 18:16:32 -07:00 |
Angelo Scandaliato
|
79852de5ae
|
added skins and jointNames
|
2016-10-05 17:30:02 -07:00 |
Angelo Scandaliato
|
cfa0ea3189
|
finished first version of extport animation data
|
2016-10-05 13:32:06 -07:00 |
Kim Kulling
|
b61aaf7ec4
|
New animation file for OpenGEX.
|
2016-10-05 20:14:42 +02:00 |
abma
|
a3295c6640
|
fix compile warning
|
2016-10-05 02:07:42 +02:00 |
Kim Kulling
|
0aab2aa96a
|
Merge pull request #1018 from johnmaf/bugfix/obj-homogeneous_coords
Parse homogeneous vertex coordinates in OBJs
|
2016-10-04 23:12:05 +02:00 |
Kim Kulling
|
f94b7287fc
|
Merge pull request #1015 from ascandal/feature/fix-glTF-validator-errors
Fix glTF validator errors
|
2016-10-04 23:10:30 +02:00 |
Kim Kulling
|
7a721b3014
|
Merge pull request #1016 from johnmaf/bugfix/glTF-sort_ptypes
Sort by primitive type before exporting as glTF
|
2016-10-04 23:09:16 +02:00 |
John Senneker
|
c3ebdc56de
|
Parse homogeneous vertex coordinates in OBJs
|
2016-10-04 17:06:31 -04:00 |
Alexandr Arutjunov
|
9d40f36f87
|
[F] Fixed type in list.
[+] Added function to metadata class for conveniance.
[*] Enumeration AI_INT changed to AI_INT32.
|
2016-10-04 23:58:51 +03:00 |
Alexandr Arutjunov
|
0ba0eca48e
|
[+] Call for X3D exporter.
|
2016-10-04 23:55:08 +03:00 |
Kim Kulling
|
8d3184f6fb
|
Merge branch 'master' of https://github.com/assimp/assimp
|
2016-10-04 18:41:25 +02:00 |
Kim Kulling
|
86dc3f7a79
|
X3D: Some more reformattings and missing initializations.
|
2016-10-04 18:40:58 +02:00 |
Angelo Scandaliato
|
d249cca011
|
created the asset writer function for animations export gltf
|
2016-10-04 07:09:01 -07:00 |
Martin Gerhardy
|
7bf6cfc9f6
|
removed BOM
|
2016-10-04 12:45:28 +02:00 |
Kim Kulling
|
7b9162136f
|
Some small format changes for assimp-style :-).
|
2016-10-04 11:45:08 +02:00 |
Angelo Scandaliato
|
37d32e79c9
|
created exportAnimation function
|
2016-10-03 19:29:37 -07:00 |
John Senneker
|
f378230a13
|
Sort by primitive type before exporting as glTF
|
2016-10-03 17:19:44 -04:00 |
Kim Kulling
|
9dc4fb2aa3
|
AMF: add missing license info.
|
2016-10-03 19:24:14 +02:00 |
Angelo Scandaliato
|
99c93e861c
|
Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors
|
2016-10-03 09:34:16 -07:00 |
Alexandr Arutjunov
|
aeb99898d3
|
[*] Set float type for constants: less warnings, less type truncations.
|
2016-10-02 20:00:57 +03:00 |
Alexandr Arutjunov
|
897370b6ff
|
[*] Pull fresh data.
[F] Using ssize_t is bad idea.
|
2016-10-02 19:52:24 +03:00 |
Alexandr Arutjunov
|
268b18dabf
|
Merge branch 'master' into import_x3d
|
2016-10-02 17:31:44 +03:00 |
Alexandr Arutjunov
|
3086a07e86
|
[*] Docs and build-files fixes.
|
2016-10-02 17:27:13 +03:00 |
Kim Kulling
|
59212bf55a
|
Merge pull request #1011 from smalcom/import_amf
Import amf
|
2016-10-02 14:52:00 +02:00 |
Kim Kulling
|
6233f65b3a
|
Merge pull request #1012 from johnmaf/bugfix/glTF-transparency
glTF: Read and write transparency values
|
2016-10-02 11:52:59 +02:00 |
Alexandr Arutjunov
|
9c0de90ede
|
[F] Fixed missed break.
[F] Doc changes.
[*] Removed Boost dependency.
[*] Style changes.
|
2016-10-02 03:08:34 +03:00 |
Alexandr Arutjunov
|
823003ba9b
|
[F] Fixing checking rule
|
2016-10-02 02:28:06 +03:00 |
Angelo Scandaliato
|
0619232aef
|
included samplers dictionary for textures
|
2016-09-30 17:23:38 -07:00 |
Alexandr Arutjunov
|
8856f7f6ae
|
Merge branch 'import_amf' into import_x3d
|
2016-09-30 02:38:59 +03:00 |
Alexandr Arutjunov
|
9d4d0de607
|
[*] Few changes for building using old (or MS) compilers.
|
2016-09-30 02:24:24 +03:00 |
Alexandr Arutjunov
|
c1a3912b3f
|
[F] Erasing with constant iterator. Strange that new gcc is allow this.
[*] Few changes for building using old (or MS) compilers.
|
2016-09-30 02:12:46 +03:00 |
John Senneker
|
83c0163ec6
|
glTF: Read and write transparency values
|
2016-09-29 17:44:04 -04:00 |
Alexandr Arutjunov
|
db54eb98e3
|
Merge branch 'import_amf' into import_x3d
|
2016-09-30 00:30:26 +03:00 |
Alexandr Arutjunov
|
f497f739fa
|
[*] Not all modern compilers is support new C++ feature "using". What the sad?
|
2016-09-30 00:03:34 +03:00 |
Alexandr Arutjunov
|
8ad6c80dac
|
[*] Removed Boost dependency.
|
2016-09-29 23:48:41 +03:00 |
Alexandr Arutjunov
|
61bced27df
|
[*] Removed Boost dependency.
|
2016-09-29 23:38:24 +03:00 |
Alexandr Arutjunov
|
76c84aa24d
|
[F] Header missed.
|
2016-09-29 23:19:47 +03:00 |
Alexandr Arutjunov
|
ef9b6a7375
|
[F] Removed UTF-8 BOM
|
2016-09-29 23:16:59 +03:00 |
Alexandr Arutjunov
|
3274951f2a
|
[+] X3D importer.
|
2016-09-29 18:50:24 +03:00 |
Alexandr Arutjunov
|
e4cb388153
|
[*] Style and doc changes.
|
2016-09-29 18:04:31 +03:00 |
Alexandr Arutjunov
|
818fb2e901
|
[F] Typo: invalid format hint index.
|
2016-09-29 17:11:53 +03:00 |
Angelo Scandaliato
|
7dd2e7011d
|
fixed issue with texcoordinate bufferview target
|
2016-09-28 18:50:08 -07:00 |
Angelo Scandaliato
|
f2e6f2f67f
|
work around for indices array in ExportData
|
2016-09-28 15:56:06 -07:00 |
Angelo Scandaliato
|
e89e98291a
|
calculate and write min and max attributes for accessors
|
2016-09-28 14:47:15 -07:00 |
Alexandr Arutjunov
|
0a25b076b8
|
Merge branch 'master' into import_amf
|
2016-09-28 17:51:59 +03:00 |
Alexandr Arutjunov
|
cb38054247
|
[+] AMF-importer. Also some fixes for modern Assimp.
|
2016-09-28 17:49:15 +03:00 |
Kim Kulling
|
9f7e34663e
|
FBX: make lookup test less strict. closes https://github.com/assimp/assimp/issues/994
|
2016-09-28 16:16:06 +02:00 |
Kim Kulling
|
f383ec0797
|
Fix some review findings.
|
2016-09-28 00:06:23 +02:00 |
Kim Kulling
|
cd9cb50eaf
|
OpenGEX: fix some review findings.
|
2016-09-28 00:06:06 +02:00 |
Angelo Scandaliato
|
3e322495f2
|
asset.version from int to string
|
2016-09-27 11:38:17 -07:00 |
Kim Kulling
|
36d770d3db
|
OpenGEX: fix some review findings.
|
2016-09-27 19:47:27 +02:00 |
Kim Kulling
|
78dae87de2
|
closes https://github.com/assimp/assimp/issues/954: add import of vertex
colors in
penGEX-importer.
|
2016-09-27 19:40:06 +02:00 |
Alexandr Arutjunov
|
6a9ccf2016
|
[+] Flag for scene for supporting formats where more than one face can reference to one vertex.
|
2016-09-26 13:01:38 +03:00 |
Alexandr Arutjunov
|
386128febc
|
[+] Building AMF-importer.
|
2016-09-26 12:57:44 +03:00 |
Kim Kulling
|
38b9ae2c6c
|
closes https://github.com/assimp/assimp/issues/584: export scene combiner.
|
2016-09-24 00:27:45 +02:00 |