Kim Kulling [Mon, 29 Aug 2016 18:05:29 +0000 (20:05 +0200)]
glTFImporter: avoid out-of-bounds-access.
Kim Kulling [Mon, 29 Aug 2016 17:56:38 +0000 (19:56 +0200)]
MakeVerboseFormat: fix invalid delete statement.
Kim Kulling [Mon, 29 Aug 2016 16:23:41 +0000 (18:23 +0200)]
Fix findings from code review.
Kim Kulling [Mon, 29 Aug 2016 13:32:27 +0000 (15:32 +0200)]
Fix coverity findings: fix possible out-of-bound access.
Kim Kulling [Mon, 29 Aug 2016 13:28:37 +0000 (15:28 +0200)]
Fix coverity findings: fix possible usage after calling free.
Kim Kulling [Mon, 29 Aug 2016 13:24:24 +0000 (15:24 +0200)]
Fix coverity finding: fix possible use after free..
Kim Kulling [Thu, 25 Aug 2016 16:20:52 +0000 (18:20 +0200)]
GeometryBuilder: fix update of vertices.
Kim Kulling [Sat, 20 Aug 2016 12:48:03 +0000 (14:48 +0200)]
Merge pull request #985 from Sailsman63/64b_static_zlib
Building own zlib on 64bit Linux shared library requires -fPIC for C compiler.
Kim Kulling [Fri, 19 Aug 2016 08:26:48 +0000 (10:26 +0200)]
Merge pull request #984 from jwwalker/upstream
Add typecasts in glTFAssetWriter.inl to fix compile errors
Lucas Stanek [Thu, 18 Aug 2016 22:23:12 +0000 (22:23 +0000)]
Add -fPIC to C Flags for 64bit linux Shared Object builds without checking if zlib is being built.
Lucas Stanek [Thu, 18 Aug 2016 00:03:29 +0000 (00:03 +0000)]
Building static ZLIB on 64b LInux requires -fPIC for C compiler.
Daniel Knezevic [Thu, 18 Aug 2016 08:51:20 +0000 (10:51 +0200)]
Use Assimp namespace to fix build for big-endian architectures
James Walker [Thu, 18 Aug 2016 17:55:24 +0000 (10:55 -0700)]
Changed C-style casts to static_cast.
Alexander Gessler [Thu, 18 Aug 2016 13:41:48 +0000 (15:41 +0200)]
Merge pull request #986 from Deni90/master
Use Assimp namespace to fix build for big-endian architectures
Daniel Knezevic [Thu, 18 Aug 2016 08:51:20 +0000 (10:51 +0200)]
Use Assimp namespace to fix build for big-endian architectures
James Walker [Thu, 18 Aug 2016 00:35:16 +0000 (17:35 -0700)]
Add typecasts in glTFAssetWriter.inl to fix compile errors about ambiguous constructors, see: <https://github.com/assimp/assimp/issues/980>
Kim Kulling [Mon, 15 Aug 2016 19:30:46 +0000 (21:30 +0200)]
Merge pull request #983 from roshanch/master
adding support to store all the layered textures
roshan.c [Mon, 15 Aug 2016 16:58:53 +0000 (09:58 -0700)]
adding support to store all the layered textures
Kim Kulling [Sun, 14 Aug 2016 19:25:07 +0000 (21:25 +0200)]
Merge pull request #979 from assimp/issue_975
Fix copy-paste-error.
Kim Kulling [Sun, 14 Aug 2016 19:24:00 +0000 (21:24 +0200)]
Fix copy-paste-error.
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 …
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
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
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
Kim Kulling [Sun, 14 Aug 2016 09:58:12 +0000 (11:58 +0200)]
Update rapidjson to v1.0.2
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.
Kim Kulling [Sat, 13 Aug 2016 07:13:22 +0000 (09:13 +0200)]
CMakeLists: cleanup, move all options to one place for mantenace.
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.
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
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
Kim Kulling [Fri, 12 Aug 2016 16:14:26 +0000 (18:14 +0200)]
DefaultIOStream: add missing detection for apple-based OS.
Kim Kulling [Fri, 12 Aug 2016 15:13:18 +0000 (17:13 +0200)]
closes https://github.com/assimp/assimp/issues/901
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.
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
nyorain [Mon, 8 Aug 2016 22:50:48 +0000 (00:50 +0200)]
Added documentation for embedded textures
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
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
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'
Waldir Pimenta [Fri, 5 Aug 2016 18:54:58 +0000 (19:54 +0100)]
dox_cmd.h: fix typo 'dumb' --> 'dump'
Kim Kulling [Wed, 3 Aug 2016 08:20:03 +0000 (10:20 +0200)]
CMake: remove dead code.
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.
Alexandr Arutjunov [Mon, 1 Aug 2016 10:13:35 +0000 (13:13 +0300)]
[F] Texture coordinate Y must be flipped for OpenGL.
Alexandr Arutjunov [Sun, 31 Jul 2016 19:51:15 +0000 (22:51 +0300)]
[F] Added checks for building assimp_qt_viewer.
Alexandr Arutjunov [Sun, 31 Jul 2016 12:50:48 +0000 (15:50 +0300)]
[F] Added include dirs and libraries for OpenGL and DevIL.
Alexandr Arutjunov [Sun, 31 Jul 2016 12:14:49 +0000 (15:14 +0300)]
[F] DevIL is needed for compilation.
Alexandr Arutjunov [Sun, 31 Jul 2016 11:56:30 +0000 (14:56 +0300)]
[+] 3D viewer which uses Assimp and Qt4.
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
TrianglesPCT [Tue, 26 Jul 2016 05:04:08 +0000 (23:04 -0600)]
Add files via upload
forcing a new build
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
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`.
TrianglesPCT [Mon, 25 Jul 2016 00:45:41 +0000 (18:45 -0600)]
Add files via upload
used ai_real instead of float
Adi Shavit @ MacBookPro [Sun, 24 Jul 2016 12:54:16 +0000 (15:54 +0300)]
Removes MSVC warning with explicit cast.
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.
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
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
Kim Kulling [Fri, 22 Jul 2016 19:16:34 +0000 (21:16 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 22 Jul 2016 19:15:37 +0000 (21:15 +0200)]
Fix license date + remove deprecated macros.
Kim Kulling [Fri, 22 Jul 2016 19:14:58 +0000 (21:14 +0200)]
AssimpViewer: add assimp_viewer.h to CMakeLists.txt
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
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'.
Kim Kulling [Mon, 18 Jul 2016 06:52:26 +0000 (08:52 +0200)]
Update regression db.
Kim Kulling [Mon, 18 Jul 2016 06:51:53 +0000 (08:51 +0200)]
Regression Ui: fix invalid type cast.
Kim Kulling [Sun, 17 Jul 2016 11:57:07 +0000 (13:57 +0200)]
Blender: Add a positive test for object compare.
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.
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
Chris Russ [Sat, 16 Jul 2016 08:39:06 +0000 (18:39 +1000)]
moving cmake configure_file to appropriate location
Chris Russ [Sat, 16 Jul 2016 08:22:01 +0000 (18:22 +1000)]
Upgrading PLY exporter to allow element definition as double
Chris Russ [Sat, 16 Jul 2016 06:02:47 +0000 (16:02 +1000)]
Properly defining build-time defines in config.h
Chris Russ [Sat, 16 Jul 2016 02:14:36 +0000 (12:14 +1000)]
Adding double precision import support for formats that can be exported
Chris Russ [Fri, 15 Jul 2016 05:38:29 +0000 (15:38 +1000)]
propagating precision requirments into operations
Chris Russ [Fri, 15 Jul 2016 03:20:16 +0000 (13:20 +1000)]
CMake Option and moving more functions to optional double support
Chris Russ [Fri, 15 Jul 2016 02:53:49 +0000 (12:53 +1000)]
Basic changes to introduce optional double precision
Kim Kulling [Sat, 16 Jul 2016 07:13:59 +0000 (09:13 +0200)]
DefaultIOStream: export class for testing.
Kim Kulling [Fri, 15 Jul 2016 09:32:11 +0000 (11:32 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 15 Jul 2016 09:31:01 +0000 (11:31 +0200)]
Add new testcase.
Kim Kulling [Fri, 15 Jul 2016 08:36:47 +0000 (10:36 +0200)]
Unittests: add new unittest case
Kim Kulling [Fri, 15 Jul 2016 08:35:44 +0000 (10:35 +0200)]
glTF: fix doxygen typo.
Kim Kulling [Fri, 15 Jul 2016 08:33:48 +0000 (10:33 +0200)]
Blender: mark local function as static.
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.
Kim Kulling [Tue, 12 Jul 2016 07:04:38 +0000 (09:04 +0200)]
closes https://github.com/assimp/assimp/issues/938: adapt instal pathes.
Kim Kulling [Tue, 12 Jul 2016 07:02:47 +0000 (09:02 +0200)]
Regression testsuit: fix dabatabe to latest changes.
Kim Kulling [Mon, 11 Jul 2016 18:56:38 +0000 (20:56 +0200)]
Public includes: add pragma statement and formalize include guard schema.
Kim Kulling [Sun, 10 Jul 2016 13:34:58 +0000 (15:34 +0200)]
Update license date.
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
Kim Kulling [Fri, 8 Jul 2016 16:40:26 +0000 (18:40 +0200)]
Update version.
Kim Kulling [Fri, 8 Jul 2016 16:38:33 +0000 (18:38 +0200)]
Includes: update header to latest greatest.
Kim Kulling [Fri, 8 Jul 2016 16:37:25 +0000 (18:37 +0200)]
CMake: fix version for bugfix release.
Kim Kulling [Fri, 8 Jul 2016 16:31:19 +0000 (18:31 +0200)]
Remove dead code.
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.
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
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
CharlyZhang [Wed, 6 Jul 2016 08:45:49 +0000 (16:45 +0800)]
make the Xcode project `SimpleAssimpViewX.xcodeproj` work
CharlyZhang [Wed, 6 Jul 2016 08:45:00 +0000 (16:45 +0800)]
add files (`C4D` & `3MF` format related) to the Xcode static library Project
CharlyZhang [Wed, 6 Jul 2016 07:08:28 +0000 (15:08 +0800)]
make the `workspaces/xcode6/Assimp.xcodeproj` work
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
Chris Russ [Wed, 6 Jul 2016 04:49:14 +0000 (14:49 +1000)]
setting default export precision to 17 for all exporters
Kim Kulling [Tue, 5 Jul 2016 16:43:16 +0000 (18:43 +0200)]
Version: prepare 3.3 version.
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
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
Kim Kulling [Mon, 4 Jul 2016 20:15:23 +0000 (22:15 +0200)]
Fix resource leaks in unit tests.