platform/upstream/assimp.git
7 years agoFBX: Correct camera position and clip planes.
Matt Oliver [Mon, 9 Jan 2017 05:11:32 +0000 (16:11 +1100)]
FBX: Correct camera position and clip planes.

Fbx cameras are stored in the scene graph as well as having separate camera properties.
The separate camera properties have a camera position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
camera being transformed twice. Since the scene graph contains all the relevant
transformations the camera position and direction can just use default values. Fbx
specifies cameras along the positive x axis so the default camera values have a up and
direction set accordingly.

Fixes: #807 #643

7 years agoFBX: Add correct light locations and falloff values.
Matt Oliver [Mon, 9 Jan 2017 05:07:40 +0000 (16:07 +1100)]
FBX: Add correct light locations and falloff values.

Fbx lights are stored in the scene graph as well as having separate light properties.
The separate light properties have a light position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
light being transformed twice. Since the scene graph contains all the relevant
transformations the light position and direction can just use default values. Fbx
specifies lights along the negative y axis so the default light values have a up and
direction set accordingly.

The DecayStart value specifies the distance from the light that the light intensity
will drop to half. Using the default assimp falloff equation of f=1/c+lr+qr^2 then
the falloff coefficients can be calculated for either c,l or q accordingly by setting
r=DecayStart and f=0.5.

Fixes #851

7 years agoMerge pull request #1130 from undisputed-seraphim/clear-msvc-codepage-warnings
Kim Kulling [Sun, 8 Jan 2017 17:34:34 +0000 (18:34 +0100)]
Merge pull request #1130 from undisputed-seraphim/clear-msvc-codepage-warnings

Cleared majority of codepage warnings in Visual Studio 2015.

7 years agoCleared majority of codepage warnings in Visual Studio 14.
Tan Li Boon [Sun, 8 Jan 2017 16:41:10 +0000 (00:41 +0800)]
Cleared majority of codepage warnings in Visual Studio 14.

7 years agoUpdate Readme.md
Kim Kulling [Sun, 8 Jan 2017 10:38:50 +0000 (11:38 +0100)]
Update Readme.md

7 years agoUpdate Readme.md
Kim Kulling [Sun, 8 Jan 2017 10:38:04 +0000 (11:38 +0100)]
Update Readme.md

7 years agounittest: add unittest for hmp import format.
Kim Kulling [Sat, 7 Jan 2017 20:29:22 +0000 (21:29 +0100)]
unittest: add unittest for hmp import format.

7 years agounittest: add a disabled glft unittest.
Kim Kulling [Sat, 7 Jan 2017 20:16:24 +0000 (21:16 +0100)]
unittest: add a disabled glft unittest.

7 years agounittest: add unittest for CSM format importer / exporter.
Kim Kulling [Sat, 7 Jan 2017 20:07:41 +0000 (21:07 +0100)]
unittest: add unittest for CSM format importer / exporter.

7 years agounittest: add import export test for collada file importer exporter.
Kim Kulling [Sat, 7 Jan 2017 19:32:35 +0000 (20:32 +0100)]
unittest: add import export test for collada file importer exporter.

7 years agounittest: add unittest for bvh file importer.
Kim Kulling [Sat, 7 Jan 2017 19:27:59 +0000 (20:27 +0100)]
unittest: add unittest for bvh file importer.

7 years agounittest: add unittest for b3d format importer / exporte3r.
Kim Kulling [Sat, 7 Jan 2017 19:02:36 +0000 (20:02 +0100)]
unittest: add unittest for b3d format importer / exporte3r.

7 years agounittest: add unittest from ASE format importer.
Kim Kulling [Sat, 7 Jan 2017 18:58:27 +0000 (19:58 +0100)]
unittest: add unittest from ASE format importer.

7 years agounittest: add import export unittest for AMF-format.
Kim Kulling [Sat, 7 Jan 2017 16:58:31 +0000 (17:58 +0100)]
unittest: add import export unittest for AMF-format.

7 years agounittest: add unittest form 3ds-format.
Kim Kulling [Sat, 7 Jan 2017 16:48:33 +0000 (17:48 +0100)]
unittest: add unittest form 3ds-format.

7 years agounittest: new unittest for 3D-importer.
Kim Kulling [Sat, 7 Jan 2017 16:45:29 +0000 (17:45 +0100)]
unittest: new unittest for 3D-importer.

7 years agoUnittest: new unittests.
Kim Kulling [Sat, 7 Jan 2017 16:33:18 +0000 (17:33 +0100)]
Unittest: new unittests.

7 years agoBlender: add import test to unit test suite.
Kim Kulling [Sat, 7 Jan 2017 15:14:09 +0000 (16:14 +0100)]
Blender: add import test to unit test suite.

7 years agoBlender: add missing constructors.
Kim Kulling [Thu, 5 Jan 2017 19:23:02 +0000 (20:23 +0100)]
Blender: add missing constructors.

7 years agoUnittest: fix compiler warning: unused variable.
Kim Kulling [Sat, 31 Dec 2016 15:20:59 +0000 (16:20 +0100)]
Unittest: fix compiler warning: unused variable.

7 years agoUnittest: fix compiler warning: signed unsigned mismatch.
Kim Kulling [Sat, 31 Dec 2016 15:18:13 +0000 (16:18 +0100)]
Unittest: fix compiler warning: signed unsigned mismatch.

7 years agoSceneDiffer: fix compiler warning: unused function.
Kim Kulling [Sat, 31 Dec 2016 15:14:06 +0000 (16:14 +0100)]
SceneDiffer: fix compiler warning: unused function.

7 years agoFBX: fix compiler warning: remove unused local function.
Kim Kulling [Sat, 31 Dec 2016 15:09:17 +0000 (16:09 +0100)]
FBX: fix compiler warning: remove unused local function.

7 years agoSubDivision: fix compiler warning: unused variable.
Kim Kulling [Sat, 31 Dec 2016 15:07:11 +0000 (16:07 +0100)]
SubDivision: fix compiler warning: unused variable.

7 years agoUnittests: fix compiler warning signed unsigned mismatch.
Kim Kulling [Sat, 31 Dec 2016 15:00:03 +0000 (16:00 +0100)]
Unittests: fix compiler warning signed unsigned mismatch.

7 years agoMerge pull request #1119 from rdb/master
Kim Kulling [Wed, 28 Dec 2016 17:20:50 +0000 (18:20 +0100)]
Merge pull request #1119 from rdb/master

Replace use of nullptr in headers with NULL

7 years agoMerge pull request #1123 from iamsergio/master
Kim Kulling [Mon, 26 Dec 2016 13:39:09 +0000 (14:39 +0100)]
Merge pull request #1123 from iamsergio/master

Avoid unneeded copy-ctor calls when calling getAiType

7 years agoAvoid unneeded copy-ctor calls when calling getAiType
Sergio Martins [Mon, 26 Dec 2016 12:43:45 +0000 (12:43 +0000)]
Avoid unneeded copy-ctor calls when calling getAiType

Specially for aiString, which does a memcpy.
Found with clazy static analyzer.

7 years agoMerge pull request #1116 from severin-lemaignan/master
Kim Kulling [Tue, 20 Dec 2016 16:55:20 +0000 (17:55 +0100)]
Merge pull request #1116 from severin-lemaignan/master

[pyassimp] Add missing library + updated doc

7 years agoReplace use of nullptr in headers with NULL
rdb [Tue, 20 Dec 2016 16:27:36 +0000 (17:27 +0100)]
Replace use of nullptr in headers with NULL

7 years ago[pyassimp] Updated README
Séverin Lemaignan [Mon, 19 Dec 2016 21:19:55 +0000 (21:19 +0000)]
[pyassimp] Updated README

7 years ago[pyassimp] Added missing transformations.py library
Séverin Lemaignan [Mon, 19 Dec 2016 21:19:01 +0000 (21:19 +0000)]
[pyassimp] Added missing transformations.py library

7 years agoMerge pull request #1113 from severin-lemaignan/master
Kim Kulling [Mon, 19 Dec 2016 20:38:53 +0000 (21:38 +0100)]
Merge pull request #1113 from severin-lemaignan/master

[pyassimp] Minor changes (x64 lib path, version number, deps)

7 years agoMerge pull request #1114 from severin-lemaignan/new_3d_viewer
Kim Kulling [Mon, 19 Dec 2016 20:38:33 +0000 (21:38 +0100)]
Merge pull request #1114 from severin-lemaignan/new_3d_viewer

[pyassimp] New version of the pyASSIMP 3D viewer, with much improved …

7 years agoMerge pull request #1115 from assimp/issue1111
Kim Kulling [Mon, 19 Dec 2016 20:37:46 +0000 (21:37 +0100)]
Merge pull request #1115 from assimp/issue1111

closes https://github.com/assimp/assimp/issues/1111: add warning when

7 years agocloses https://github.com/assimp/assimp/issues/1111: add warning when
Kim Kulling [Mon, 19 Dec 2016 19:44:00 +0000 (20:44 +0100)]
closes https://github.com/assimp/assimp/issues/1111: add warning when
detecting invalid mat definition.

7 years ago[pyassimp] New version of the pyASSIMP 3D viewer, with much improved 3D controls
Séverin Lemaignan [Fri, 16 Dec 2016 11:02:19 +0000 (11:02 +0000)]
[pyassimp] New version of the pyASSIMP 3D viewer, with much improved 3D controls

7 years ago[pyassimp] Added missing requirement on numpy to setup.py
Séverin Lemaignan [Fri, 16 Dec 2016 10:33:29 +0000 (10:33 +0000)]
[pyassimp] Added missing requirement on numpy to setup.py

7 years ago[pyassimp] Set version number to match Assimp's
Séverin Lemaignan [Thu, 15 Dec 2016 16:54:34 +0000 (16:54 +0000)]
[pyassimp] Set version number to match Assimp's

7 years ago[pyassimp] Look as well for the assimp library using std 64bit path
Séverin Lemaignan [Thu, 15 Dec 2016 16:49:33 +0000 (16:49 +0000)]
[pyassimp] Look as well for the assimp library using std 64bit path

7 years agocloses assimp/assimp/issues/1101: copy aiTexture type declaration instead
Kim Kulling [Wed, 14 Dec 2016 20:42:01 +0000 (21:42 +0100)]
closes assimp/assimp/issues/1101: copy aiTexture type declaration instead
of using decltype for declaration to fix iOS build.

7 years agoMerge pull request #1109 from assimp/issue_899
Kim Kulling [Mon, 12 Dec 2016 22:42:24 +0000 (23:42 +0100)]
Merge pull request #1109 from assimp/issue_899

closes assimp/assimp/issues/899: fix parsing of texture name.

7 years agoBuild: fix typo in filename.
Kim Kulling [Mon, 12 Dec 2016 20:34:55 +0000 (21:34 +0100)]
Build: fix typo in filename.

7 years agoMerge pull request #1106 from elect86/master
Kim Kulling [Mon, 12 Dec 2016 20:22:56 +0000 (21:22 +0100)]
Merge pull request #1106 from elect86/master

OBJ, added the index to handle clamp option for each cubemap texture

7 years agocloses assimp/assimp/issues/899: fix parsing of texture name.
Kim Kulling [Mon, 12 Dec 2016 20:22:03 +0000 (21:22 +0100)]
closes assimp/assimp/issues/899: fix parsing of texture name.

7 years agoMerge pull request #1108 from elect86/patch-1
Kim Kulling [Mon, 12 Dec 2016 09:59:13 +0000 (10:59 +0100)]
Merge pull request #1108 from elect86/patch-1

Update PlyParser.h

7 years agoUpdate PlyParser.h
Giuseppe Barbieri [Sun, 11 Dec 2016 12:01:26 +0000 (13:01 +0100)]
Update PlyParser.h

Typo

7 years agoUpdate ObjFileImporter.cpp
Giuseppe Barbieri [Fri, 9 Dec 2016 18:31:07 +0000 (19:31 +0100)]
Update ObjFileImporter.cpp

7 years agoUpdate ObjFileImporter.h
Giuseppe Barbieri [Fri, 9 Dec 2016 18:27:01 +0000 (19:27 +0100)]
Update ObjFileImporter.h

7 years agocloses https://github.com/assimp/assimp/issues/1098: add license info.
Kim Kulling [Thu, 8 Dec 2016 19:07:56 +0000 (20:07 +0100)]
closes https://github.com/assimp/assimp/issues/1098: add license info.

7 years agoMerge pull request #1103 from assimp/dxf_testsuite
Kim Kulling [Thu, 8 Dec 2016 18:42:21 +0000 (19:42 +0100)]
Merge pull request #1103 from assimp/dxf_testsuite

Initial test suite for DFX-format.

7 years agoInitial test suite for DFX-format.
Kim Kulling [Thu, 8 Dec 2016 18:24:25 +0000 (19:24 +0100)]
Initial test suite for DFX-format.

7 years agoMerge pull request #1099 from asmaloney/warning_fixes
Kim Kulling [Thu, 8 Dec 2016 16:49:36 +0000 (17:49 +0100)]
Merge pull request #1099 from asmaloney/warning_fixes

Fixes two type warnings and a missing case option

7 years agoMerge pull request #1100 from asmaloney/spelling_fixes
Kim Kulling [Thu, 8 Dec 2016 14:10:23 +0000 (15:10 +0100)]
Merge pull request #1100 from asmaloney/spelling_fixes

Fixes spelling in comments

7 years agoFixes spelling in comments
Andy Maloney [Thu, 8 Dec 2016 02:31:51 +0000 (21:31 -0500)]
Fixes spelling in comments

7 years agoFixes two type warnings and a missing case option
Andy Maloney [Thu, 8 Dec 2016 01:30:45 +0000 (20:30 -0500)]
Fixes two type warnings and a missing case option

7 years agoMerge pull request #1087 from elect86/patch-4
Kim Kulling [Wed, 7 Dec 2016 19:16:57 +0000 (20:16 +0100)]
Merge pull request #1087 from elect86/patch-4

Update ObjFileMtlImporter.cpp

7 years agoUpdate ObjFileMtlImporter.cpp
Giuseppe Barbieri [Wed, 7 Dec 2016 18:52:03 +0000 (19:52 +0100)]
Update ObjFileMtlImporter.cpp

7 years agoMerge pull request #1094 from mrautio/fix-compilation
Kim Kulling [Mon, 5 Dec 2016 13:24:36 +0000 (14:24 +0100)]
Merge pull request #1094 from mrautio/fix-compilation

Fix MinGW compilation

7 years agoFix MinGW compilation support
Mika Rautio [Mon, 5 Dec 2016 11:01:16 +0000 (13:01 +0200)]
Fix MinGW compilation support

7 years agoAdd better MinGW support for IFCReaderGen big objects
Mika Rautio [Mon, 5 Dec 2016 10:57:05 +0000 (12:57 +0200)]
Add better MinGW support for IFCReaderGen big objects

7 years agoMinGW __stat64 support depends on MSVCRT version
Mika Rautio [Mon, 5 Dec 2016 10:33:48 +0000 (12:33 +0200)]
MinGW __stat64 support depends on MSVCRT version

7 years agoDo not build exporter if its importer is not built
Mika Rautio [Mon, 5 Dec 2016 09:12:46 +0000 (11:12 +0200)]
Do not build exporter if its importer is not built

7 years agoMerge pull request #1092 from assimp/issue_1089
Kim Kulling [Sat, 3 Dec 2016 09:13:05 +0000 (10:13 +0100)]
Merge pull request #1092 from assimp/issue_1089

Readme: let readme stats looking more cleaner.

7 years agoReadme: let readme stats looking more cleaner.
Kim Kulling [Sat, 3 Dec 2016 09:10:06 +0000 (10:10 +0100)]
Readme: let readme stats looking more cleaner.

7 years agoRemove compile warning.
Kim Kulling [Sat, 3 Dec 2016 08:23:07 +0000 (09:23 +0100)]
Remove compile warning.

7 years agoMerge pull request #1091 from assimp/issue_1089
Kim Kulling [Fri, 2 Dec 2016 15:59:19 +0000 (16:59 +0100)]
Merge pull request #1091 from assimp/issue_1089

FBX: woraround for issue 1089.

7 years agoUnittest: fix a uppcase typo for the example FBX-file.
Kim Kulling [Fri, 2 Dec 2016 15:47:54 +0000 (16:47 +0100)]
Unittest: fix a uppcase typo for the example FBX-file.

7 years agoMerge branch 'master' into issue_1089
Kim Kulling [Fri, 2 Dec 2016 13:31:18 +0000 (14:31 +0100)]
Merge branch 'master' into issue_1089

7 years agoFBX: woraround for issue 1089.
Kim Kulling [Fri, 2 Dec 2016 10:32:34 +0000 (11:32 +0100)]
FBX: woraround for issue 1089.

7 years agoMerge pull request #1085 from elect86/patch-3
Kim Kulling [Thu, 1 Dec 2016 16:56:20 +0000 (17:56 +0100)]
Merge pull request #1085 from elect86/patch-3

Update ObjFileParser.cpp

7 years agoMerge pull request #1090 from assimp/new_unittests
Kim Kulling [Thu, 1 Dec 2016 09:53:07 +0000 (10:53 +0100)]
Merge pull request #1090 from assimp/new_unittests

New tests for importers.

7 years agoNew tests for importers.
Kim Kulling [Thu, 1 Dec 2016 09:29:39 +0000 (10:29 +0100)]
New tests for importers.

7 years agoEnable SIBImport test.
Kim Kulling [Wed, 30 Nov 2016 16:49:22 +0000 (17:49 +0100)]
Enable SIBImport test.

7 years agoExporter: fix some review findings.
Kim Kulling [Wed, 30 Nov 2016 16:17:07 +0000 (17:17 +0100)]
Exporter: fix some review findings.

7 years agoGenerate TestModelFactory for uniform test models in unittests.
Kim Kulling [Wed, 30 Nov 2016 15:36:45 +0000 (16:36 +0100)]
Generate TestModelFactory for uniform test models in unittests.

7 years agoEnable unittest for apacity bug for dae files.
Kim Kulling [Wed, 30 Nov 2016 14:05:06 +0000 (15:05 +0100)]
Enable unittest for apacity bug for dae files.

7 years agoBaseIMporter: fix review findings.
Kim Kulling [Wed, 30 Nov 2016 14:03:32 +0000 (15:03 +0100)]
BaseIMporter: fix review findings.

7 years agoAMFImporter: fix some review findings.
Kim Kulling [Wed, 30 Nov 2016 14:03:02 +0000 (15:03 +0100)]
AMFImporter: fix some review findings.

7 years agoAMFImporter: use correct unique token to identify schema for AMF-assets.
Kim Kulling [Tue, 29 Nov 2016 18:50:40 +0000 (19:50 +0100)]
AMFImporter: use correct unique token to identify schema for AMF-assets.

7 years agoRemove dead code.
Kim Kulling [Tue, 29 Nov 2016 18:38:42 +0000 (19:38 +0100)]
Remove dead code.

7 years agoFix appveyor build: disable bugger mingw config.
Kim Kulling [Mon, 28 Nov 2016 09:40:10 +0000 (10:40 +0100)]
Fix appveyor build: disable bugger mingw config.

7 years agoUpdate ObjFileMtlImporter.cpp
Giuseppe Barbieri [Sun, 27 Nov 2016 21:44:03 +0000 (22:44 +0100)]
Update ObjFileMtlImporter.cpp

Fixed grammar

7 years agoUpdate ObjFileParser.cpp
Giuseppe Barbieri [Sun, 27 Nov 2016 19:32:59 +0000 (20:32 +0100)]
Update ObjFileParser.cpp

Fixed error message

7 years agoEnable win32-build: mingw.
Kim Kulling [Sun, 27 Nov 2016 16:35:22 +0000 (17:35 +0100)]
Enable win32-build: mingw.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sun, 27 Nov 2016 15:44:03 +0000 (16:44 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoObjImporter: use pre increment as a micro optimization.
Kim Kulling [Sun, 27 Nov 2016 15:43:25 +0000 (16:43 +0100)]
ObjImporter: use pre increment as a micro optimization.

7 years agoMerge pull request #1083 from jaredmulconry/implementation_warning_fix
Kim Kulling [Sun, 27 Nov 2016 15:40:45 +0000 (16:40 +0100)]
Merge pull request #1083 from jaredmulconry/implementation_warning_fix

Fixed warnings on MSVC14 x64 (Issue #1065)

7 years agoMerge pull request #1080 from johnmaf/bugfix/collada-transparency
Kim Kulling [Sun, 27 Nov 2016 15:30:59 +0000 (16:30 +0100)]
Merge pull request #1080 from johnmaf/bugfix/collada-transparency

Properly export COLLADA <transparency> value

7 years agoAdded a preprocessor definition for MSVC to silence safety warnings regarding
Jared Mulconry [Sun, 27 Nov 2016 06:34:34 +0000 (17:34 +1100)]
Added a preprocessor definition for MSVC to silence safety warnings regarding
C library functions. This addresses all warnings for MSVC x86 and x64 when
building zlib, tools and viewer as a static lib.

7 years agoFixed build warnings on MSVC14 x64 in the XGL loader.
Jared Mulconry [Sun, 27 Nov 2016 05:03:25 +0000 (16:03 +1100)]
Fixed build warnings on MSVC14 x64 in the XGL loader.

7 years agoFixed build warnings on MSVC14 x64 in X file importer.
Jared Mulconry [Sun, 27 Nov 2016 05:02:21 +0000 (16:02 +1100)]
Fixed build warnings on MSVC14 x64 in X file importer.

7 years agoFixed build warnings on MSVC14 x64 in the X3D format sources.
Jared Mulconry [Sun, 27 Nov 2016 04:54:22 +0000 (15:54 +1100)]
Fixed build warnings on MSVC14 x64 in the X3D format sources.

7 years agoFixed build warnings on MSVC14 x64 in the write dumb source.
Jared Mulconry [Sun, 27 Nov 2016 04:16:19 +0000 (15:16 +1100)]
Fixed build warnings on MSVC14 x64 in the write dumb source.

7 years agoFixed build warnings on MSVC14 x64 in Unreal importer.
Jared Mulconry [Sun, 27 Nov 2016 03:36:45 +0000 (14:36 +1100)]
Fixed build warnings on MSVC14 x64 in Unreal importer.

7 years agoFixed build warnings on MSVC14 x64 in Target Animation source.
Jared Mulconry [Sun, 27 Nov 2016 03:35:49 +0000 (14:35 +1100)]
Fixed build warnings on MSVC14 x64 in Target Animation source.

7 years agoFixed build warnings on MSVC14 x64 in sweep context sources.
Jared Mulconry [Sun, 27 Nov 2016 02:39:09 +0000 (13:39 +1100)]
Fixed build warnings on MSVC14 x64 in sweep context sources.

7 years agoFixed build warnings on MSVC14 x64 in subdivision routine.
Jared Mulconry [Sun, 27 Nov 2016 02:37:32 +0000 (13:37 +1100)]
Fixed build warnings on MSVC14 x64 in subdivision routine.

7 years agoFixed build warnings on MSVC14 x64 in the STL format sources.
Jared Mulconry [Sun, 27 Nov 2016 02:32:44 +0000 (13:32 +1100)]
Fixed build warnings on MSVC14 x64 in the STL format sources.

7 years agoFixed build warnings on MSVC14 x64 in spacial sort.
Jared Mulconry [Sun, 27 Nov 2016 02:28:40 +0000 (13:28 +1100)]
Fixed build warnings on MSVC14 x64 in spacial sort.