diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-16 18:45:19 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-16 18:45:19 +0300 |
commit | bd638da9a0bbd057b72164eed6583888380490ed (patch) | |
tree | 90c535062d48f73329b4597920877964e3c3b97a /source/blender/nodes/intern/TEX_util.h | |
parent | 768f20d537967ada2c5e71c05b027533959bdc91 (diff) |
Texture Nodes:
* Remove the manual OSA method but rather pass on derivatives to the
textures. This means that at the moment e.g. the bricks node is not
antialiased, but that image textures are now using mipmaps. Doing
oversampling on the whole nodetree is convenient but it is really
the individual textures that can do filtering best and quickest.
* Image textures in a texture node tree were not color corrected and
did not support 2d mapping, now it's passing along shadeinput to
make this possible. Would like to avoid this but not sure how.
* Fix preview not filling in all pixels when scaling or rotating in
the texture nodes.
Diffstat (limited to 'source/blender/nodes/intern/TEX_util.h')
-rw-r--r-- | source/blender/nodes/intern/TEX_util.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/TEX_util.h b/source/blender/nodes/intern/TEX_util.h index 04d29051ea7..a9465e17623 100644 --- a/source/blender/nodes/intern/TEX_util.h +++ b/source/blender/nodes/intern/TEX_util.h @@ -70,18 +70,29 @@ typedef struct TexCallData { TexResult *target; - float *coord; + float *co; float *dxt, *dyt; + int osatex; char do_preview; short thread; short which_output; int cfra; + + ShadeInput *shi; + MTex *mtex; } TexCallData; typedef struct TexParams { - float *coord; + float *co; float *dxt, *dyt; + float *previewco; int cfra; + int osatex; + + /* optional. we don't really want these here, but image + textures need to do mapping & color correction */ + ShadeInput *shi; + MTex *mtex; } TexParams; typedef void(*TexFn) (float *out, TexParams *params, bNode *node, bNodeStack **in, short thread); |