platform/upstream/assimp.git
7 years agoMerge pull request #1234 from heliocastro/html_output
Kim Kulling [Tue, 18 Apr 2017 15:11:41 +0000 (17:11 +0200)]
Merge pull request #1234 from heliocastro/html_output

Enable doxygen been properly used from cmake build and install.

7 years agoEnable doxygen been properly used from cmake build and install.
Helio Chissini de Castro [Tue, 18 Apr 2017 12:51:17 +0000 (14:51 +0200)]
Enable doxygen been properly used from cmake build and install.

Current documentation lacks a proper directory handling and switch for
Unix like systems.
The option BUILD_DOCS are added as disable by default, even so the
Doxyfile file is generated for a manual build.

Option HTML_OUTPUT are made cached to be properly replaced, as usually
done by some Linux distributions

Microsoft CHM option is enabled if MSVC is detected.

7 years agoUnittests: prepare ctest usage.
Kim Kulling [Mon, 17 Apr 2017 19:25:57 +0000 (21:25 +0200)]
Unittests: prepare ctest usage.

7 years agocloses github.com/assimp/assimp/issues/1228: use test extension for exported test...
Kim Kulling [Mon, 17 Apr 2017 12:26:54 +0000 (14:26 +0200)]
closes github.com/assimp/assimp/issues/1228: use test extension for exported test files.

7 years agoUnittest: add missing test for ply-parser.
Kim Kulling [Mon, 17 Apr 2017 12:15:33 +0000 (14:15 +0200)]
Unittest: add missing test for ply-parser.

7 years agoMerge pull request #1232 from asmaloney/fix-spelling
Kim Kulling [Wed, 12 Apr 2017 11:24:55 +0000 (13:24 +0200)]
Merge pull request #1232 from asmaloney/fix-spelling

Fix spelling

7 years agoFix spelling
Andy Maloney [Tue, 11 Apr 2017 20:33:13 +0000 (16:33 -0400)]
Fix spelling

7 years agoMerge pull request #1231 from samitc/master
Kim Kulling [Tue, 11 Apr 2017 17:14:00 +0000 (19:14 +0200)]
Merge pull request #1231 from samitc/master

fix line breakes in obj files

7 years agofix line breakes in obj files
Amit Cirt [Tue, 11 Apr 2017 14:16:18 +0000 (17:16 +0300)]
fix line breakes in obj files

7 years agoMerge pull request #1226 from gbittoun/master
Kim Kulling [Sun, 9 Apr 2017 08:57:50 +0000 (10:57 +0200)]
Merge pull request #1226 from gbittoun/master

Python wrapping improvements

7 years agoCompilation fix: Removing the vector4 headers from code/CMakeLists.txt
Guillaume Bittoun [Sat, 8 Apr 2017 21:25:39 +0000 (23:25 +0200)]
Compilation fix: Removing the vector4 headers from code/CMakeLists.txt

7 years agoAdding a fallback to shader version 120 when version 130 failed to compile
Guillaume Bittoun [Sat, 8 Apr 2017 10:05:54 +0000 (12:05 +0200)]
Adding a fallback to shader version 120 when version 130 failed to compile

7 years agoInstalling assimp library as well
Guillaume Bittoun [Sat, 8 Apr 2017 09:16:28 +0000 (11:16 +0200)]
Installing assimp library as well

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 7 Apr 2017 15:50:20 +0000 (17:50 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoadd missing doc.
Kim Kulling [Fri, 7 Apr 2017 15:50:13 +0000 (17:50 +0200)]
add missing doc.

7 years agoadd missing doc.
Kim Kulling [Fri, 7 Apr 2017 15:49:59 +0000 (17:49 +0200)]
add missing doc.

7 years agoadd missing doc.
Kim Kulling [Fri, 7 Apr 2017 15:49:43 +0000 (17:49 +0200)]
add missing doc.

7 years agoadd doc.
Kim Kulling [Fri, 7 Apr 2017 15:49:26 +0000 (17:49 +0200)]
add doc.

7 years agoadd missing image.
Kim Kulling [Fri, 7 Apr 2017 15:49:03 +0000 (17:49 +0200)]
add missing image.

7 years agoexport doc.# with '#' will be ignored, and an empty message aborts the commit.
Kim Kulling [Fri, 7 Apr 2017 15:48:18 +0000 (17:48 +0200)]
export doc.# with '#' will be ignored, and an empty message aborts the commit.

7 years agodoc updatedoc update
Kim Kulling [Fri, 7 Apr 2017 15:46:53 +0000 (17:46 +0200)]
doc updatedoc update

7 years agoCMake: Fix compatibility check for so-version of the assimp lib.
Kim Kulling [Thu, 6 Apr 2017 14:32:17 +0000 (16:32 +0200)]
CMake: Fix compatibility check for so-version of the assimp lib.

7 years agoMerge pull request #1221 from mhereman/bugfix/clang_4.0
Kim Kulling [Mon, 3 Apr 2017 10:49:00 +0000 (12:49 +0200)]
Merge pull request #1221 from mhereman/bugfix/clang_4.0

Fixed compiler error on clang 4.0 running on OSX

7 years agoFixed compiler error on clang 4.0 running on OSX
Maarten Heremans [Mon, 3 Apr 2017 09:07:43 +0000 (11:07 +0200)]
Fixed compiler error on clang 4.0 running on OSX

glTFExporter.cpp:585:35: error: ordered comparison between pointer and zero ('aiVector3D *'
      (aka 'aiVector3t<float> *') and 'int')
                if(comp_allow && (aim->mNormals > 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.

7 years agoMerge pull request #1220 from andre-schulz/fix-pdb-install-relwithdebinfo
Kim Kulling [Sat, 1 Apr 2017 20:14:55 +0000 (22:14 +0200)]
Merge pull request #1220 from andre-schulz/fix-pdb-install-relwithdebinfo

Fix PDB file installation in RelWithDebInfo configuration

7 years agoFix PDB file installation in RelWithDebInfo configuration
Andre Schulz [Sat, 1 Apr 2017 14:03:01 +0000 (16:03 +0200)]
Fix PDB file installation in RelWithDebInfo configuration

7 years agoSetup: Fix setup-script.
Kim Kulling [Thu, 30 Mar 2017 19:15:51 +0000 (21:15 +0200)]
Setup: Fix setup-script.

7 years agoX3D: add working example.
Kim Kulling [Wed, 29 Mar 2017 19:13:44 +0000 (21:13 +0200)]
X3D: add working example.

7 years agoConfig.h.in: fix typo.
Kim Kulling [Wed, 29 Mar 2017 19:08:40 +0000 (21:08 +0200)]
Config.h.in: fix typo.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 29 Mar 2017 18:56:55 +0000 (20:56 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoCloses https://github.com/assimp/assimp/issues/1205: fix typo in docu.
Kim Kulling [Wed, 29 Mar 2017 18:56:30 +0000 (20:56 +0200)]
Closes https://github.com/assimp/assimp/issues/1205: fix typo in docu.

7 years agoMerge pull request #1217 from Kai-W/master
Kim Kulling [Tue, 28 Mar 2017 15:06:06 +0000 (17:06 +0200)]
Merge pull request #1217 from Kai-W/master

Added ComponentType Unsigned int and Error handling

7 years agoUpdate Readme.md
Kim Kulling [Tue, 28 Mar 2017 12:06:31 +0000 (14:06 +0200)]
Update Readme.md

7 years agoUpdate Readme.md
Kim Kulling [Tue, 28 Mar 2017 11:42:32 +0000 (13:42 +0200)]
Update Readme.md

Add patron link to Readme.md.

7 years ago3MF: reformattings.
Kim Kulling [Mon, 27 Mar 2017 22:35:56 +0000 (00:35 +0200)]
3MF: reformattings.

7 years agoAdded ComponentType Unsigned int and Error handling
Kai Westerkamp [Mon, 27 Mar 2017 15:22:49 +0000 (17:22 +0200)]
Added ComponentType Unsigned int and Error handling
Part of GLTF 2.0 changes

7 years agoMerge pull request #1214 from assimp/issue_1211
Kim Kulling [Thu, 23 Mar 2017 19:36:01 +0000 (20:36 +0100)]
Merge pull request #1214 from assimp/issue_1211

closes https://github.com/assimp/assimp/issues/1211: defensice handling

7 years agocloses https://github.com/assimp/assimp/issues/1211: defensice handling
Kim Kulling [Thu, 23 Mar 2017 16:11:52 +0000 (17:11 +0100)]
closes https://github.com/assimp/assimp/issues/1211: defensice handling
of utf-8 decode issues.

7 years agoMerge pull request #1208 from terziman/master
Kim Kulling [Wed, 22 Mar 2017 19:08:21 +0000 (20:08 +0100)]
Merge pull request #1208 from terziman/master

Added parameters to IFC importer to control tessellation

7 years agoMerge pull request #1210 from rmitton/sib-normals
Kim Kulling [Tue, 21 Mar 2017 13:31:34 +0000 (14:31 +0100)]
Merge pull request #1210 from rmitton/sib-normals

Fix for faceted normals in SIB files

7 years agoFixed infinite loop on non-manifold geometry
rmitton [Sun, 19 Mar 2017 20:46:23 +0000 (13:46 -0700)]
Fixed infinite loop on non-manifold geometry

Geometry that had strange non-manifold faces could cause the normal
calculation to enter an infinite loop. Instead we now correctly detect
which faces to scan over.

7 years agoFixed faceted normals in SIB importer.
rmitton [Sat, 18 Mar 2017 21:52:48 +0000 (14:52 -0700)]
Fixed faceted normals in SIB importer.

7 years agoExtended support for tessellation parameter to more IFC shapes
Leo Terziman [Fri, 17 Mar 2017 13:55:18 +0000 (14:55 +0100)]
Extended support for tessellation parameter to more IFC shapes

7 years agoMerge remote-tracking branch 'github/master' into contrib
Leo Terziman [Fri, 17 Mar 2017 11:13:52 +0000 (12:13 +0100)]
Merge remote-tracking branch 'github/master' into contrib

7 years agoAdded parameter to control cylindrical shapes tessellation
Leo Terziman [Fri, 17 Mar 2017 10:58:50 +0000 (11:58 +0100)]
Added parameter to control cylindrical shapes tessellation
+ renamed smoothing angle parameter for better user understanding

7 years agoFixed bug in IFC openings when curmesh.vertcnt is empty
Leo Terziman [Fri, 17 Mar 2017 10:53:36 +0000 (11:53 +0100)]
Fixed bug in IFC openings when curmesh.vertcnt is empty

7 years agoMerge pull request #1207 from Celli119/matrixOperators
Kim Kulling [Fri, 17 Mar 2017 08:33:41 +0000 (09:33 +0100)]
Merge pull request #1207 from Celli119/matrixOperators

operators to add and multiply by floats

7 years agooperators to add and multiply by floats
girinon [Thu, 16 Mar 2017 11:03:04 +0000 (12:03 +0100)]
operators to add and multiply by floats

7 years agoMerge pull request #1204 from assimp/issue-1128
Kim Kulling [Tue, 14 Mar 2017 18:55:21 +0000 (19:55 +0100)]
Merge pull request #1204 from assimp/issue-1128

Closes https://github.com/assimp/assimp/issues/1128: do not use non

7 years agoUnittests: add 3mf load test.
Kim Kulling [Tue, 14 Mar 2017 18:24:20 +0000 (19:24 +0100)]
Unittests: add 3mf load test.

7 years agoCloses https://github.com/assimp/assimp/issues/1128: do not use non
Kim Kulling [Tue, 14 Mar 2017 18:01:41 +0000 (19:01 +0100)]
Closes https://github.com/assimp/assimp/issues/1128: do not use non
verbose format flag for import.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 11 Mar 2017 21:13:48 +0000 (22:13 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoMerge branch 'Lugdunum3D-fix-include-api'
Kim Kulling [Sat, 11 Mar 2017 17:29:31 +0000 (18:29 +0100)]
Merge branch 'Lugdunum3D-fix-include-api'

7 years agoMerge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3...
Kim Kulling [Sat, 11 Mar 2017 17:19:36 +0000 (18:19 +0100)]
Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api

7 years agoMerge pull request #1195 from assimp/cleanup_includes
Kim Kulling [Sat, 11 Mar 2017 17:11:10 +0000 (18:11 +0100)]
Merge pull request #1195 from assimp/cleanup_includes

Cleanup includes

7 years agoStringUtils: add the right missing header.
Kim Kulling [Sat, 11 Mar 2017 16:25:34 +0000 (17:25 +0100)]
StringUtils: add the right missing header.

7 years agoStringUtils: add missing include for VS2012 & 2013
Kim Kulling [Sat, 11 Mar 2017 10:34:23 +0000 (11:34 +0100)]
StringUtils: add missing include for VS2012 & 2013

7 years agoFixed some formatting
Leo Terziman [Fri, 10 Mar 2017 13:46:28 +0000 (14:46 +0100)]
Fixed some formatting

7 years agoAdded new option to IFC importer to control tessellation angle
Leo Terziman [Fri, 10 Mar 2017 13:42:17 +0000 (14:42 +0100)]
Added new option to IFC importer to control tessellation angle
+ removed unused IFC option

7 years agoMerge remote-tracking branch 'github/master' into contrib
Leo Terziman [Thu, 9 Mar 2017 16:28:47 +0000 (17:28 +0100)]
Merge remote-tracking branch 'github/master' into contrib

7 years agoUnittests: fix version test.
Kim Kulling [Wed, 8 Mar 2017 09:54:12 +0000 (10:54 +0100)]
Unittests: fix version test.

7 years agoMerge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes
Kim Kulling [Wed, 8 Mar 2017 09:27:57 +0000 (10:27 +0100)]
Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes

7 years agoCleanup_includes: fix linux build.
Kim Kulling [Wed, 8 Mar 2017 08:55:44 +0000 (09:55 +0100)]
Cleanup_includes: fix linux build.

7 years agoMerge branch 'master' into cleanup_includes
Kim Kulling [Sun, 5 Mar 2017 14:15:29 +0000 (15:15 +0100)]
Merge branch 'master' into cleanup_includes

7 years agoFix missing includes.
Kim Kulling [Sun, 5 Mar 2017 14:05:40 +0000 (15:05 +0100)]
Fix missing includes.

7 years agoMerge pull request #1194 from Sailsman63/fixbuild
Kim Kulling [Thu, 2 Mar 2017 15:47:37 +0000 (16:47 +0100)]
Merge pull request #1194 from Sailsman63/fixbuild

Import FindPkgMacros to main CMake Configuration

7 years agoImport FindPkgMacros to main CMake Configuration
Lucas Stanek [Thu, 2 Mar 2017 03:12:47 +0000 (03:12 +0000)]
Import FindPkgMacros to main CMake Configuration

7 years agoMerge pull request #1193 from murashin/fix-for-freebsd
Kim Kulling [Wed, 1 Mar 2017 11:52:52 +0000 (12:52 +0100)]
Merge pull request #1193 from murashin/fix-for-freebsd

fix for FreeBSD

7 years agoUpdate Readme.md
Kim Kulling [Wed, 1 Mar 2017 08:53:36 +0000 (09:53 +0100)]
Update Readme.md

Fix typo

7 years agoUpdate Readme.md
Kim Kulling [Wed, 1 Mar 2017 08:53:15 +0000 (09:53 +0100)]
Update Readme.md

Readme: Reintroduce irc ahain

7 years agofix for FreeBSD
Shin-ya Murakami [Wed, 1 Mar 2017 07:30:03 +0000 (16:30 +0900)]
fix for FreeBSD

7 years agoMerge pull request #1191 from Lugdunum3D/feature-importers-whitelist
Kim Kulling [Tue, 28 Feb 2017 23:34:10 +0000 (00:34 +0100)]
Merge pull request #1191 from Lugdunum3D/feature-importers-whitelist

Allow to enable importers in a whitelist manner

7 years agoMerge pull request #1189 from Lugdunum3D/fix-android-asset-extraction
Kim Kulling [Tue, 28 Feb 2017 23:21:32 +0000 (00:21 +0100)]
Merge pull request #1189 from Lugdunum3D/fix-android-asset-extraction

Create the directory for the asset's extraction on Android

7 years agoMerge pull request #1190 from Lugdunum3D/fix-buildsystem-minizip
Kim Kulling [Tue, 28 Feb 2017 23:15:12 +0000 (00:15 +0100)]
Merge pull request #1190 from Lugdunum3D/fix-buildsystem-minizip

Fix buildsystem minizip

7 years agoMerge pull request #1186 from astillich/ase_cface
Kim Kulling [Tue, 28 Feb 2017 23:12:12 +0000 (00:12 +0100)]
Merge pull request #1186 from astillich/ase_cface

Fixed parsing ASE MESH_CFACE

7 years agoMore cleanup
Kim Kulling [Tue, 28 Feb 2017 15:37:07 +0000 (16:37 +0100)]
More cleanup

7 years agoExport DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/
Antoine Bolvy [Tue, 28 Feb 2017 02:31:56 +0000 (21:31 -0500)]
Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/

7 years agoAllow to enable importers in a whitelist manner
Antoine Bolvy [Tue, 28 Feb 2017 02:32:44 +0000 (21:32 -0500)]
Allow to enable importers in a whitelist manner

7 years agoFix encoding in names (partially revert ecbf09e)
Antoine Bolvy [Mon, 27 Feb 2017 23:43:46 +0000 (18:43 -0500)]
Fix encoding in names (partially revert ecbf09e)

7 years agoFix new lines problem
Antoine Bolvy [Mon, 27 Feb 2017 23:28:59 +0000 (18:28 -0500)]
Fix new lines problem

7 years agoCreates the directory for the asset's extraction on Android
Quentin01 [Mon, 27 Feb 2017 08:24:44 +0000 (17:24 +0900)]
Creates the directory for the asset's extraction on Android

7 years agoDisable pkg-config on Android, and use the existing macro for minizip
Antoine Bolvy [Mon, 27 Feb 2017 23:23:39 +0000 (18:23 -0500)]
Disable pkg-config on Android, and use the existing macro for minizip

7 years agoMerge pull request #1187 from assimp/issue-1169
Kim Kulling [Mon, 27 Feb 2017 21:52:53 +0000 (22:52 +0100)]
Merge pull request #1187 from assimp/issue-1169

Issue-1169: fix clang build.

7 years agoIssue-1169: fix clang build.
Kim Kulling [Mon, 27 Feb 2017 20:59:50 +0000 (21:59 +0100)]
Issue-1169: fix clang build.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 27 Feb 2017 19:19:42 +0000 (20:19 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoIssue-1183: add stp to the list of supported extensions for step-files.
Kim Kulling [Mon, 27 Feb 2017 19:11:59 +0000 (20:11 +0100)]
Issue-1183: add stp to the list of supported extensions for step-files.

7 years agoFixed parsing ASE MESH_CFACE
Alexander Stillich [Sat, 25 Feb 2017 22:30:41 +0000 (23:30 +0100)]
Fixed parsing ASE MESH_CFACE

7 years agoRemove unused header.
Kim Kulling [Wed, 22 Feb 2017 16:22:23 +0000 (17:22 +0100)]
Remove unused header.

7 years agoRemove unused headers.
Kim Kulling [Wed, 22 Feb 2017 16:20:26 +0000 (17:20 +0100)]
Remove unused headers.

7 years agoMerge pull request #1181 from assimp/issue_1169
Kim Kulling [Tue, 21 Feb 2017 16:29:49 +0000 (17:29 +0100)]
Merge pull request #1181 from assimp/issue_1169

Issue-1169: fix [] operator of vector3.

7 years agoIssue-1169: add a unittest.
Kim Kulling [Tue, 21 Feb 2017 16:12:22 +0000 (17:12 +0100)]
Issue-1169: add a unittest.

7 years agoIssue-1169: fix travis build.
Kim Kulling [Tue, 21 Feb 2017 10:17:09 +0000 (11:17 +0100)]
Issue-1169: fix travis build.

7 years agoIssue-1169: fix [] operator of vector3.
Kim Kulling [Tue, 21 Feb 2017 09:58:27 +0000 (10:58 +0100)]
Issue-1169: fix [] operator of vector3.

7 years agoMerge pull request #1180 from JonAllee/Memory-Fix
Kim Kulling [Mon, 13 Feb 2017 19:57:25 +0000 (20:57 +0100)]
Merge pull request #1180 from JonAllee/Memory-Fix

Fix memory leak in Collada importer

7 years agoFix memory leak in Collada importer
JonAllee [Mon, 13 Feb 2017 19:25:30 +0000 (11:25 -0800)]
Fix memory leak in Collada importer

Affects Collada files with morph Controller Elements.

7 years agoPLY: prepare bugfix by adding missing unittest.
Kim Kulling [Sat, 11 Feb 2017 13:19:34 +0000 (14:19 +0100)]
PLY: prepare bugfix by adding missing unittest.

7 years agoCloses https://github.com/assimp/assimp/issues/1102: update Version.cpp
Kim Kulling [Sat, 11 Feb 2017 12:49:48 +0000 (13:49 +0100)]
Closes https://github.com/assimp/assimp/issues/1102: update Version.cpp

7 years agocloses https://github.com/assimp/assimp/issues/1102: define line ending for missing...
Kim Kulling [Sat, 11 Feb 2017 12:48:39 +0000 (13:48 +0100)]
closes https://github.com/assimp/assimp/issues/1102: define line ending for missing files.

7 years agoCloses //github.com/assimp/assimp/issues/1102: define line ending for CHANGES file.
Kim Kulling [Sat, 11 Feb 2017 12:45:29 +0000 (13:45 +0100)]
Closes //github.com/assimp/assimp/issues/1102: define line ending for CHANGES file.

7 years agocloses https://github.com/assimp/assimp/issues/1102: update CHANGES file.
Kim Kulling [Sat, 11 Feb 2017 12:44:17 +0000 (13:44 +0100)]
closes https://github.com/assimp/assimp/issues/1102: update CHANGES file.