Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2003-07-20 00:31:29 +0400
committerTon Roosendaal <ton@blender.org>2003-07-20 00:31:29 +0400
commit9bf630a1f32a264b5e0a6842ebb812e7eb52556e (patch)
tree3da4b284da99cc4e42eb0501b099263a5245ad8e /source/blender/render/extern
parent86073223850632a34babb87bbf5996bff06dbc97 (diff)
WARNING: with makefiles I could not get a stable blender compiled.
do a make clean in source/blender/ to be sure! - Included the new shaders from Cessen... well, only the shader calls themselves. To make sure the shaders work I nicely integrated it - MaterialButtons: layout changed a bit, but still resembles the old layout. The 'shader' options now are located together. - Shaders are separated in 'diffuse' and 'specular'. You can combine them freely. - diffuse Lambert: old shader diffuse Oren Nayar: new shader, gives sandy/silky/skinny material well diffuse Toon: for cartoon render - specular Phong: new spec, traditional 70ies spec specular CookTorr: a reduced version of cook torrance shading, does off specular peak well specular Blinn: new spec, same features as CookTorr, but with extra 'refraction' setting specular Toon: new spec for cartoon render - default blender starts with settings that render compatible! - works in shaded view and preview-render - works in unified render Further little changes: - removed paranoia compile warnings from render/loader/blenlib - and the warnings at files I worked at were removed.
Diffstat (limited to 'source/blender/render/extern')
-rw-r--r--source/blender/render/extern/include/render.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/render/extern/include/render.h b/source/blender/render/extern/include/render.h
index 972134f8be7..40bebb43c24 100644
--- a/source/blender/render/extern/include/render.h
+++ b/source/blender/render/extern/include/render.h
@@ -189,7 +189,12 @@ int RE_envmaptex(struct Tex *tex, float *texvec, float *dxt, float *dyt);
/* --------------------------------------------------------------------- */
/* rendercore (2) */
/* --------------------------------------------------------------------- */
- float RE_Spec(float inp, int hard);
+ float Phong_Spec(float *n, float *l, float *v, int hard);
+ float CookTorr_Spec(float *n, float *l, float *v, int hard);
+ float Blinn_Spec(float *n, float *l, float *v, float refrac, float spec_power);
+ float Toon_Spec( float *n, float *l, float *v, float size, float smooth);
+ float OrenNayar_Diff(float *n, float *l, float *v, float rough);
+ float Toon_Diff( float *n, float *l, float *v, float size, float smooth);
/* maybe not external */
void RE_calc_R_ref(void);