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

7 years agoUpdate utObjImportExport.cpp
Kim Kulling [Mon, 6 Feb 2017 12:15:53 +0000 (13:15 +0100)]
Update utObjImportExport.cpp

Unittest: make execution of base exporter test for obj depending of ASSIMP_BUILD_NO_EXPORT.

7 years agoUpdate utObjImportExport.cpp
Kim Kulling [Mon, 6 Feb 2017 12:06:47 +0000 (13:06 +0100)]
Update utObjImportExport.cpp

Unittest: Make obj-exporter test depending on export state.

7 years agoObj-Exporter test: fix test fixure if no export was requetsed.
Kim Kulling [Sun, 5 Feb 2017 20:00:06 +0000 (21:00 +0100)]
Obj-Exporter test: fix test fixure if no export was requetsed.

7 years agoFix the build: next try ( with full namespaces ).
Kim Kulling [Sun, 5 Feb 2017 19:51:18 +0000 (20:51 +0100)]
Fix the build: next try ( with full namespaces ).

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sun, 5 Feb 2017 18:30:11 +0000 (19:30 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoObj: fix code review findings.
Kim Kulling [Sat, 4 Feb 2017 17:32:04 +0000 (18:32 +0100)]
Obj: fix code review findings.

7 years agoFix the build.
Kim Kulling [Sat, 4 Feb 2017 17:15:50 +0000 (18:15 +0100)]
Fix the build.

7 years agocloses https://github.com/assimp/assimp/issues/809: add vertex color
Kim Kulling [Sat, 4 Feb 2017 13:51:23 +0000 (14:51 +0100)]
closes https://github.com/assimp/assimp/issues/809: add vertex color
export support.

7 years agoObj-Importer: fix crash when updating the current mat-index: use correct
Kim Kulling [Wed, 1 Feb 2017 19:11:12 +0000 (20:11 +0100)]
Obj-Importer: fix crash when updating the current mat-index: use correct
index.

7 years agoMerge pull request #1160 from NolaDonato/materialindex
Kim Kulling [Wed, 1 Feb 2017 17:42:16 +0000 (18:42 +0100)]
Merge pull request #1160 from NolaDonato/materialindex

OBJParser: set material index when changing current material

7 years agoOBJ: check for null mesh before updating material index
nola.donato@samsung.com [Wed, 1 Feb 2017 00:40:04 +0000 (16:40 -0800)]
OBJ: check for null mesh before updating material index

Sometimes the current mesh is null, should check before updating the material index

Submitted by: Nola Donato nola.donato@samsung.com

7 years agoMerge pull request #1161 from NolaDonato/spacesinfilenames
Kim Kulling [Tue, 31 Jan 2017 07:40:36 +0000 (08:40 +0100)]
Merge pull request #1161 from NolaDonato/spacesinfilenames

OBJParser: Support spaces in texture file names

7 years agoOBJParser: set material index when changing current material
nola.donato@samsung.com [Tue, 31 Jan 2017 04:32:37 +0000 (20:32 -0800)]
OBJParser: set material index when changing current material

When a new material is parsed from the material library, the name of the current material is set but the old material index remains. This leaves an incorrect material index in the current mesh causing textures to not be associated with the right mesh. This patch updates the material index when changing the material name.

submitted by: Nola Donato nola.donato@samsung.com

7 years agoOBJParser: Support spaces in texture file names
nola.donato@samsung.com [Tue, 31 Jan 2017 04:27:35 +0000 (20:27 -0800)]
OBJParser: Support spaces in texture file names

This patch allows embedded spaces in texture filenames found in MTL files. It only affects the OBJ parser.

Submitted by: Nola Donato nola.donato@samsung.com

7 years agoMerge pull request #1159 from assimp/issues-1155
Kim Kulling [Mon, 30 Jan 2017 11:52:01 +0000 (12:52 +0100)]
Merge pull request #1159 from assimp/issues-1155

closes https://github.com/assimp/assimp/issues/1155: remove deprecated

7 years agocloses https://github.com/assimp/assimp/issues/1155: remove deprecated
Kim Kulling [Mon, 30 Jan 2017 10:44:51 +0000 (11:44 +0100)]
closes https://github.com/assimp/assimp/issues/1155: remove deprecated
workspaces.

7 years agoMerge pull request #1156 from elect86/patch-7
Alexander Gessler [Sat, 28 Jan 2017 12:28:47 +0000 (13:28 +0100)]
Merge pull request #1156 from elect86/patch-7

Update ColladaParser.cpp

7 years agoMerge pull request #1154 from Kvalme/master
Alexander Gessler [Sat, 28 Jan 2017 12:28:31 +0000 (13:28 +0100)]
Merge pull request #1154 from Kvalme/master

Fix for COLLADA export texture mapping #1084

7 years agoMerge pull request #1157 from elect86/patch-8
Alexander Gessler [Sat, 28 Jan 2017 12:25:58 +0000 (13:25 +0100)]
Merge pull request #1157 from elect86/patch-8

Update ColladaParser.cpp

7 years agoUpdate ColladaParser.cpp
Giuseppe Barbieri [Sat, 28 Jan 2017 10:54:11 +0000 (11:54 +0100)]
Update ColladaParser.cpp

Fixed indent

7 years agoUpdate ColladaParser.cpp
Giuseppe Barbieri [Sat, 28 Jan 2017 07:02:02 +0000 (08:02 +0100)]
Update ColladaParser.cpp

7 years agoIssue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices...
Denis Biryukov [Fri, 27 Jan 2017 11:31:07 +0000 (14:31 +0300)]
Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist>

7 years agoIssue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices...
Denis Biryukov [Fri, 27 Jan 2017 11:29:18 +0000 (14:29 +0300)]
Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist>

7 years agoMerge remote-tracking branch 'upstream/master'
Denis Biryukov [Fri, 27 Jan 2017 07:57:32 +0000 (10:57 +0300)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge pull request #1150 from AntiMoron/master
Alexander Gessler [Thu, 26 Jan 2017 20:05:06 +0000 (21:05 +0100)]
Merge pull request #1150 from AntiMoron/master

Fix compiler cpp std version

7 years agoMerge pull request #1152 from elect86/patch-6
Alexander Gessler [Thu, 26 Jan 2017 20:04:14 +0000 (21:04 +0100)]
Merge pull request #1152 from elect86/patch-6

Update ColladaParser.cpp

7 years agoUpdate ColladaParser.cpp
Giuseppe Barbieri [Thu, 26 Jan 2017 16:29:31 +0000 (17:29 +0100)]
Update ColladaParser.cpp

7 years agoUpdate ColladaParser.cpp
Giuseppe Barbieri [Thu, 26 Jan 2017 16:28:39 +0000 (17:28 +0100)]
Update ColladaParser.cpp

7 years agoFix cpp std version at least c++11
AntiMoron [Wed, 25 Jan 2017 07:38:20 +0000 (15:38 +0800)]
Fix cpp std version at least c++11

There's list loop enumeration and incompatible template codes which may cause compile errors due to different compilers.

7 years agoMerge pull request #1147 from elect86/patch-5
Kim Kulling [Fri, 20 Jan 2017 20:15:14 +0000 (21:15 +0100)]
Merge pull request #1147 from elect86/patch-5

Update PlyLoader.cpp, typo

7 years agoUpdate PlyLoader.cpp
Giuseppe Barbieri [Fri, 20 Jan 2017 18:30:36 +0000 (19:30 +0100)]
Update PlyLoader.cpp

7 years agoMerge pull request #1146 from elect86/patch-4
Alexander Gessler [Thu, 19 Jan 2017 23:08:06 +0000 (00:08 +0100)]
Merge pull request #1146 from elect86/patch-4

Update PlyLoader.cpp

7 years agoUpdate PlyLoader.cpp
Giuseppe Barbieri [Thu, 19 Jan 2017 21:43:38 +0000 (22:43 +0100)]
Update PlyLoader.cpp

7 years agoMerge pull request #1145 from elect86/patch-3
Kim Kulling [Thu, 19 Jan 2017 17:54:06 +0000 (18:54 +0100)]
Merge pull request #1145 from elect86/patch-3

typo

7 years agoFix new call.
Kim Kulling [Thu, 19 Jan 2017 12:38:06 +0000 (13:38 +0100)]
Fix new call.

7 years agoAPI: Fix build
Kim Kulling [Thu, 19 Jan 2017 10:41:43 +0000 (11:41 +0100)]
API: Fix build