archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

WARNING: with makefiles I could not get a stable blender compiled.

Browse Source 
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.
This commit is contained in:
Ton Roosendaal
2003-07-19 20:31:29 +00:00
parent 8607322385
commit 9bf630a1f3
18 changed files with 430 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/blenkernel/intern/material.c
View File

@@ -82,18 +82,25 @@ void free_material(Material *ma)
void init_material(Material *ma)
{
ma->lay= 1;
ma->r= ma->g= ma->b= ma->ref= 0.8f;
ma->specr= ma->specg= ma->specb= 1.0f;
ma->mirr= ma->mirg= ma->mirb= 1.0f;
ma->amb= 0.5f;
ma->alpha= 1.0f;
ma->spec= ma->hasize= 0.5f;
ma->r= ma->g= ma->b= ma->ref= 0.8;
ma->specr= ma->specg= ma->specb= 1.0;
ma->mirr= ma->mirg= ma->mirb= 1.0;
ma->amb= 0.5;
ma->alpha= 1.0;
ma->spec= ma->hasize= 0.5;
ma->har= 50;
ma->starc= ma->ringc= 4;
ma->linec= 12;
ma->flarec= 1;
ma->flaresize= ma->subsize= 1.0f;
ma->friction= 0.5f;
ma->flaresize= ma->subsize= 1.0;
ma->friction= 0.5;
ma->refrac= 4.0;
ma->roughness= 0.5;
ma->param[0]= 0.5;
ma->param[1]= 0.1;
ma->param[2]= 0.5;
ma->param[3]= 0.1;
ma->mode= MA_TRACEBLE+MA_SHADOW;
}