diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-28 20:35:08 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-28 20:35:08 +0300 |
| commit | 69d3a08557d7fc3078c8fcb8caead1aedcdab791 (patch) | |
| tree | 7f72040ffabb5a1f1016ee0f212deb41899eac49 /source | |
| parent | e63fbc992d8e54d74c9c433b212cf8037321f09d (diff) | |
EEVEE: lookdev default materials
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 34097a821a4..1134c82954c 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1638,11 +1638,13 @@ void EEVEE_materials_cache_finish(EEVEE_Data *vedata) EEVEE_LampsInfo *linfo = sldata->lamps; struct Gwn_Batch *sphere = DRW_cache_sphere_get(); static float mat1[4][4]; - static float color[3] = {1.0, 1.0, 1.0}; + static float color[3] = {0.8f, 0.8f, 0.8f}; static float metallic_on = 1.0f; static float metallic_off = 0.00f; - static float specular = 1.0f; - static float roughness = 0.05f; + static float specular_off = 0.5f; + static float specular_on = 1.0f; + static float roughness_off = 0.05f; + static float roughness_on = 1.00f; float view_mat[4][4]; DRW_viewport_matrix_get(view_mat, DRW_MAT_VIEWINV); @@ -1650,8 +1652,8 @@ void EEVEE_materials_cache_finish(EEVEE_Data *vedata) DRWShadingGroup *shgrp = EEVEE_lookdev_shading_group_get(sldata, vedata, false, linfo->shadow_method); DRW_shgroup_uniform_vec3(shgrp, "basecol", color, 1); DRW_shgroup_uniform_float(shgrp, "metallic", &metallic_on, 1); - DRW_shgroup_uniform_float(shgrp, "specular", &specular, 1); - DRW_shgroup_uniform_float(shgrp, "roughness", &roughness, 1); + DRW_shgroup_uniform_float(shgrp, "specular", &specular_on, 1); + DRW_shgroup_uniform_float(shgrp, "roughness", &roughness_off, 1); unit_m4(mat1); mul_m4_m4m4(mat1, mat1, view_mat); translate_m4(mat1, -1.5f, 0.0f, -5.0f); @@ -1660,8 +1662,8 @@ void EEVEE_materials_cache_finish(EEVEE_Data *vedata) shgrp = EEVEE_lookdev_shading_group_get(sldata, vedata, false, linfo->shadow_method); DRW_shgroup_uniform_vec3(shgrp, "basecol", color, 1); DRW_shgroup_uniform_float(shgrp, "metallic", &metallic_off, 1); - DRW_shgroup_uniform_float(shgrp, "specular", &specular, 1); - DRW_shgroup_uniform_float(shgrp, "roughness", &roughness, 1); + DRW_shgroup_uniform_float(shgrp, "specular", &specular_off, 1); + DRW_shgroup_uniform_float(shgrp, "roughness", &roughness_on, 1); translate_m4(mat1, 3.0f, 0.0f, 0.0f); DRW_shgroup_call_add(shgrp, sphere, mat1); } |