diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-02 18:32:17 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-02 18:32:17 +0300 |
| commit | 763695c0e88a928e9609ae3b4719b43cd455ca22 (patch) | |
| tree | 68d94c84a037360a68d46cabad98691c7f6cdb44 /source/blender/render | |
| parent | 4650f7f8a9e8bd9166856034b5593e0dcf9fcd71 (diff) | |
Orange; made Node types Texture and Geometry integrated in render. Means
the coordinate outputs now have correct dx/dy vectors for Image AA, and
texture delivers correct intensity, rgb, alpha and normal.
Note; we need a "Vector Mapping" node, to do 2d/3d mapping, like in the
Material "Map In" panel.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/extern/include/render.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/texture.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/render/extern/include/render.h b/source/blender/render/extern/include/render.h index 64c0592e8cb..0622ae79112 100644 --- a/source/blender/render/extern/include/render.h +++ b/source/blender/render/extern/include/render.h @@ -146,6 +146,7 @@ void RE_zbufferall_radio(struct RadView *vw, struct RNode **rg_elem, int rg_t /* ------------------------------------------------------------------------- */ struct MTex; struct Tex; +struct TexResult; void init_render_textures(void); void init_render_texture(struct Tex *tex); @@ -153,6 +154,7 @@ void init_render_texture(struct Tex *tex); void do_material_tex(ShadeInput *shi); void do_lamp_tex(struct LampRen *la, float *lavec, ShadeInput *shi, float *fcol); +int multitex(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres); int multitex_ext(struct Tex *tex, float *texvec, float *tin, float *tr, float *tg, float *tb, float *ta); void externtex(struct MTex *mtex, float *vec, float *tin, float *tr, float *tg, float *tb, float *ta); diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 9b38a65a4b9..518ab581efc 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -1121,7 +1121,7 @@ static void do_2d_mapping(MTex *mtex, float *t, VlakRen *vlr, float *dxt, float /* ************************************** */ -static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexResult *texres) +int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexResult *texres) { int retval=0; /* return value, int:0, col:1, nor:2, everything:3 */ @@ -1215,6 +1215,7 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, return retval; } +/* preview render */ int multitex_ext(Tex *tex, float *texvec, float *tin, float *tr, float *tg, float *tb, float *ta) { TexResult texr; |