Commit Graph

3800 Commits (6fa385549c4136d7cedf800a3100b73a34ae0965)

Author SHA1 Message Date
Kim Kulling 6fa385549c Merge pull request #1027 from corporateshark/master
Fixed: unzip.h was still included even if the D3MF importer is disabled
2016-10-10 19:39:40 +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 47dd1eb227 Merge pull request #1025 from smalcom/issue_768
Issue 768
2016-10-09 18:09:19 +02:00
Kim Kulling b838070036 Update setup script. 2016-10-09 01:32:31 +02: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
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
Kim Kulling 3145f02e22 Merge pull request #1022 from smalcom/new_models
[+] Few models for AMF and X3D.
2016-10-06 17:26:21 +02:00
Alexandr Arutjunov 728c11ebb9 [*] MSVS2013 do not like constexpr 2016-10-06 17:49:08 +03:00
Alexandr Arutjunov 165f0f0548 [+] Few models for AMF and X3D. 2016-10-06 17:44:54 +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
Alexandr Arutjunov 96887e1aa6 [F] vRows in fact is columns.
[+] More variants for Decompose.
2016-10-06 17:02:09 +03:00
Angelo Scandaliato 0d26fd00b7 removed Makefiles and added them to .gitignore 2016-10-06 02:54:49 -07: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
Kim Kulling 51808a7b43 Merge pull request #1019 from abma/patch-1
fix compile warning
2016-10-05 09:56:39 +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 70614ce205 [+] Added few functions for conveniance. Decompose overload. 2016-10-05 00:01:53 +03:00
Alexandr Arutjunov 9e0f594aa3 [F] In that place fixed typo in list. 2016-10-05 00:01:06 +03: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
Kim Kulling 4533b576f6 Merge pull request #1017 from mgerhardy/patch-1
removed BOM
2016-10-04 13:03:33 +02: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
Kim Kulling d27cce513b Scene: remove redundant pragma once statement. 2016-10-03 19:23:52 +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 402263b5d0 Merge branch 'master' of https://github.com/assimp/assimp into export_x3d 2016-10-03 19:14:11 +03:00