Commit Graph

3578 Commits (e7ed352078d5415a1472b39c93378472003f2597)

Author SHA1 Message Date
nyorain e7ed352078 Added documentation for embedded textures 2016-08-09 01:06:43 +02:00
Kim Kulling 86f30e4852 Merge pull request #965 from waldyrious/patch-1
fix long option name for --om
2016-08-08 19:48:49 +02:00
Waldir Pimenta a9ebac6b54 fix long option name for --om
to match the actual code in tools/assimp_cmd/Main.cpp
2016-08-08 11:46:41 +01:00
Kim Kulling 042b2bbe77 Merge pull request #964 from waldyrious/patch-1
dox_cmd.h: fix typo 'dumb' --> 'dump'
2016-08-05 22:19:42 +02:00
Waldir Pimenta a98e524fe2 dox_cmd.h: fix typo 'dumb' --> 'dump' 2016-08-05 19:54:58 +01:00
Kim Kulling ad133a05ec CMake: remove dead code. 2016-08-03 10:20:03 +02:00
Kim Kulling 6003616b07 Merge pull request #960 from smalcom/assimp_qt_viewer
[+] 3D viewer which uses Assimp and Qt4.
2016-08-01 20:15:00 +02:00
Alexandr Arutjunov 2a815df888 [F] Texture coordinate Y must be flipped for OpenGL. 2016-08-01 13:13:35 +03:00
Alexandr Arutjunov 6fe0895799 [F] Added checks for building assimp_qt_viewer. 2016-07-31 22:51:15 +03:00
Alexandr Arutjunov 28c0109b41 [F] Added include dirs and libraries for OpenGL and DevIL. 2016-07-31 15:50:48 +03:00
Alexandr Arutjunov 7df5e48129 [F] DevIL is needed for compilation. 2016-07-31 15:14:49 +03:00
Alexandr Arutjunov 2d921316ca [+] 3D viewer which uses Assimp and Qt4. 2016-07-31 14:56:30 +03:00
Alexander Gessler 454320ad08 Merge pull request #953 from TrianglesPCT/master
Fix blender vertex colors being negative, and fix blender vertex colors scaling to be 0 to 1
2016-07-27 21:37:02 +02:00
TrianglesPCT 66c1a176de Add files via upload
forcing a new build
2016-07-25 23:04:08 -06:00
Kim Kulling 86e2876083 Merge pull request #956 from adishavit/master
Fixes a few build issues with MSVC 2015 and gcc
2016-07-26 00:16:16 +02:00
Adi Shavit @ MacBookPro f119447549 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`.
2016-07-25 16:33:25 +03:00
TrianglesPCT 667aa37fdd Add files via upload
used ai_real instead of float
2016-07-24 18:45:41 -06:00
Adi Shavit @ MacBookPro 5fe4b975ba Removes MSVC warning with explicit cast. 2016-07-24 15:54:16 +03:00
TrianglesPCT e888e72599 Fix warning
The call to sprintf was causing a warning in vs2015 because of wrong type.
2016-07-24 02:33:33 -06:00
TrianglesPCT 28c9f56c5e Add files via upload
scale blender vert color out to 0-1 range as aiColor specifies
2016-07-24 02:26:23 -06:00
TrianglesPCT bcb86bcc35 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
2016-07-24 02:23:59 -06:00
Kim Kulling 86b7f12c18 Merge branch 'master' of https://github.com/assimp/assimp 2016-07-22 21:16:34 +02:00
Kim Kulling bfed4ea634 Fix license date + remove deprecated macros. 2016-07-22 21:15:37 +02:00
Kim Kulling c471d8187f AssimpViewer: add assimp_viewer.h to CMakeLists.txt 2016-07-22 21:14:58 +02:00
Kim Kulling 8c2e6d66a8 Merge pull request #951 from 3D4Medical/bugfix/obj_group_name_parse
Fixes for obj parser
2016-07-22 20:49:43 +02:00
Volodymyr Boichentsov 5c5acae92e 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'.
2016-07-22 14:10:06 +01:00
Kim Kulling 002b9c8303 Update regression db. 2016-07-18 08:52:26 +02:00
Kim Kulling b6257b82d4 Regression Ui: fix invalid type cast. 2016-07-18 08:51:53 +02:00
Kim Kulling 6994b89347 Blender: Add a positive test for object compare. 2016-07-17 13:57:07 +02:00
Kim Kulling 5fc3ee9a21 fix https://github.com/assimp/assimp/issues/946: use correct test for objectcompare in blender. 2016-07-17 13:54:01 +02:00
Kim Kulling 23baecaff3 Merge pull request #947 from r-chris/optional-double-precision
Optional double precision
2016-07-16 11:15:16 +02:00
Chris Russ c57b524a59 moving cmake configure_file to appropriate location 2016-07-16 18:47:59 +10:00
Chris Russ a7894b090d Upgrading PLY exporter to allow element definition as double 2016-07-16 18:23:33 +10:00
Chris Russ ad8bb32561 Properly defining build-time defines in config.h 2016-07-16 18:23:33 +10:00
Chris Russ 05a6ee6473 Adding double precision import support for formats that can be exported 2016-07-16 18:23:33 +10:00
Chris Russ fa1d6d8c55 propagating precision requirments into operations 2016-07-16 18:23:33 +10:00
Chris Russ 5adb0e899c CMake Option and moving more functions to optional double support 2016-07-16 18:23:33 +10:00
Chris Russ 2f7e3dcdcc Basic changes to introduce optional double precision 2016-07-16 18:23:33 +10:00
Kim Kulling 45fae27aed DefaultIOStream: export class for testing. 2016-07-16 09:13:59 +02:00
Kim Kulling 0fd5f4ac57 Merge branch 'master' of https://github.com/assimp/assimp 2016-07-15 11:32:11 +02:00
Kim Kulling 742e513deb Add new testcase. 2016-07-15 11:31:01 +02:00
Kim Kulling e0d3fd2e2e Unittests: add new unittest case 2016-07-15 10:36:47 +02:00
Kim Kulling a15a77dff5 glTF: fix doxygen typo. 2016-07-15 10:35:44 +02:00
Kim Kulling e1697b30bc Blender: mark local function as static. 2016-07-15 10:33:48 +02:00
Kim Kulling 22963ad9e8 Merge pull request #943 from assimp/bugfix/issue_938
closes https://github.com/assimp/assimp/issues/938: adapt instal pathes.
2016-07-12 10:37:27 +02:00
Kim Kulling 4116b341aa closes https://github.com/assimp/assimp/issues/938: adapt instal pathes. 2016-07-12 09:04:38 +02:00
Kim Kulling 2a8936a217 Regression testsuit: fix dabatabe to latest changes. 2016-07-12 09:02:47 +02:00
Kim Kulling 9678da72c9 Public includes: add pragma statement and formalize include guard schema. 2016-07-11 20:56:38 +02:00
Kim Kulling 02602ce9af Update license date. 2016-07-10 15:34:58 +02:00
Kim Kulling a8673d4828 Merge pull request #941 from assimp/feature/issue_940
Feature/issue 940
2016-07-08 19:29:51 +02:00