Kim Kulling [Tue, 27 Sep 2016 22:06:23 +0000 (00:06 +0200)]
Fix some review findings.
Kim Kulling [Tue, 27 Sep 2016 22:06:06 +0000 (00:06 +0200)]
OpenGEX: fix some review findings.
Kim Kulling [Tue, 27 Sep 2016 17:47:27 +0000 (19:47 +0200)]
OpenGEX: fix some review findings.
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.
Kim Kulling [Mon, 26 Sep 2016 18:53:59 +0000 (20:53 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 26 Sep 2016 18:53:42 +0000 (20:53 +0200)]
SceneDiffer: add face tester.
Kim Kulling [Sun, 25 Sep 2016 10:08:30 +0000 (12:08 +0200)]
Merge pull request #1006 from odalet/master
Fixed Appveyor x64 builds
odalet [Sat, 24 Sep 2016 15:26:59 +0000 (17:26 +0200)]
Update appveyor.yml
odalet [Sat, 24 Sep 2016 15:23:48 +0000 (17:23 +0200)]
Update appveyor.yml
odalet [Sat, 24 Sep 2016 15:22:24 +0000 (17:22 +0200)]
Update appveyor.yml
odalet [Sat, 24 Sep 2016 15:21:49 +0000 (17:21 +0200)]
Update appveyor.yml
odalet [Sat, 24 Sep 2016 15:03:23 +0000 (17:03 +0200)]
Update appveyor.yml
Kim Kulling [Fri, 23 Sep 2016 22:27:45 +0000 (00:27 +0200)]
closes https://github.com/assimp/assimp/issues/584: export scene combiner.
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
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! )
Kim Kulling [Fri, 23 Sep 2016 08:22:14 +0000 (10:22 +0200)]
Refactoring: rename ModelDiffer to Scenediffer.
Kim Kulling [Fri, 23 Sep 2016 08:10:00 +0000 (10:10 +0200)]
ModelDiffer: update material testser + create material for unittests.
Kim Kulling [Thu, 22 Sep 2016 07:52:56 +0000 (09:52 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 22 Sep 2016 07:15:41 +0000 (09:15 +0200)]
ObjImporter: fix test for vertices import.
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
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
johnmaf [Wed, 21 Sep 2016 15:33:02 +0000 (11:33 -0400)]
Add Triangulate post-processing step to glTF exporters
johnmaf [Tue, 20 Sep 2016 18:15:42 +0000 (14:15 -0400)]
glTF: move mesh splitting to constructor to cover GLB
Kim Kulling [Tue, 20 Sep 2016 17:48:03 +0000 (19:48 +0200)]
ModelDiffer: use Equal-method to compare vectors.
johnmaf [Tue, 20 Sep 2016 15:53:12 +0000 (11:53 -0400)]
Merge upstream master
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.
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
Alexandr Arutjunov [Tue, 20 Sep 2016 13:02:41 +0000 (16:02 +0300)]
[*] Merge with fresh master.
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.
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
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
johnmaf [Mon, 19 Sep 2016 21:44:38 +0000 (17:44 -0400)]
Export glTF buffers as separate .bin files
Kim Kulling [Mon, 19 Sep 2016 19:35:45 +0000 (21:35 +0200)]
Unittest: add first approach for modeldiffer.
Kim Kulling [Sat, 17 Sep 2016 08:20:03 +0000 (10:20 +0200)]
Renaming doc.
Kim Kulling [Sat, 17 Sep 2016 08:07:14 +0000 (10:07 +0200)]
Doc: add uml-diagrams for import and export.
smalcom [Thu, 15 Sep 2016 19:25:34 +0000 (22:25 +0300)]
[F] min/max redefined when including windows.h
Alexandr Arutjunov [Thu, 15 Sep 2016 17:39:39 +0000 (20:39 +0300)]
[F] Removed unneeded definitions.
[F] Add library for linker.
johnmaf [Wed, 14 Sep 2016 22:14:23 +0000 (18:14 -0400)]
Add all glTF data to single buffer
Alexandr Arutjunov [Thu, 15 Sep 2016 11:45:00 +0000 (14:45 +0300)]
[F] Removed Unicode BOM at file beginning.
johnmaf [Wed, 14 Sep 2016 22:03:52 +0000 (18:03 -0400)]
Flip UVs in glTFExporter
Alexandr Arutjunov [Tue, 13 Sep 2016 10:29:12 +0000 (13:29 +0300)]
[F] Not set option-variable (only define for compilation was set.
[F] For adding library can not be used TARGET_LINK_LIBRARIES
Alexandr Arutjunov [Tue, 13 Sep 2016 09:08:51 +0000 (12:08 +0300)]
Merge branch 'master' into gltf_o3dgc
Kim Kulling [Mon, 12 Sep 2016 10:41:49 +0000 (12:41 +0200)]
Blender: fix some minor findings.
Kim Kulling [Mon, 12 Sep 2016 07:41:58 +0000 (09:41 +0200)]
Merge pull request #949 from r-chris/fix-material-bugs
Fixing bugs related to 64-bit upgrade in materials
Kim Kulling [Sun, 11 Sep 2016 15:28:20 +0000 (17:28 +0200)]
unittests: add platform libs for linux build.
Kim Kulling [Sun, 11 Sep 2016 14:06:29 +0000 (16:06 +0200)]
Unittest: add gtest as part of the contrib to avoid build issues on
offline systems.
Alexandr Arutjunov [Sat, 10 Sep 2016 07:37:32 +0000 (10:37 +0300)]
Merge branch 'master' into gltf_o3dgc
Kim Kulling [Sat, 10 Sep 2016 07:27:29 +0000 (09:27 +0200)]
3MF: add a simple box example from the 3MF-sample repo.
Kim Kulling [Sat, 10 Sep 2016 06:48:01 +0000 (08:48 +0200)]
CMake: fix buildCMake: fix build..
Alexandr Arutjunov [Sat, 10 Sep 2016 06:16:47 +0000 (09:16 +0300)]
[+] FindRT cmake module.
Alexandr Arutjunov [Sat, 10 Sep 2016 06:14:40 +0000 (09:14 +0300)]
Merge branch 'master' into gltf_o3dgc
Alexandr Arutjunov [Sat, 10 Sep 2016 06:14:28 +0000 (09:14 +0300)]
Merge branch 'master' into gltf_o3dgc
Alexandr Arutjunov [Sat, 10 Sep 2016 06:07:50 +0000 (09:07 +0300)]
[*] Not needed namespace.
Alexandr Arutjunov [Sat, 10 Sep 2016 06:05:36 +0000 (09:05 +0300)]
Merge branch 'master' of https://github.com/assimp/assimp into gltf_o3dgc
Kim Kulling [Fri, 9 Sep 2016 18:42:36 +0000 (20:42 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 9 Sep 2016 18:42:02 +0000 (20:42 +0200)]
3MF: make xml tags static const.
Kim Kulling [Fri, 9 Sep 2016 18:41:04 +0000 (20:41 +0200)]
3MFImporter: add source group for visual dtudio.
Alexandr Arutjunov [Fri, 9 Sep 2016 13:38:43 +0000 (16:38 +0300)]
[*] Stylistic changes.
[F] Added all files from Open3DGC codec to CMakeLists.txt
Kim Kulling [Thu, 8 Sep 2016 10:37:07 +0000 (12:37 +0200)]
Merge pull request #996 from johnmaf/bugfix/gltf-split
Split mesh before exporting gltf. Fixes #995
johnmaf [Wed, 7 Sep 2016 21:03:19 +0000 (17:03 -0400)]
Split mesh before exporting gltf. Fixes #995
Kim Kulling [Tue, 6 Sep 2016 13:46:41 +0000 (15:46 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Tue, 6 Sep 2016 13:41:37 +0000 (15:41 +0200)]
ObjImporter: remove unused code.
Kim Kulling [Tue, 6 Sep 2016 08:42:02 +0000 (10:42 +0200)]
Blender: revert fix for suspicious crash in blender on windows.
Kim Kulling [Mon, 5 Sep 2016 08:48:30 +0000 (10:48 +0200)]
IrrImporter: Fix release functions.
Kim Kulling [Sun, 4 Sep 2016 22:27:59 +0000 (00:27 +0200)]
Doc: fix redundant doc.
Kim Kulling [Sun, 4 Sep 2016 18:40:34 +0000 (20:40 +0200)]
Fix coverity findings: fix usage after free.
Kim Kulling [Sun, 4 Sep 2016 18:35:07 +0000 (20:35 +0200)]
ComputeUVMappingprocess: add missing initialization for scalar value.
Kim Kulling [Sun, 4 Sep 2016 18:22:04 +0000 (20:22 +0200)]
Fix invalid release of mat + mesh.
Kim Kulling [Fri, 2 Sep 2016 18:06:56 +0000 (20:06 +0200)]
IFC: fix possible use after free access bug.
Kim Kulling [Fri, 2 Sep 2016 18:06:31 +0000 (20:06 +0200)]
Blender: fix invalid OnjectCompare op.
Kim Kulling [Wed, 31 Aug 2016 17:50:14 +0000 (19:50 +0200)]
CREDITS: first update.
Kim Kulling [Tue, 30 Aug 2016 17:50:53 +0000 (19:50 +0200)]
MDLMoader: fix resource leak.
Kim Kulling [Tue, 30 Aug 2016 17:46:34 +0000 (19:46 +0200)]
Fix coverity finding: use deep copy instead of reference showing to
mem-adress when reading and calling push_back in a std::vector.
Kim Kulling [Mon, 29 Aug 2016 18:05:29 +0000 (20:05 +0200)]
glTFImporter: avoid out-of-bounds-access.
Kim Kulling [Mon, 29 Aug 2016 17:56:38 +0000 (19:56 +0200)]
MakeVerboseFormat: fix invalid delete statement.
Kim Kulling [Mon, 29 Aug 2016 16:23:41 +0000 (18:23 +0200)]
Fix findings from code review.
Kim Kulling [Mon, 29 Aug 2016 13:32:27 +0000 (15:32 +0200)]
Fix coverity findings: fix possible out-of-bound access.
Kim Kulling [Mon, 29 Aug 2016 13:28:37 +0000 (15:28 +0200)]
Fix coverity findings: fix possible usage after calling free.
Kim Kulling [Mon, 29 Aug 2016 13:24:24 +0000 (15:24 +0200)]
Fix coverity finding: fix possible use after free..
Kim Kulling [Thu, 25 Aug 2016 16:20:52 +0000 (18:20 +0200)]
GeometryBuilder: fix update of vertices.
Kim Kulling [Sat, 20 Aug 2016 12:48:03 +0000 (14:48 +0200)]
Merge pull request #985 from Sailsman63/64b_static_zlib
Building own zlib on 64bit Linux shared library requires -fPIC for C compiler.
Kim Kulling [Fri, 19 Aug 2016 08:26:48 +0000 (10:26 +0200)]
Merge pull request #984 from jwwalker/upstream
Add typecasts in glTFAssetWriter.inl to fix compile errors
Lucas Stanek [Thu, 18 Aug 2016 22:23:12 +0000 (22:23 +0000)]
Add -fPIC to C Flags for 64bit linux Shared Object builds without checking if zlib is being built.
Lucas Stanek [Thu, 18 Aug 2016 00:03:29 +0000 (00:03 +0000)]
Building static ZLIB on 64b LInux requires -fPIC for C compiler.
Daniel Knezevic [Thu, 18 Aug 2016 08:51:20 +0000 (10:51 +0200)]
Use Assimp namespace to fix build for big-endian architectures
James Walker [Thu, 18 Aug 2016 17:55:24 +0000 (10:55 -0700)]
Changed C-style casts to static_cast.
Alexander Gessler [Thu, 18 Aug 2016 13:41:48 +0000 (15:41 +0200)]
Merge pull request #986 from Deni90/master
Use Assimp namespace to fix build for big-endian architectures
Daniel Knezevic [Thu, 18 Aug 2016 08:51:20 +0000 (10:51 +0200)]
Use Assimp namespace to fix build for big-endian architectures
James Walker [Thu, 18 Aug 2016 00:35:16 +0000 (17:35 -0700)]
Add typecasts in glTFAssetWriter.inl to fix compile errors about ambiguous constructors, see: <https://github.com/assimp/assimp/issues/980>
Chris Russ [Tue, 16 Aug 2016 21:57:31 +0000 (07:57 +1000)]
include config.h to always have the correct types (float/double) exposed
Chris Russ [Sun, 17 Jul 2016 22:23:46 +0000 (08:23 +1000)]
fix precision issue within memory copy
Chris Russ [Sun, 17 Jul 2016 01:43:04 +0000 (11:43 +1000)]
add explicit config.h include to export
Chris Russ [Sun, 17 Jul 2016 01:37:20 +0000 (11:37 +1000)]
renaming define for double precision to be picked up by cmake correctly
Chris Russ [Sat, 16 Jul 2016 23:49:28 +0000 (09:49 +1000)]
Fixing bugs related to 64-bit upgrade in materials
Kim Kulling [Mon, 15 Aug 2016 19:30:46 +0000 (21:30 +0200)]
Merge pull request #983 from roshanch/master
adding support to store all the layered textures
roshan.c [Mon, 15 Aug 2016 16:58:53 +0000 (09:58 -0700)]
adding support to store all the layered textures
Kim Kulling [Sun, 14 Aug 2016 19:25:07 +0000 (21:25 +0200)]
Merge pull request #979 from assimp/issue_975
Fix copy-paste-error.
Kim Kulling [Sun, 14 Aug 2016 19:24:00 +0000 (21:24 +0200)]
Fix copy-paste-error.
Alexandr Arutjunov [Sun, 14 Aug 2016 16:49:05 +0000 (19:49 +0300)]
[F] Removed Unicode BOM.
Alexandr Arutjunov [Sun, 14 Aug 2016 13:49:53 +0000 (16:49 +0300)]
Merge branch 'master' into gltf_o3dgc