platform/upstream/assimp.git
8 years agoMerge pull request #10 from assimp/master
Madrich [Tue, 23 Feb 2016 09:07:23 +0000 (10:07 +0100)]
Merge pull request #10 from assimp/master

Update fork

8 years agoMerge pull request #803 from akazantsev/master
Alexander Gessler [Mon, 22 Feb 2016 22:21:57 +0000 (23:21 +0100)]
Merge pull request #803 from akazantsev/master

Resolves #802

8 years agoResolves #802
Andrey Kazantsev [Mon, 22 Feb 2016 20:24:03 +0000 (22:24 +0200)]
Resolves #802

8 years agoappveyor: add libs to build artifacts.
Kim Kulling [Sat, 20 Feb 2016 10:14:22 +0000 (11:14 +0100)]
appveyor: add libs to build artifacts.

8 years agoappveyor: change path to build artifact.
Kim Kulling [Fri, 19 Feb 2016 19:42:56 +0000 (20:42 +0100)]
appveyor: change path to build artifact.

8 years agoappveyor: fix typo.
Kim Kulling [Fri, 19 Feb 2016 17:40:21 +0000 (18:40 +0100)]
appveyor: fix typo.

8 years agoappveyor: define build artifacts.
Kim Kulling [Fri, 19 Feb 2016 17:32:16 +0000 (18:32 +0100)]
appveyor: define build artifacts.

8 years agoappveyor: remove VS 2012 from CI.
Kim Kulling [Fri, 19 Feb 2016 15:30:20 +0000 (16:30 +0100)]
appveyor: remove VS 2012 from CI.

8 years agoappveyor: remove buggy quotes.
Kim Kulling [Fri, 19 Feb 2016 10:44:02 +0000 (11:44 +0100)]
appveyor: remove buggy quotes.

8 years agoanveyor: enable verbose output.
Kim Kulling [Fri, 19 Feb 2016 10:07:17 +0000 (11:07 +0100)]
anveyor: enable verbose output.

8 years agoAppveyor: use correct names for project generators.
Kim Kulling [Fri, 19 Feb 2016 09:45:00 +0000 (10:45 +0100)]
Appveyor: use correct names for project generators.

8 years agoAppveyor: fix path in setup.
Kim Kulling [Fri, 19 Feb 2016 09:31:26 +0000 (10:31 +0100)]
Appveyor: fix path in setup.

8 years agoappveyor: Fix invalid path.
Kim Kulling [Thu, 18 Feb 2016 17:29:25 +0000 (18:29 +0100)]
appveyor: Fix invalid path.

8 years agoMerge pull request #764 from rmitton/sib_import
Alexander Gessler [Thu, 18 Feb 2016 10:58:26 +0000 (11:58 +0100)]
Merge pull request #764 from rmitton/sib_import

Validation fix for empty SIB scenes.

8 years agoMerge pull request #790 from ov/safe-normalizing-in-smoothing-groups
Alexander Gessler [Thu, 18 Feb 2016 10:53:57 +0000 (11:53 +0100)]
Merge pull request #790 from ov/safe-normalizing-in-smoothing-groups

use NormalizeSafe to prevent NaN when normalizing zero vectors

8 years agoCI: Remove erroreous platform spec from appveyor file.
Kim Kulling [Wed, 17 Feb 2016 14:17:55 +0000 (15:17 +0100)]
CI: Remove erroreous platform spec from appveyor file.

8 years agoAppveyor: add compiler setup script.
Kim Kulling [Wed, 17 Feb 2016 12:44:33 +0000 (13:44 +0100)]
Appveyor: add compiler setup script.

8 years agoAppveyor: add support for VS2010.
Kim Kulling [Mon, 15 Feb 2016 09:20:34 +0000 (10:20 +0100)]
Appveyor: add support for VS2010.

8 years agoMerge pull request #796 from afiskon/master
Kim Kulling [Mon, 15 Feb 2016 09:07:41 +0000 (10:07 +0100)]
Merge pull request #796 from afiskon/master

Update pstdint.h to version 0.1.12 ( solve #795 )

8 years agoUpdate pstdint.h to version 0.1.12 ( solve #795 )
afiskon [Sun, 14 Feb 2016 19:39:37 +0000 (22:39 +0300)]
Update pstdint.h to version 0.1.12 ( solve #795 )

8 years agoMerge pull request #794 from turol/master
Alexander Gessler [Sat, 13 Feb 2016 21:51:54 +0000 (22:51 +0100)]
Merge pull request #794 from turol/master

LWO: Fix division by zero

8 years agoLWO: Fix division by zero
Turo Lamminen [Sat, 13 Feb 2016 21:37:08 +0000 (23:37 +0200)]
LWO: Fix division by zero

8 years agoMerge pull request #791 from trond/collada_animation_clip
Kim Kulling [Thu, 11 Feb 2016 21:11:27 +0000 (22:11 +0100)]
Merge pull request #791 from trond/collada_animation_clip

Collada animation clip support

8 years agoMerge pull request #793 from AlexBobkov/master
Kim Kulling [Thu, 11 Feb 2016 21:10:21 +0000 (22:10 +0100)]
Merge pull request #793 from AlexBobkov/master

Fixed installing pdb file

8 years agoMerge pull request #792 from rdb/patch-1
Kim Kulling [Thu, 11 Feb 2016 16:08:56 +0000 (17:08 +0100)]
Merge pull request #792 from rdb/patch-1

Fix loading of pk3 q3bsp maps

8 years agoFixed installing pdb file
Alexander Bobkov [Thu, 11 Feb 2016 13:24:26 +0000 (16:24 +0300)]
Fixed installing pdb file

8 years agoFix loading of pk3 q3bsp maps
rdb [Thu, 11 Feb 2016 13:10:49 +0000 (14:10 +0100)]
Fix loading of pk3 q3bsp maps

This fixes loading of pk3 maps.  The pk3 files contain directory entries with a size of 0, which triggered an assertion.

8 years agoFixed a couple of nested template brackets that wasn't spaced out correctly.
Trond Abusdal [Thu, 11 Feb 2016 00:00:03 +0000 (01:00 +0100)]
Fixed a couple of nested template brackets that wasn't spaced out correctly.

8 years agoAdded regression test file for <library_animation_clips> support. Generated from...
Trond Abusdal [Wed, 10 Feb 2016 23:14:23 +0000 (00:14 +0100)]
Added regression test file for <library_animation_clips> support. Generated from Blender using 'Better Collada Exporter' from Godot team.

8 years agouse NormalizeSafe to prevent NaN when normalizing zero vectors
Vitaly Ovchinnikov [Wed, 10 Feb 2016 23:19:06 +0000 (12:19 +1300)]
use NormalizeSafe to prevent NaN when normalizing zero vectors

8 years ago* Combining single-channel animations like the previous code did, except now it has...
Trond Abusdal [Wed, 10 Feb 2016 22:57:29 +0000 (23:57 +0100)]
* Combining single-channel animations like the previous code did, except now it has been deferred until after all nodes have been read. This makes the regression tests pass for a database created before these code changes.
* Changed name of ColladaParser::RebuildRootAnimationsFromClips to ColladaParser::PostProcessRootAnimations as it now does more than it did before.

8 years agoiObjParser: refactorings.
Kim Kulling [Wed, 10 Feb 2016 09:40:39 +0000 (10:40 +0100)]
iObjParser: refactorings.

8 years agoObj_Importer: remove dead code.
Kim Kulling [Tue, 9 Feb 2016 16:50:08 +0000 (17:50 +0100)]
Obj_Importer: remove dead code.

8 years agoCloses https://github.com/assimp/assimp/issues/777: fix invalid skipping
Kim Kulling [Mon, 8 Feb 2016 17:07:00 +0000 (18:07 +0100)]
Closes https://github.com/assimp/assimp/issues/777: fix invalid skipping
of line during face defintion parsing.

8 years agoCollada: Importer generates animations from <library_animation_clips>, if the node...
Trond Abusdal [Sun, 7 Feb 2016 22:36:49 +0000 (23:36 +0100)]
Collada: Importer generates animations from <library_animation_clips>, if the node is present.

8 years agoBump just to get AppVeyor to re-test it.
rmitton [Sun, 7 Feb 2016 21:21:58 +0000 (13:21 -0800)]
Bump just to get AppVeyor to re-test it.

8 years agoMerge pull request #789 from assimp/revert-771-obj_load_forever_fix
Kim Kulling [Sun, 7 Feb 2016 19:03:38 +0000 (20:03 +0100)]
Merge pull request #789 from assimp/revert-771-obj_load_forever_fix

Revert "Fix issue: OBJ import takes forever (#759) (attempt 2)"

8 years agoRevert "Fix issue: OBJ import takes forever (#759) (attempt 2)"
Kim Kulling [Sun, 7 Feb 2016 19:03:24 +0000 (20:03 +0100)]
Revert "Fix issue: OBJ import takes forever (#759) (attempt 2)"

8 years agoMerge pull request #771 from andrewparlane/obj_load_forever_fix
Kim Kulling [Sun, 7 Feb 2016 19:00:03 +0000 (20:00 +0100)]
Merge pull request #771 from andrewparlane/obj_load_forever_fix

Fix issue: OBJ import takes forever (#759) (attempt 2)

8 years agoOpenDDLParser: add missing files.
Kim Kulling [Sun, 7 Feb 2016 16:59:56 +0000 (17:59 +0100)]
OpenDDLParser: add missing files.

8 years agoCloses https://github.com/assimp/assimp/issues/786:
Kim Kulling [Sun, 7 Feb 2016 16:58:28 +0000 (17:58 +0100)]
Closes https://github.com/assimp/assimp/issues/786:
- fix invalid value get for index data.
- update OpenDDL-library

8 years agoCloses https://github.com/assimp/assimp/issues/787: Update CHANGES.
Kim Kulling [Sat, 6 Feb 2016 19:54:47 +0000 (20:54 +0100)]
Closes https://github.com/assimp/assimp/issues/787: Update CHANGES.

8 years agoJoinVerticesProcess: iAdd test for possible null pointer access.
Kim Kulling [Fri, 5 Feb 2016 17:53:23 +0000 (18:53 +0100)]
JoinVerticesProcess: iAdd test for possible null pointer access.

8 years agoUnittests: add test if export is disabled.
Kim Kulling [Fri, 5 Feb 2016 17:31:19 +0000 (18:31 +0100)]
Unittests: add test if export is disabled.

8 years agoMerge pull request #783 from snikulov/gtest_upd
Kim Kulling [Fri, 5 Feb 2016 17:04:01 +0000 (18:04 +0100)]
Merge pull request #783 from snikulov/gtest_upd

updated gtest repository to github

8 years agoupdated gtest to github
Sergei Nikulov [Fri, 5 Feb 2016 10:11:40 +0000 (13:11 +0300)]
updated gtest to github

8 years agoAdd unittests for defect reproduction.
Kim Kulling [Thu, 4 Feb 2016 19:43:02 +0000 (20:43 +0100)]
Add unittests for defect reproduction.

8 years agoCloses https://github.com/assimp/assimp/issues/754: use correct index
Kim Kulling [Wed, 3 Feb 2016 20:09:20 +0000 (21:09 +0100)]
Closes https://github.com/assimp/assimp/issues/754: use correct index
token.

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 3 Feb 2016 19:20:16 +0000 (20:20 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoFix license date.
Kim Kulling [Wed, 3 Feb 2016 19:19:59 +0000 (20:19 +0100)]
Fix license date.

8 years agoMerge pull request #779 from turol/master
Kim Kulling [Tue, 2 Feb 2016 19:40:52 +0000 (20:40 +0100)]
Merge pull request #779 from turol/master

SIBImporter: Properly fix C++11 issues for Clang

8 years agoSIBImporter: Properly fix C++11 issues for Clang
Turo Lamminen [Tue, 2 Feb 2016 18:23:46 +0000 (20:23 +0200)]
SIBImporter: Properly fix C++11 issues for Clang

C-style cast has a higher precedence than & -operator so this was getting
parsed differently than Kim assumed. Thou shalt not use C-style casts.

8 years agoDoc: add missing ports to start README page.
Kim Kulling [Tue, 2 Feb 2016 16:48:23 +0000 (17:48 +0100)]
Doc: add missing ports to start README page.

8 years agoAndroid build doc: reformatting.
Kim Kulling [Tue, 2 Feb 2016 10:00:28 +0000 (11:00 +0100)]
Android build doc: reformatting.

8 years agoRename android renameRename android rename.
Kim Kulling [Tue, 2 Feb 2016 09:59:07 +0000 (10:59 +0100)]
Rename android renameRename android rename.

8 years agoDOC: add link to ports in global readme.
Kim Kulling [Tue, 2 Feb 2016 09:58:15 +0000 (10:58 +0100)]
DOC: add link to ports in global readme.

8 years agoDoc: use markup format for android build instructions.
Kim Kulling [Tue, 2 Feb 2016 09:52:28 +0000 (10:52 +0100)]
Doc: use markup format for android build instructions.

8 years agoDatatypes: add missing unions for vector + color types.
Kim Kulling [Mon, 1 Feb 2016 23:59:47 +0000 (00:59 +0100)]
Datatypes: add missing unions for vector + color types.

8 years agoCloses https://github.com/assimp/assimp/issues/43 : provide different
Kim Kulling [Mon, 1 Feb 2016 15:16:48 +0000 (16:16 +0100)]
Closes https://github.com/assimp/assimp/issues/43 : provide different
matrix scheme via union.

8 years agoai_assert: split 2 checks in one macro to 2 separate ai_assert tests.
Kim Kulling [Mon, 1 Feb 2016 15:16:09 +0000 (16:16 +0100)]
ai_assert: split 2 checks in one macro to 2 separate ai_assert tests.

8 years agoCloses https://github.com/assimp/assimp/issues/778: export android system.
Kim Kulling [Sun, 31 Jan 2016 12:44:15 +0000 (13:44 +0100)]
Closes https://github.com/assimp/assimp/issues/778: export android system.

8 years agoAndroidJNIIOSystem: update license info to 2016.
Kim Kulling [Sun, 31 Jan 2016 12:43:05 +0000 (13:43 +0100)]
AndroidJNIIOSystem: update license info to 2016.

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 30 Jan 2016 23:42:02 +0000 (00:42 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoSIBImporter: fix c++14 compilation issue for clang.
Kim Kulling [Sat, 30 Jan 2016 23:41:14 +0000 (00:41 +0100)]
SIBImporter: fix c++14 compilation issue for clang.

8 years ago3DSConverter: fix level 4 compiler warning.
Kim Kulling [Fri, 29 Jan 2016 20:22:41 +0000 (21:22 +0100)]
3DSConverter: fix level 4 compiler warning.

8 years agogltf: make code more radable and check against one possible null ptr
Kim Kulling [Wed, 27 Jan 2016 19:26:38 +0000 (20:26 +0100)]
gltf: make code more radable and check against one possible null ptr
access.

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 27 Jan 2016 17:49:26 +0000 (18:49 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoPostProcessing: first prototype of customized post processing.
Kim Kulling [Wed, 27 Jan 2016 17:49:01 +0000 (18:49 +0100)]
PostProcessing: first prototype of customized post processing.

8 years agoMerge pull request #773 from boxdot/master
Kim Kulling [Wed, 27 Jan 2016 16:20:26 +0000 (17:20 +0100)]
Merge pull request #773 from boxdot/master

Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.

8 years agoMerge pull request #772 from abma/master
Kim Kulling [Wed, 27 Jan 2016 16:19:52 +0000 (17:19 +0100)]
Merge pull request #772 from abma/master

fix new / delete missmatch

8 years agoImport mClipPlane{Near,Far} and mHorizontalFOV from Blender.
boxdot [Wed, 27 Jan 2016 01:12:15 +0000 (02:12 +0100)]
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.

8 years agofix new / delete missmatch
abma [Tue, 26 Jan 2016 21:47:50 +0000 (22:47 +0100)]
fix new / delete missmatch

8 years agoObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing...
Andrew Parlane [Sat, 23 Jan 2016 23:40:47 +0000 (19:40 -0400)]
ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.

Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.

This time I've fixed the order of evaluation bug in the call to getFace().

8 years agoObjTools: Update getName() to work with const iterators.
Andrew Parlane [Sat, 23 Jan 2016 23:34:20 +0000 (19:34 -0400)]
ObjTools: Update getName() to work with const iterators.

Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.

8 years agoMerge pull request #770 from assimp/revert-765-master
Kim Kulling [Mon, 25 Jan 2016 23:14:27 +0000 (00:14 +0100)]
Merge pull request #770 from assimp/revert-765-master

Revert "Fix issue: OBJ import takes forever (#759)"

8 years agoRevert "Fix issue: OBJ import takes forever (#759)"
Kim Kulling [Mon, 25 Jan 2016 22:53:59 +0000 (23:53 +0100)]
Revert "Fix issue: OBJ import takes forever (#759)"

8 years agoFixed whitespace to match coding standard.
rmitton [Mon, 25 Jan 2016 21:45:08 +0000 (13:45 -0800)]
Fixed whitespace to match coding standard.

8 years agoFixed NULL pointers to match coding standards.
rmitton [Mon, 25 Jan 2016 21:42:30 +0000 (13:42 -0800)]
Fixed NULL pointers to match coding standards.

8 years agoMerge pull request #765 from andrewparlane/master
Kim Kulling [Sun, 24 Jan 2016 18:36:18 +0000 (19:36 +0100)]
Merge pull request #765 from andrewparlane/master

Fix issue: OBJ import takes forever (#759)

8 years agoObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing...
Andrew Parlane [Sat, 23 Jan 2016 23:40:47 +0000 (19:40 -0400)]
ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.

Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.

8 years agoObjTools: Update getName() to work with const iterators.
Andrew Parlane [Sat, 23 Jan 2016 23:34:20 +0000 (19:34 -0400)]
ObjTools: Update getName() to work with const iterators.

Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.

8 years agoValidation fix for empty scenes.
rmitton [Sat, 23 Jan 2016 23:22:48 +0000 (15:22 -0800)]
Validation fix for empty scenes.

The validator requires empty scenes to have NULL pointers.

8 years agoMerge pull request #763 from andrewparlane/mtlFix
Kim Kulling [Sat, 23 Jan 2016 18:51:49 +0000 (19:51 +0100)]
Merge pull request #763 from andrewparlane/mtlFix

ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.

8 years agoObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
Andrew Parlane [Sat, 23 Jan 2016 17:05:03 +0000 (13:05 -0400)]
ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.

We don't handle reflection textures during MTL import. This allowed a NULL
ptr to be used. Simply return in the case of a reflection texture.

8 years agoMerge pull request #756 from StepanHrbek/master
Kim Kulling [Fri, 22 Jan 2016 21:32:40 +0000 (22:32 +0100)]
Merge pull request #756 from StepanHrbek/master

Collada exporter: improve compatibility when exported path contains ':'.

8 years agoCollada exporter: improve compatibility when exported path contains ':'.
Stepan Hrbek [Thu, 21 Jan 2016 21:35:44 +0000 (22:35 +0100)]
Collada exporter: improve compatibility when exported path contains ':'.

Old code exported "c:/foo.jpg" path as "c%3a/foo.jpg".
Replacing : with %3a was probably legal, but it made paths unreadable for existing Max importers.

8 years agoUpdate license date.
Kim Kulling [Thu, 21 Jan 2016 18:53:25 +0000 (19:53 +0100)]
Update license date.

8 years agocloses assimp/assimp/issues/710: use correct include for importerdesc in
Kim Kulling [Wed, 20 Jan 2016 20:25:47 +0000 (21:25 +0100)]
closes assimp/assimp/issues/710: use correct include for importerdesc in
cimport.h

8 years agoMerge pull request #736 from StepanHrbek/collada-unicode
Kim Kulling [Tue, 19 Jan 2016 15:35:48 +0000 (16:35 +0100)]
Merge pull request #736 from StepanHrbek/collada-unicode

Collada exporter: fix unicode.

8 years agoMerge pull request #753 from wise86-android/ValgrinFree
Kim Kulling [Tue, 19 Jan 2016 15:34:58 +0000 (16:34 +0100)]
Merge pull request #753 from wise86-android/ValgrinFree

Valgrin free

8 years agoReimplement isalnum(c,C locale) because I can't make AppVeyor see satndard version.
Stepan Hrbek [Thu, 31 Dec 2015 13:41:53 +0000 (14:41 +0100)]
Reimplement isalnum(c,C locale) because I can't make AppVeyor see satndard version.

8 years agofix memory leak
wise86Android [Sun, 17 Jan 2016 14:18:12 +0000 (15:18 +0100)]
fix memory leak

8 years agofix memory leak
wise86Android [Sat, 16 Jan 2016 21:51:18 +0000 (22:51 +0100)]
fix memory leak

8 years agoremove read unitilize memory
wise86Android [Sat, 16 Jan 2016 15:14:16 +0000 (16:14 +0100)]
remove read unitilize memory

8 years agofree the allocated import
wise86Android [Sat, 16 Jan 2016 14:02:45 +0000 (15:02 +0100)]
free the allocated import

8 years agoremove initialization warnings
wise86Android [Sat, 16 Jan 2016 14:01:53 +0000 (15:01 +0100)]
remove initialization warnings

8 years agoremove initialization warnings
wise86Android [Sat, 16 Jan 2016 13:22:41 +0000 (14:22 +0100)]
remove initialization warnings

8 years agoPLYExporter: forbit copying + add empty destructor.
Kim Kulling [Thu, 14 Jan 2016 19:44:09 +0000 (20:44 +0100)]
PLYExporter: forbit copying + add empty destructor.

8 years agoCloses https://github.com/assimp/assimp/issues/84: add another search path
Kim Kulling [Wed, 13 Jan 2016 17:55:47 +0000 (18:55 +0100)]
Closes https://github.com/assimp/assimp/issues/84: add another search path
for XCode framework paths for IPhones.

8 years agoColladaloader: fix usage of floorf.
Kim Kulling [Wed, 13 Jan 2016 09:04:24 +0000 (10:04 +0100)]
Colladaloader: fix usage of floorf.