diff options
author | Alexander Romanov <a.romanov@blend4web.com> | 2016-01-27 12:06:57 +0300 |
---|---|---|
committer | Alexander Romanov <a.romanov@blend4web.com> | 2016-01-27 12:06:57 +0300 |
commit | 771f73b6bedbdd1c1e2993bd8d3680d53fa67b7c (patch) | |
tree | 1e1593c722640fc00a1755d1acd3a4263ff396b0 /source/blender/makesdna/DNA_image_types.h | |
parent | f6ff8f27e35d7b9596bbb2c55c3cf464f6e6ffc0 (diff) |
World textures displaying for viewport in BI.
This patch supports "Image or Movie" and "Environment map" types of world texture for the viewport.
It supports:
- "View", "AngMap" and "Equirectangular" types of mapping.
- Different types of texture blending (according to BI world render).
- Same color blending as when it lacked textures (but render via glsl).
{F207734}
{F207735}
Example: {F275180}
Original author: @valentin_b4w
Regards,
Alexander (Blend4Web Team).
Reviewers: sergey, valentin_b4w, brecht, merwin
Reviewed By: merwin
Subscribers: campbellbarton, merwin, blueprintrandom, youle, a.romanov, yurikovelenov, AlexKowel, Evgeny_Rodygin
Projects: #rendering, #opengl_gfx, #bf_blender:_next
Differential Revision: https://developer.blender.org/D1414
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index d48ce863338..b4bc26f45cd 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -90,13 +90,19 @@ typedef struct RenderSlot { #define IMA_NEED_FRAME_RECALC 8 #define IMA_SHOW_STEREO 16 +enum { + TEXTARGET_TEXTURE_2D = 0, + TEXTARGET_TEXTURE_CUBE_MAP = 1, + TEXTARGET_COUNT = 2 +}; + typedef struct Image { ID id; char name[1024]; /* file path, 1024 = FILE_MAX */ struct MovieCache *cache; /* not written in file */ - struct GPUTexture *gputexture; /* not written in file */ + struct GPUTexture *gputexture[2]; /* not written in file 2 = TEXTARGET_COUNT */ /* sources from: */ ListBase anims; @@ -113,7 +119,8 @@ typedef struct Image { short tpageflag, totbind; short xrep, yrep; short twsta, twend; - unsigned int bindcode; /* only for current image... */ + unsigned int bindcode[2]; /* only for current image... 2 = TEXTARGET_COUNT */ + char pad1[4]; unsigned int *repbind; /* for repeat of parts of images */ struct PackedFile *packedfile DNA_DEPRECATED; /* deprecated */ |