Commit Graph

34 Commits (6a76959f5b8ec28a9119cc1dd6db95271d2cbdaf)

Author SHA1 Message Date
Turo Lamminen 8ae7231654 Blender: Silence warning about uninitialized member 2017-11-18 16:50:45 +02:00
Kim Kulling a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Kim Kulling 98100d8cab Blender-Importer: fix coverity findings. 2017-05-06 11:14:04 +02:00
Kim Kulling dfa3409de9 Blender: add missing constructors. 2017-01-05 20:23:02 +01:00
Kim Kulling fcac614ad0 Blender: fix compiler warning: FAIL already defined. 2016-10-30 19:21:38 +01:00
Kim Kulling 0c00edb40e Blender: fix some minor findings. 2016-09-12 12:41:49 +02: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
ciechowoj c554b55f97 Merge branch 'blender_materials'
Conflicts:
	test/CMakeLists.txt
2016-05-17 22:52:18 +02:00
ciechowoj c4a542a994 Adds blender material loading. 2016-05-17 21:17:51 +02:00
ciechowoj 913f26475d Adds importing blender material. 2016-05-16 21:17:58 +02:00
ciechowoj 25d84a6aff Adds support for area lights. 2016-05-16 13:04:43 +02:00
mensinda 5dacda0a08 replaced boost smart pointers with c++11 smart pointers 2016-04-05 23:23:53 +02:00
boxdot 0d44479399 Import reflectance factor from Blender. 2016-03-29 21:16:26 +02:00
Kim Kulling 2496e8a0a3 Lib: reduce number of header files included. 2016-02-28 17:30:11 +01:00
boxdot 13ec11bca8 Import mClipPlane{Near,Far} and mHorizontalFOV from Blender. 2016-01-27 02:12:15 +01:00
Kim Kulling 1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Kim Kulling 88746af2e6 Blender-Loader: fix issue https://github.com/assimp/assimp/issues/131. 2015-08-07 21:22:09 +02:00
Richard 83de707587 Refactor: Expand tabs to 4 spaces 2015-06-28 16:04:15 -06:00
Richard a96a595a7a Refactor: Trim trailing whitespace 2015-06-28 16:01:32 -06:00
Richard 4c1a0507fe Refactor: Line endings are LF, not CRLF 2015-06-28 15:59:33 -06:00
Kim Kulling 2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
abma 470ad98281 fix "headercheck":
part of https://github.com/assimp/assimp/issues/534
2015-04-15 21:22:26 +02:00
Calvin Hsu a9a881cde6 Blender: map texture influence to aiTextureType
Previously assimp mapped all blender image textures as
aiTextureType_DIFFUSE.  This change interprets the "mapto" property
which corresponds to the Blender "Influence" in the properties editor.

* Blender's Normal influence with "Normal Map" unchecked maps to
  aiTextureType_HEIGHT.
* Blender's Normal influence with "Normal Map" checked maps to
  aiTextureType_NORMAL.
* Influence scale is placed into AI_MATKEY_BUMPSCALING.
2013-10-08 19:01:02 -07:00
Kester Maddock 3713383b0f Added uv and colour support 2013-03-26 21:28:15 +01:00
Kester Maddock eaf9cbc120 Added (basic) Blender 2.63 support. No uvs or colours supported yet. 2013-03-26 21:28:15 +01:00
aramis_acg 07841c3e13 # Blender: fix memory leaking due to cycle refs. Thanks to Vitalii Trubchaninov for pointing this out.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1230 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-27 22:09:09 +00:00
aramis_acg 4dbf539b44 - update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 03:38:30 +00:00
aramis_acg 2ffac898d6 [3393728] [PATCH 1/2] ommit->omit and splitted->split
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1064 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-20 22:00:33 +00:00
aramis_acg ffdb479411 + Blender: read specular hardness. Thanks to Marvin for the patch.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1032 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 15:10:54 +00:00
aramis_acg 99f2e3bd97 # bugfix typo in blender loader leading to warnings due to non-existent fields in the DNA.
# bugfix: blender loader no longer fails on embedded textures with uppercase file names.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@892 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-11 22:11:58 +00:00
aramis_acg d082330cea BLENDER: Fix potential stack overflow caused by a DOM object referencing itself.
Add general infrastructure to apply modifiers.
Implement mirror and subdivision modifiers using existing stuff.
Update BlenderDNA with related structures.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@763 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-07 14:50:19 +00:00
aramis_acg 188aa3da37 blender loader now reads basic material colors and even simple textures, be them embedded into the BLEND file or not.
adding some test files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@735 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-24 01:24:18 +00:00
aramis_acg 3cf20b605d blender loader now loads material assignments.
blender loader no longer produces randomized output in some scenarious. nice side effect of less asthetic diversity: less segfaults.
assimpview is no longer topmost.



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@732 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-21 22:39:31 +00:00
aramis_acg 32bfa9ac21 Add WIP version of the BLENDER importer. DO NOT USE FOR PRODUCTION YET!
Loads static meshes. Sometimes (it segfaults on the rest). No materials, cameras, fancy stuff. Works with all versions of blender. No compressed blend files yet.

- StreamReader now uses shared_ptr's to manage ownership of the stream.
- Adapt other loaders accordingly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@717 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-10 10:22:24 +00:00