kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

show material hardness in solid shaded mode

Browse Source
This commit is contained in:
Campbell Barton 2010-09-27 07:01:08 +00:00
parent 62c7786cd9
commit dbd5524970
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/gpu/intern/gpu_draw.c
View File

@ -874,6 +874,7 @@ void GPU_free_images_anim(void)
typedef struct GPUMaterialFixed {
float diff[4];
float spec[4];
int hard;
} GPUMaterialFixed;
static struct GPUMaterialState {
@ -921,6 +922,7 @@ static void gpu_material_to_fixed(GPUMaterialFixed *smat, const Material *bmat,
smat->spec[1]= bmat->spec * bmat->specg;
smat->spec[2]= bmat->spec * bmat->specb;
smat->spec[3]= 1.0; /* always 1 */
smat->hard= CLAMPIS(bmat->har, 0, 128);
if(gamma) {
linearrgb_to_srgb_v3_v3(smat->diff, smat->diff);
@ -1104,6 +1106,7 @@ int GPU_enable_material(int nr, void *attribs)
/* or do fixed function opengl material */
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, GMS.matbuf[nr].diff);
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, GMS.matbuf[nr].spec);
glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, GMS.matbuf[nr].hard);
}
/* set (alpha) blending mode */