platform/upstream/assimp.git
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[*] 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.

8 years ago[-] Removed unneeded logging.
Alexandr Arutjunov [Thu, 6 Oct 2016 14:04:08 +0000 (17:04 +0300)]
[-] Removed unneeded logging.
[F] Invalid metadata type used in postprocessing.

8 years ago[F] vRows in fact is columns.
Alexandr Arutjunov [Thu, 6 Oct 2016 14:02:09 +0000 (17:02 +0300)]
[F] vRows in fact is columns.
[+] More variants for Decompose.

8 years agoNew animation file for OpenGEX.
Kim Kulling [Wed, 5 Oct 2016 18:14:42 +0000 (20:14 +0200)]
New animation file for OpenGEX.

8 years agoMerge pull request #1019 from abma/patch-1
Kim Kulling [Wed, 5 Oct 2016 07:56:39 +0000 (09:56 +0200)]
Merge pull request #1019 from abma/patch-1

fix compile warning

8 years agofix compile warning
abma [Wed, 5 Oct 2016 00:07:42 +0000 (02:07 +0200)]
fix compile warning

8 years agoMerge pull request #1018 from johnmaf/bugfix/obj-homogeneous_coords
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

8 years agoMerge pull request #1015 from ascandal/feature/fix-glTF-validator-errors
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

8 years agoMerge pull request #1016 from johnmaf/bugfix/glTF-sort_ptypes
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

8 years agoParse homogeneous vertex coordinates in OBJs
John Senneker [Tue, 4 Oct 2016 21:06:31 +0000 (17:06 -0400)]
Parse homogeneous vertex coordinates in OBJs

8 years ago[+] Added few functions for conveniance. Decompose overload.
Alexandr Arutjunov [Tue, 4 Oct 2016 21:01:53 +0000 (00:01 +0300)]
[+] Added few functions for conveniance. Decompose overload.

8 years ago[F] In that place fixed typo in list.
Alexandr Arutjunov [Tue, 4 Oct 2016 21:01:06 +0000 (00:01 +0300)]
[F] In that place fixed typo in list.

8 years ago[F] Fixed type 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.

8 years ago[+] Call for X3D exporter.
Alexandr Arutjunov [Tue, 4 Oct 2016 20:55:08 +0000 (23:55 +0300)]
[+] Call for X3D exporter.

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Tue, 4 Oct 2016 16:41:25 +0000 (18:41 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoX3D: Some more reformattings and missing initializations.
Kim Kulling [Tue, 4 Oct 2016 16:40:58 +0000 (18:40 +0200)]
X3D: Some more reformattings and missing initializations.

8 years agoMerge pull request #1017 from mgerhardy/patch-1
Kim Kulling [Tue, 4 Oct 2016 11:03:33 +0000 (13:03 +0200)]
Merge pull request #1017 from mgerhardy/patch-1

removed BOM

8 years agoremoved BOM
Martin Gerhardy [Tue, 4 Oct 2016 10:45:28 +0000 (12:45 +0200)]
removed BOM

8 years agoSome small format changes for assimp-style :-).
Kim Kulling [Tue, 4 Oct 2016 09:45:08 +0000 (11:45 +0200)]
Some small format changes for assimp-style :-).

8 years agoSort by primitive type before exporting as glTF
John Senneker [Mon, 3 Oct 2016 21:19:44 +0000 (17:19 -0400)]
Sort by primitive type before exporting as glTF

8 years agoAMF: add missing license info.
Kim Kulling [Mon, 3 Oct 2016 17:24:14 +0000 (19:24 +0200)]
AMF: add missing license info.

8 years agoScene: remove redundant pragma once statement.
Kim Kulling [Mon, 3 Oct 2016 17:23:52 +0000 (19:23 +0200)]
Scene: remove redundant pragma once statement.

8 years agoMerge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors
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

8 years agoMerge branch 'master' of https://github.com/assimp/assimp into export_x3d
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

8 years agoMerge pull request #1014 from smalcom/import_x3d
Kim Kulling [Mon, 3 Oct 2016 08:41:52 +0000 (10:41 +0200)]
Merge pull request #1014 from smalcom/import_x3d

Import x3d

8 years agoMerge branch 'import_x3d' into export_x3d
Alexandr Arutjunov [Sun, 2 Oct 2016 19:03:26 +0000 (22:03 +0300)]
Merge branch 'import_x3d' into export_x3d

8 years agoMerge branch 'master' into export_x3d
Alexandr Arutjunov [Sun, 2 Oct 2016 19:03:18 +0000 (22:03 +0300)]
Merge branch 'master' into export_x3d

8 years ago[*] Set float type for constants: less warnings, less type truncations.
Alexandr Arutjunov [Sun, 2 Oct 2016 17:00:57 +0000 (20:00 +0300)]
[*] Set float type for constants: less warnings, less type truncations.

8 years ago[*] Pull fresh data.
Alexandr Arutjunov [Sun, 2 Oct 2016 16:52:24 +0000 (19:52 +0300)]
[*] Pull fresh data.
[F] Using ssize_t is bad idea.

8 years agoMerge branch 'master' into import_x3d
Alexandr Arutjunov [Sun, 2 Oct 2016 14:31:44 +0000 (17:31 +0300)]
Merge branch 'master' into import_x3d

8 years ago[*] Docs and build-files fixes.
Alexandr Arutjunov [Sun, 2 Oct 2016 14:27:13 +0000 (17:27 +0300)]
[*] Docs and build-files fixes.

8 years agoMerge pull request #1011 from smalcom/import_amf
Kim Kulling [Sun, 2 Oct 2016 12:52:00 +0000 (14:52 +0200)]
Merge pull request #1011 from smalcom/import_amf

Import amf

8 years agoMerge pull request #1012 from johnmaf/bugfix/glTF-transparency
Kim Kulling [Sun, 2 Oct 2016 09:52:59 +0000 (11:52 +0200)]
Merge pull request #1012 from johnmaf/bugfix/glTF-transparency

glTF: Read and write transparency values

8 years ago[F] Fixed missed break.
Alexandr Arutjunov [Sun, 2 Oct 2016 00:08:34 +0000 (03:08 +0300)]
[F] Fixed missed break.
[F] Doc changes.
[*] Removed Boost dependency.
[*] Style changes.

8 years ago[F] Fixing checking rule
Alexandr Arutjunov [Sat, 1 Oct 2016 23:28:06 +0000 (02:28 +0300)]
[F] Fixing checking rule

8 years agoupdate change log
Angelo Scandaliato [Sat, 1 Oct 2016 01:09:18 +0000 (18:09 -0700)]
update change log

8 years agoincluded samplers dictionary for textures
Angelo Scandaliato [Sat, 1 Oct 2016 00:23:38 +0000 (17:23 -0700)]
included samplers dictionary for textures

8 years agoMerge branch 'import_amf' into import_x3d
Alexandr Arutjunov [Thu, 29 Sep 2016 23:38:59 +0000 (02:38 +0300)]
Merge branch 'import_amf' into import_x3d

8 years ago[*] Few changes for building using old (or MS) compilers.
Alexandr Arutjunov [Thu, 29 Sep 2016 23:24:24 +0000 (02:24 +0300)]
[*] Few changes for building using old (or MS) compilers.

8 years ago[F] Erasing with constant iterator. Strange that new gcc is allow this.
Alexandr Arutjunov [Thu, 29 Sep 2016 23:12:46 +0000 (02:12 +0300)]
[F] Erasing with constant iterator. Strange that new gcc is allow this.
[*] Few changes for building using old (or MS) compilers.

8 years agoglTF: Read and write transparency values
John Senneker [Thu, 29 Sep 2016 21:44:04 +0000 (17:44 -0400)]
glTF: Read and write transparency values

8 years agoMerge branch 'import_amf' into import_x3d
Alexandr Arutjunov [Thu, 29 Sep 2016 21:30:26 +0000 (00:30 +0300)]
Merge branch 'import_amf' into import_x3d

8 years ago[*] Not all modern compilers is support new C++ feature "using". What the sad?
Alexandr Arutjunov [Thu, 29 Sep 2016 21:03:34 +0000 (00:03 +0300)]
[*] Not all modern compilers is support new C++ feature "using". What the sad?

8 years ago[*] Removed Boost dependency.
Alexandr Arutjunov [Thu, 29 Sep 2016 20:48:41 +0000 (23:48 +0300)]
[*] Removed Boost dependency.

8 years ago[*] Removed Boost dependency.
Alexandr Arutjunov [Thu, 29 Sep 2016 20:38:24 +0000 (23:38 +0300)]
[*] Removed Boost dependency.

8 years ago[F] Header missed.
Alexandr Arutjunov [Thu, 29 Sep 2016 20:19:47 +0000 (23:19 +0300)]
[F] Header missed.

8 years ago[F] Removed UTF-8 BOM
Alexandr Arutjunov [Thu, 29 Sep 2016 20:16:59 +0000 (23:16 +0300)]
[F] Removed UTF-8 BOM

8 years ago[+] X3D importer.
Alexandr Arutjunov [Thu, 29 Sep 2016 15:50:24 +0000 (18:50 +0300)]
[+] X3D importer.

8 years ago[*] Style and doc changes.
Alexandr Arutjunov [Thu, 29 Sep 2016 15:04:31 +0000 (18:04 +0300)]
[*] Style and doc changes.

8 years ago[+] Embedded uncompressed textures support.
Alexandr Arutjunov [Thu, 29 Sep 2016 14:15:21 +0000 (17:15 +0300)]
[+] Embedded uncompressed textures support.
[F] Orphaned textures ID issue.

8 years ago[*] More suitable for array size of which can vary at compilation time.
Alexandr Arutjunov [Thu, 29 Sep 2016 14:13:14 +0000 (17:13 +0300)]
[*] More suitable for array size of which can vary at compilation time.

8 years ago[F] Typo: invalid format hint index.
Alexandr Arutjunov [Thu, 29 Sep 2016 14:11:53 +0000 (17:11 +0300)]
[F] Typo: invalid format hint index.

8 years agofixed issue with texcoordinate bufferview target
Angelo Scandaliato [Thu, 29 Sep 2016 01:50:08 +0000 (18:50 -0700)]
fixed issue with texcoordinate bufferview target

8 years agowork around for indices array in ExportData
Angelo Scandaliato [Wed, 28 Sep 2016 22:56:06 +0000 (15:56 -0700)]
work around for indices array in ExportData

8 years agocalculate and write min and max attributes for accessors
Angelo Scandaliato [Wed, 28 Sep 2016 21:47:15 +0000 (14:47 -0700)]
calculate and write min and max attributes for accessors

8 years agoMerge branch 'master' into import_amf
Alexandr Arutjunov [Wed, 28 Sep 2016 14:51:59 +0000 (17:51 +0300)]
Merge branch 'master' into import_amf

8 years ago[*] Format hint for embedded textures improvement.
Alexandr Arutjunov [Wed, 28 Sep 2016 14:50:17 +0000 (17:50 +0300)]
[*] Format hint for embedded textures improvement.

8 years ago[+] AMF-importer. Also some fixes for modern Assimp.
Alexandr Arutjunov [Wed, 28 Sep 2016 14:49:15 +0000 (17:49 +0300)]
[+] AMF-importer. Also some fixes for modern Assimp.

8 years agoFBX: make lookup test less strict. closes https://github.com/assimp/assimp/issues/994
Kim Kulling [Wed, 28 Sep 2016 14:16:06 +0000 (16:16 +0200)]
FBX: make lookup test less strict. closes https://github.com/assimp/assimp/issues/994

8 years agoReadme: move gitter-chat to a more representive place.
Kim Kulling [Wed, 28 Sep 2016 13:52:46 +0000 (15:52 +0200)]
Readme: move gitter-chat to a more representive place.

8 years agoFix some review findings.
Kim Kulling [Tue, 27 Sep 2016 22:06:23 +0000 (00:06 +0200)]
Fix some review findings.

8 years agoOpenGEX: fix some review findings.
Kim Kulling [Tue, 27 Sep 2016 22:06:06 +0000 (00:06 +0200)]
OpenGEX: fix some review findings.

8 years agoasset.version from int to string
Angelo Scandaliato [Tue, 27 Sep 2016 18:38:17 +0000 (11:38 -0700)]
asset.version from int to string

8 years agoOpenGEX: fix some review findings.
Kim Kulling [Tue, 27 Sep 2016 17:47:27 +0000 (19:47 +0200)]
OpenGEX: fix some review findings.

8 years agocloses https://github.com/assimp/assimp/issues/954: add import of vertex
Kim Kulling [Tue, 27 Sep 2016 17:40:06 +0000 (19:40 +0200)]
closes https://github.com/assimp/assimp/issues/954: add import of vertex
colors in
penGEX-importer.

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 26 Sep 2016 18:53:59 +0000 (20:53 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoSceneDiffer: add face tester.
Kim Kulling [Mon, 26 Sep 2016 18:53:42 +0000 (20:53 +0200)]
SceneDiffer: add face tester.

8 years ago[+] Flag for scene for supporting formats where more than one face can reference...
Alexandr Arutjunov [Mon, 26 Sep 2016 10:01:38 +0000 (13:01 +0300)]
[+] Flag for scene for supporting formats where more than one face can reference to one vertex.

8 years ago[*] Embedded texture prefix in separate define.
Alexandr Arutjunov [Mon, 26 Sep 2016 09:59:12 +0000 (12:59 +0300)]
[*] Embedded texture prefix in separate define.

8 years ago[+] Building AMF-importer.
Alexandr Arutjunov [Mon, 26 Sep 2016 09:57:44 +0000 (12:57 +0300)]
[+] Building AMF-importer.

8 years agoMerge pull request #1006 from odalet/master
Kim Kulling [Sun, 25 Sep 2016 10:08:30 +0000 (12:08 +0200)]
Merge pull request #1006 from odalet/master

Fixed Appveyor x64 builds

8 years agoUpdate appveyor.yml
odalet [Sat, 24 Sep 2016 15:26:59 +0000 (17:26 +0200)]
Update appveyor.yml

8 years agoUpdate appveyor.yml
odalet [Sat, 24 Sep 2016 15:23:48 +0000 (17:23 +0200)]
Update appveyor.yml

8 years agoUpdate appveyor.yml
odalet [Sat, 24 Sep 2016 15:22:24 +0000 (17:22 +0200)]
Update appveyor.yml

8 years agoUpdate appveyor.yml
odalet [Sat, 24 Sep 2016 15:21:49 +0000 (17:21 +0200)]
Update appveyor.yml

8 years agoUpdate appveyor.yml
odalet [Sat, 24 Sep 2016 15:03:23 +0000 (17:03 +0200)]
Update appveyor.yml

8 years agocloses https://github.com/assimp/assimp/issues/584: export scene combiner.
Kim Kulling [Fri, 23 Sep 2016 22:27:45 +0000 (00:27 +0200)]
closes https://github.com/assimp/assimp/issues/584: export scene combiner.

8 years agoMerge pull request #1005 from assimp/issues/177
Kim Kulling [Fri, 23 Sep 2016 22:21:47 +0000 (00:21 +0200)]
Merge pull request #1005 from assimp/issues/177

IFC: Switch generated file to 2 files

8 years agoIFC: Switch generated file to 2 files to fix issue related to <mingw4.9 (
Kim Kulling [Fri, 23 Sep 2016 17:48:38 +0000 (19:48 +0200)]
IFC: Switch generated file to 2 files to fix issue related to <mingw4.9 (
Thanks Qt! )

8 years agoRefactoring: rename ModelDiffer to Scenediffer.
Kim Kulling [Fri, 23 Sep 2016 08:22:14 +0000 (10:22 +0200)]
Refactoring: rename ModelDiffer to Scenediffer.

8 years agoModelDiffer: update material testser + create material for unittests.
Kim Kulling [Fri, 23 Sep 2016 08:10:00 +0000 (10:10 +0200)]
ModelDiffer: update material testser + create material for unittests.

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 22 Sep 2016 07:52:56 +0000 (09:52 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoObjImporter: fix test for vertices import.
Kim Kulling [Thu, 22 Sep 2016 07:15:41 +0000 (09:15 +0200)]
ObjImporter: fix test for vertices import.

8 years agoMerge pull request #1001 from johnmaf/feature/glTF/separate-bin
Kim Kulling [Wed, 21 Sep 2016 17:39:38 +0000 (19:39 +0200)]
Merge pull request #1001 from johnmaf/feature/glTF/separate-bin

Export glTF buffer data in a separate .bin file

8 years agoMerge pull request #1004 from johnmaf/bugfix/glTF-triangulate
Kim Kulling [Wed, 21 Sep 2016 17:37:54 +0000 (19:37 +0200)]
Merge pull request #1004 from johnmaf/bugfix/glTF-triangulate

Add Triangulate post-processing step to glTF exporters

8 years agoAdd Triangulate post-processing step to glTF exporters
johnmaf [Wed, 21 Sep 2016 15:33:02 +0000 (11:33 -0400)]
Add Triangulate post-processing step to glTF exporters

8 years agoglTF: move mesh splitting to constructor to cover GLB
johnmaf [Tue, 20 Sep 2016 18:15:42 +0000 (14:15 -0400)]
glTF: move mesh splitting to constructor to cover GLB

8 years agoModelDiffer: use Equal-method to compare vectors.
Kim Kulling [Tue, 20 Sep 2016 17:48:03 +0000 (19:48 +0200)]
ModelDiffer: use Equal-method to compare vectors.

8 years agoMerge upstream master
johnmaf [Tue, 20 Sep 2016 15:53:12 +0000 (11:53 -0400)]
Merge upstream master

8 years agoMerge pull request #972 from smalcom/gltf_o3dgc
Kim Kulling [Tue, 20 Sep 2016 10:36:59 +0000 (12:36 +0200)]
Merge pull request #972 from smalcom/gltf_o3dgc

Support for Open3DGC-compression in glTF importer/exporter.

8 years agoMerge branch 'gltf_o3dgc' of https://github.com/smalcom/assimp into gltf_o3dgc
Alexandr Arutjunov [Tue, 20 Sep 2016 13:06:08 +0000 (16:06 +0300)]
Merge branch 'gltf_o3dgc' of https://github.com/smalcom/assimp into gltf_o3dgc

8 years ago[*] Merge with fresh master.
Alexandr Arutjunov [Tue, 20 Sep 2016 13:02:41 +0000 (16:02 +0300)]
[*] Merge with fresh master.

8 years agoObj: prepare unittest and add missing tests for mesh comparison in
Kim Kulling [Tue, 20 Sep 2016 09:27:58 +0000 (11:27 +0200)]
Obj: prepare unittest and add missing tests for mesh comparison in
Modeldiffer.

8 years agoMerge pull request #998 from johnmaf/bugfix/gltfUVs
Kim Kulling [Tue, 20 Sep 2016 07:53:57 +0000 (09:53 +0200)]
Merge pull request #998 from johnmaf/bugfix/gltfUVs

Flip UVs in glTFExporter

8 years agoMerge pull request #999 from johnmaf/feature/single-glTF-buffer
Kim Kulling [Tue, 20 Sep 2016 07:52:54 +0000 (09:52 +0200)]
Merge pull request #999 from johnmaf/feature/single-glTF-buffer

Add all glTF data to single buffer

8 years agoExport glTF buffers as separate .bin files
johnmaf [Mon, 19 Sep 2016 21:44:38 +0000 (17:44 -0400)]
Export glTF buffers as separate .bin files

8 years agoUnittest: add first approach for modeldiffer.
Kim Kulling [Mon, 19 Sep 2016 19:35:45 +0000 (21:35 +0200)]
Unittest: add first approach for modeldiffer.

8 years agoRenaming doc.
Kim Kulling [Sat, 17 Sep 2016 08:20:03 +0000 (10:20 +0200)]
Renaming doc.