platform/upstream/assimp.git
8 years agoMerge branch 'master' into gltf_o3dgc
Alexandr Arutjunov [Sun, 14 Aug 2016 13:49:53 +0000 (16:49 +0300)]
Merge branch 'master' into gltf_o3dgc

8 years ago[F] Conditional compilation for Open3DGC-extension.
Alexandr Arutjunov [Sun, 14 Aug 2016 13:27:16 +0000 (16:27 +0300)]
[F] Conditional compilation for Open3DGC-extension.
[F] Flag comp_allow did not reset when mesh can not be encoded.

8 years agoMerge pull request #978 from assimp/issue_975
Kim Kulling [Sun, 14 Aug 2016 13:20:59 +0000 (15:20 +0200)]
Merge pull request #978 from assimp/issue_975

closes https://github.com/assimp/assimp/issues/97: define for 32-bit …

8 years agoMerge pull request #976 from assimp/issues_967
Kim Kulling [Sun, 14 Aug 2016 10:24:49 +0000 (12:24 +0200)]
Merge pull request #976 from assimp/issues_967

closes https://github.com/assimp/assimp/issues/967: add unzip include path

8 years agoMerge pull request #977 from assimp/update_rapidjson_version_1_0_2
Kim Kulling [Sun, 14 Aug 2016 10:24:39 +0000 (12:24 +0200)]
Merge pull request #977 from assimp/update_rapidjson_version_1_0_2

Update rapidjson to v1.0.2

8 years agocloses https://github.com/assimp/assimp/issues/97: define for 32-bit linux
Kim Kulling [Sun, 14 Aug 2016 10:23:16 +0000 (12:23 +0200)]
closes https://github.com/assimp/assimp/issues/97: define for 32-bit linux

8 years agoUpdate rapidjson to v1.0.2
Kim Kulling [Sun, 14 Aug 2016 09:58:12 +0000 (11:58 +0200)]
Update rapidjson to v1.0.2

8 years agocloses https://github.com/assimp/assimp/issues/967: add unzip include path
Kim Kulling [Sun, 14 Aug 2016 09:44:21 +0000 (11:44 +0200)]
closes https://github.com/assimp/assimp/issues/967: add unzip include path
when no other version was found.

8 years ago[+] Added link to RT library when using Open3DGC-compression.
Alexandr Arutjunov [Sat, 13 Aug 2016 14:44:58 +0000 (17:44 +0300)]
[+] Added link to RT library when using Open3DGC-compression.

8 years ago[-] Removed unneeded include.
Alexandr Arutjunov [Sat, 13 Aug 2016 13:27:34 +0000 (16:27 +0300)]
[-] Removed unneeded include.

8 years ago[*] Few C++11 constructions are removed.
Alexandr Arutjunov [Sat, 13 Aug 2016 13:27:07 +0000 (16:27 +0300)]
[*] Few C++11 constructions are removed.

8 years ago[*] Few C++11 constructions are removed.
Alexandr Arutjunov [Sat, 13 Aug 2016 13:09:21 +0000 (16:09 +0300)]
[*] Few C++11 constructions are removed.

8 years agoCMakeLists: cleanup, move all options to one place for mantenace.
Kim Kulling [Sat, 13 Aug 2016 07:13:22 +0000 (09:13 +0200)]
CMakeLists: cleanup, move all options to one place for mantenace.

8 years agoUpdate Readme.md
Kim Kulling [Fri, 12 Aug 2016 17:44:07 +0000 (19:44 +0200)]
Update Readme.md

fix link to chat channel. IRC is obsolete now.

8 years agoMerge pull request #974 from assimp/issue_901
Kim Kulling [Fri, 12 Aug 2016 17:38:09 +0000 (19:38 +0200)]
Merge pull request #974 from assimp/issue_901

closes https://github.com/assimp/assimp/issues/901

8 years agoAdd type to deal with 64-bit filesizes on x86_64-apple-darwin15.5.0x86_64-apple-darwi...
Kim Kulling [Fri, 12 Aug 2016 16:47:37 +0000 (18:47 +0200)]
Add type to deal with 64-bit filesizes on x86_64-apple-darwin15.5.0x86_64-apple-darwin15.5.0

8 years agoDefaultIOStream: add missing detection for apple-based OS.
Kim Kulling [Fri, 12 Aug 2016 16:14:26 +0000 (18:14 +0200)]
DefaultIOStream: add missing detection for apple-based OS.

8 years agocloses https://github.com/assimp/assimp/issues/901
Kim Kulling [Fri, 12 Aug 2016 15:13:18 +0000 (17:13 +0200)]
closes https://github.com/assimp/assimp/issues/901

8 years ago[+] glTF import/export. Support for Open3DGC-compression of mesh primitives.
Alexandr Arutjunov [Wed, 10 Aug 2016 22:04:30 +0000 (01:04 +0300)]
[+] glTF import/export. Support for Open3DGC-compression of mesh primitives.

8 years ago[F] Typo.
Alexandr Arutjunov [Wed, 10 Aug 2016 22:02:32 +0000 (01:02 +0300)]
[F] Typo.

8 years agoCloses https://github.com/assimp/assimp/issues/966: add missing doc for
Kim Kulling [Tue, 9 Aug 2016 11:42:33 +0000 (13:42 +0200)]
Closes https://github.com/assimp/assimp/issues/966: add missing doc for
assimp_cmd.

8 years ago[+] Use "buffer" ID against "bufferView" ID for Open3DGC-compression.
Alexandr Arutjunov [Tue, 9 Aug 2016 10:37:32 +0000 (13:37 +0300)]
[+] Use "buffer" ID against "bufferView" ID for Open3DGC-compression.

8 years ago[+] Save parameters of mesh extension: Open3DGC-compression.
Alexandr Arutjunov [Tue, 9 Aug 2016 10:26:57 +0000 (13:26 +0300)]
[+] Save parameters of mesh extension: Open3DGC-compression.

8 years agoMerge pull request #970 from nyorain/patch-1
Alexander Gessler [Mon, 8 Aug 2016 23:43:19 +0000 (01:43 +0200)]
Merge pull request #970 from nyorain/patch-1

Added documentation for embedded textures

8 years agoAdded documentation for embedded textures
nyorain [Mon, 8 Aug 2016 22:50:48 +0000 (00:50 +0200)]
Added documentation for embedded textures

8 years agoMerge pull request #965 from waldyrious/patch-1
Kim Kulling [Mon, 8 Aug 2016 17:48:49 +0000 (19:48 +0200)]
Merge pull request #965 from waldyrious/patch-1

fix long option name for --om

8 years ago[+] Support Open3DGC for glTF import/export. Intermediate commit.
Alexandr Arutjunov [Mon, 8 Aug 2016 16:24:50 +0000 (19:24 +0300)]
[+] Support Open3DGC for glTF import/export. Intermediate commit.

8 years ago[*] Style. Intermediate commit.
Alexandr Arutjunov [Mon, 8 Aug 2016 16:07:30 +0000 (19:07 +0300)]
[*] Style. Intermediate commit.

8 years ago[*] Style. Intermediate commit.
Alexandr Arutjunov [Mon, 8 Aug 2016 16:06:17 +0000 (19:06 +0300)]
[*] Style. Intermediate commit.

8 years ago[F] Comparison between signed and unsigned integer.
Alexandr Arutjunov [Mon, 8 Aug 2016 16:04:37 +0000 (19:04 +0300)]
[F] Comparison between signed and unsigned integer.

8 years agofix long option name for --om
Waldir Pimenta [Mon, 8 Aug 2016 10:46:41 +0000 (11:46 +0100)]
fix long option name for --om

to match the actual code in tools/assimp_cmd/Main.cpp

8 years agoMerge pull request #964 from waldyrious/patch-1
Kim Kulling [Fri, 5 Aug 2016 20:19:42 +0000 (22:19 +0200)]
Merge pull request #964 from waldyrious/patch-1

dox_cmd.h: fix typo 'dumb' --> 'dump'

8 years agodox_cmd.h: fix typo 'dumb' --> 'dump'
Waldir Pimenta [Fri, 5 Aug 2016 18:54:58 +0000 (19:54 +0100)]
dox_cmd.h: fix typo 'dumb' --> 'dump'

8 years ago[F] Fixed problem with more then one mesh in scene. More detaily read at line 529...
Alexandr Arutjunov [Wed, 3 Aug 2016 15:06:38 +0000 (18:06 +0300)]
[F] Fixed problem with more then one mesh in scene. More detaily read at line 529 in glTFAsset.inl.

8 years agoCMake: remove dead code.
Kim Kulling [Wed, 3 Aug 2016 08:20:03 +0000 (10:20 +0200)]
CMake: remove dead code.

8 years ago[+] Put information to log about decompressing.
Alexandr Arutjunov [Wed, 3 Aug 2016 08:16:30 +0000 (11:16 +0300)]
[+] Put information to log about decompressing.

8 years ago[+] glTF. Support for import meshes with Open3DGC compression.
Alexandr Arutjunov [Wed, 3 Aug 2016 00:46:04 +0000 (03:46 +0300)]
[+] glTF. Support for import meshes with Open3DGC compression.

8 years ago[+] Building of Open3DGC codec.
Alexandr Arutjunov [Wed, 3 Aug 2016 00:40:53 +0000 (03:40 +0300)]
[+] Building of Open3DGC codec.

8 years ago[+] Added Open3DGC codec from KhronosGroup repository.
Alexandr Arutjunov [Wed, 3 Aug 2016 00:34:54 +0000 (03:34 +0300)]
[+] Added Open3DGC codec from KhronosGroup repository.

8 years agoMerge pull request #960 from smalcom/assimp_qt_viewer
Kim Kulling [Mon, 1 Aug 2016 18:15:00 +0000 (20:15 +0200)]
Merge pull request #960 from smalcom/assimp_qt_viewer

[+] 3D viewer which uses Assimp and Qt4.

8 years ago[F] Texture coordinate Y must be flipped for OpenGL.
Alexandr Arutjunov [Mon, 1 Aug 2016 10:13:35 +0000 (13:13 +0300)]
[F] Texture coordinate Y must be flipped for OpenGL.

8 years ago[F] Added checks for building assimp_qt_viewer.
Alexandr Arutjunov [Sun, 31 Jul 2016 19:51:15 +0000 (22:51 +0300)]
[F] Added checks for building assimp_qt_viewer.

8 years ago[F] Added include dirs and libraries for OpenGL and DevIL.
Alexandr Arutjunov [Sun, 31 Jul 2016 12:50:48 +0000 (15:50 +0300)]
[F] Added include dirs and libraries for OpenGL and DevIL.

8 years ago[F] DevIL is needed for compilation.
Alexandr Arutjunov [Sun, 31 Jul 2016 12:14:49 +0000 (15:14 +0300)]
[F] DevIL is needed for compilation.

8 years ago[+] 3D viewer which uses Assimp and Qt4.
Alexandr Arutjunov [Sun, 31 Jul 2016 11:56:30 +0000 (14:56 +0300)]
[+] 3D viewer which uses Assimp and Qt4.

8 years agoMerge pull request #953 from TrianglesPCT/master
Alexander Gessler [Wed, 27 Jul 2016 19:37:02 +0000 (21:37 +0200)]
Merge pull request #953 from TrianglesPCT/master

Fix blender vertex colors being negative, and fix blender vertex colors scaling to be 0 to 1

8 years agoAdd files via upload
TrianglesPCT [Tue, 26 Jul 2016 05:04:08 +0000 (23:04 -0600)]
Add files via upload

forcing a new build

8 years agoMerge pull request #956 from adishavit/master
Kim Kulling [Mon, 25 Jul 2016 22:16:16 +0000 (00:16 +0200)]
Merge pull request #956 from adishavit/master

Fixes a few build issues with MSVC 2015 and gcc

8 years agoFixes compilation on OSX with gcc.
Adi Shavit @ MacBookPro [Mon, 25 Jul 2016 13:33:25 +0000 (16:33 +0300)]
Fixes compilation on OSX with gcc.
- The symbol `typeof` collides with a non-standard gcc "keyword". See https://gcc.gnu.org/onlinedocs/gcc/Typeof.html
- Renamed to `type_of`.

8 years agoAdd files via upload
TrianglesPCT [Mon, 25 Jul 2016 00:45:41 +0000 (18:45 -0600)]
Add files via upload

used ai_real instead of float

8 years agoRemoves MSVC warning with explicit cast.
Adi Shavit @ MacBookPro [Sun, 24 Jul 2016 12:54:16 +0000 (15:54 +0300)]
Removes MSVC warning with explicit cast.

8 years agoFix warning
TrianglesPCT [Sun, 24 Jul 2016 08:33:33 +0000 (02:33 -0600)]
Fix warning

The call to sprintf was causing a warning in vs2015 because of wrong type.

8 years agoAdd files via upload
TrianglesPCT [Sun, 24 Jul 2016 08:26:23 +0000 (02:26 -0600)]
Add files via upload

scale blender vert color out to 0-1 range as aiColor specifies

8 years agoAdd files via upload
TrianglesPCT [Sun, 24 Jul 2016 08:23:59 +0000 (02:23 -0600)]
Add files via upload

fix blender vert colors being casted to signed char, which was causing negative values.

Also fix blender vert colors being way outside of 0 to 1 range which aiColor specifies

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 22 Jul 2016 19:16:34 +0000 (21:16 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoFix license date + remove deprecated macros.
Kim Kulling [Fri, 22 Jul 2016 19:15:37 +0000 (21:15 +0200)]
Fix license date + remove deprecated macros.

8 years agoAssimpViewer: add assimp_viewer.h to CMakeLists.txt
Kim Kulling [Fri, 22 Jul 2016 19:14:58 +0000 (21:14 +0200)]
AssimpViewer: add assimp_viewer.h to CMakeLists.txt

8 years agoMerge pull request #951 from 3D4Medical/bugfix/obj_group_name_parse
Kim Kulling [Fri, 22 Jul 2016 18:49:43 +0000 (20:49 +0200)]
Merge pull request #951 from 3D4Medical/bugfix/obj_group_name_parse

Fixes for obj parser

8 years agoDelete reduntal 'g ' from actual name of Group. (we don't have 'usemtl' in material...
Volodymyr Boichentsov [Fri, 22 Jul 2016 13:10:06 +0000 (14:10 +0100)]
Delete reduntal 'g ' from actual name of Group. (we don't have 'usemtl' in material name)
Fixed issue in case 'usemtl' goes straight after 'g'.

8 years agoUpdate regression db.
Kim Kulling [Mon, 18 Jul 2016 06:52:26 +0000 (08:52 +0200)]
Update regression db.

8 years agoRegression Ui: fix invalid type cast.
Kim Kulling [Mon, 18 Jul 2016 06:51:53 +0000 (08:51 +0200)]
Regression Ui: fix invalid type cast.

8 years agoBlender: Add a positive test for object compare.
Kim Kulling [Sun, 17 Jul 2016 11:57:07 +0000 (13:57 +0200)]
Blender: Add a positive test for object compare.

8 years agofix https://github.com/assimp/assimp/issues/946: use correct test for objectcompare...
Kim Kulling [Sun, 17 Jul 2016 11:54:01 +0000 (13:54 +0200)]
fix https://github.com/assimp/assimp/issues/946: use correct test for objectcompare in blender.

8 years agoMerge pull request #947 from r-chris/optional-double-precision
Kim Kulling [Sat, 16 Jul 2016 09:15:16 +0000 (11:15 +0200)]
Merge pull request #947 from r-chris/optional-double-precision

Optional double precision

8 years agomoving cmake configure_file to appropriate location
Chris Russ [Sat, 16 Jul 2016 08:39:06 +0000 (18:39 +1000)]
moving cmake configure_file to appropriate location

8 years agoUpgrading PLY exporter to allow element definition as double
Chris Russ [Sat, 16 Jul 2016 08:22:01 +0000 (18:22 +1000)]
Upgrading PLY exporter to allow element definition as double

8 years agoProperly defining build-time defines in config.h
Chris Russ [Sat, 16 Jul 2016 06:02:47 +0000 (16:02 +1000)]
Properly defining build-time defines in config.h

8 years agoAdding double precision import support for formats that can be exported
Chris Russ [Sat, 16 Jul 2016 02:14:36 +0000 (12:14 +1000)]
Adding double precision import support for formats that can be exported

8 years agopropagating precision requirments into operations
Chris Russ [Fri, 15 Jul 2016 05:38:29 +0000 (15:38 +1000)]
propagating precision requirments into operations

8 years agoCMake Option and moving more functions to optional double support
Chris Russ [Fri, 15 Jul 2016 03:20:16 +0000 (13:20 +1000)]
CMake Option and moving more functions to optional double support

8 years agoBasic changes to introduce optional double precision
Chris Russ [Fri, 15 Jul 2016 02:53:49 +0000 (12:53 +1000)]
Basic changes to introduce optional double precision

8 years agoDefaultIOStream: export class for testing.
Kim Kulling [Sat, 16 Jul 2016 07:13:59 +0000 (09:13 +0200)]
DefaultIOStream: export class for testing.

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 15 Jul 2016 09:32:11 +0000 (11:32 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoAdd new testcase.
Kim Kulling [Fri, 15 Jul 2016 09:31:01 +0000 (11:31 +0200)]
Add new testcase.

8 years agoUnittests: add new unittest case
Kim Kulling [Fri, 15 Jul 2016 08:36:47 +0000 (10:36 +0200)]
Unittests: add new unittest case

8 years agoglTF: fix doxygen typo.
Kim Kulling [Fri, 15 Jul 2016 08:35:44 +0000 (10:35 +0200)]
glTF: fix doxygen typo.

8 years agoBlender: mark local function as static.
Kim Kulling [Fri, 15 Jul 2016 08:33:48 +0000 (10:33 +0200)]
Blender: mark local function as static.

8 years agoMerge pull request #943 from assimp/bugfix/issue_938
Kim Kulling [Tue, 12 Jul 2016 08:37:27 +0000 (10:37 +0200)]
Merge pull request #943 from assimp/bugfix/issue_938

closes https://github.com/assimp/assimp/issues/938: adapt instal pathes.

8 years agocloses https://github.com/assimp/assimp/issues/938: adapt instal pathes.
Kim Kulling [Tue, 12 Jul 2016 07:04:38 +0000 (09:04 +0200)]
closes https://github.com/assimp/assimp/issues/938: adapt instal pathes.

8 years agoRegression testsuit: fix dabatabe to latest changes.
Kim Kulling [Tue, 12 Jul 2016 07:02:47 +0000 (09:02 +0200)]
Regression testsuit: fix dabatabe to latest changes.

8 years agoPublic includes: add pragma statement and formalize include guard schema.
Kim Kulling [Mon, 11 Jul 2016 18:56:38 +0000 (20:56 +0200)]
Public includes: add pragma statement and formalize include guard schema.

8 years agoUpdate license date.
Kim Kulling [Sun, 10 Jul 2016 13:34:58 +0000 (15:34 +0200)]
Update license date.

8 years agoMerge pull request #941 from assimp/feature/issue_940
Kim Kulling [Fri, 8 Jul 2016 17:29:51 +0000 (19:29 +0200)]
Merge pull request #941 from assimp/feature/issue_940

Feature/issue 940

8 years agoUpdate version.
Kim Kulling [Fri, 8 Jul 2016 16:40:26 +0000 (18:40 +0200)]
Update version.

8 years agoIncludes: update header to latest greatest.
Kim Kulling [Fri, 8 Jul 2016 16:38:33 +0000 (18:38 +0200)]
Includes: update header to latest greatest.

8 years agoCMake: fix version for bugfix release.
Kim Kulling [Fri, 8 Jul 2016 16:37:25 +0000 (18:37 +0200)]
CMake: fix version for bugfix release.

8 years agoRemove dead code.
Kim Kulling [Fri, 8 Jul 2016 16:31:19 +0000 (18:31 +0200)]
Remove dead code.

8 years agoCloses https://github.com/assimp/assimp/issues/940: use standard offsetof
Kim Kulling [Fri, 8 Jul 2016 16:30:26 +0000 (18:30 +0200)]
Closes https://github.com/assimp/assimp/issues/940: use standard offsetof
instead of an own version.

8 years agoMerge pull request #935 from r-chris/export_precision
Kim Kulling [Wed, 6 Jul 2016 17:54:46 +0000 (19:54 +0200)]
Merge pull request #935 from r-chris/export_precision

setting default export precision to 17 for all exporters

8 years agoMerge pull request #936 from CharlyZhang/master
Kim Kulling [Wed, 6 Jul 2016 11:42:21 +0000 (13:42 +0200)]
Merge pull request #936 from CharlyZhang/master

update the Xcode projects  and make them work

8 years agomake the Xcode project `SimpleAssimpViewX.xcodeproj` work
CharlyZhang [Wed, 6 Jul 2016 08:45:49 +0000 (16:45 +0800)]
make the Xcode project `SimpleAssimpViewX.xcodeproj` work

8 years agoadd files (`C4D` & `3MF` format related) to the Xcode static library Project
CharlyZhang [Wed, 6 Jul 2016 08:45:00 +0000 (16:45 +0800)]
add files (`C4D` & `3MF` format related) to the Xcode static library Project

8 years agomake the `workspaces/xcode6/Assimp.xcodeproj` work
CharlyZhang [Wed, 6 Jul 2016 07:08:28 +0000 (15:08 +0800)]
make the `workspaces/xcode6/Assimp.xcodeproj` work

8 years agoreverting back to 16 digit precision export
Chris Russ [Wed, 6 Jul 2016 05:33:51 +0000 (15:33 +1000)]
reverting back to 16 digit precision export
having to import 17 digit floats likely leads to issues in many other apps

8 years agosetting default export precision to 17 for all exporters
Chris Russ [Wed, 6 Jul 2016 04:49:14 +0000 (14:49 +1000)]
setting default export precision to 17 for all exporters

8 years agoVersion: prepare 3.3 version.
Kim Kulling [Tue, 5 Jul 2016 16:43:16 +0000 (18:43 +0200)]
Version: prepare 3.3 version.

8 years agoMerge pull request #933 from liedtkeInTUM/master
Kim Kulling [Tue, 5 Jul 2016 13:57:53 +0000 (15:57 +0200)]
Merge pull request #933 from liedtkeInTUM/master

[Fix] Remove  CMake Warning (dev) in external/assimp/CMakeLists.txt

8 years ago[Fix] Remove CMake Warning (dev) in external/assimp/CMakeLists.txt with mis-matching...
Sven Liedtke [Tue, 5 Jul 2016 08:21:29 +0000 (10:21 +0200)]
[Fix] Remove  CMake Warning (dev) in external/assimp/CMakeLists.txt with mis-matching arguments for logical block

8 years agoFix resource leaks in unit tests.
Kim Kulling [Mon, 4 Jul 2016 20:15:23 +0000 (22:15 +0200)]
Fix resource leaks in unit tests.

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 4 Jul 2016 18:19:37 +0000 (20:19 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp