griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Eevee: Add support for legacy materials node. (not PBR)

Browse Source
This commit is contained in:
Clément Foucault
2017-05-01 18:11:04 +02:00
parent 62ea911e1a
commit 7eebc5113c
3 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/blender/draw/engines/eevee/eevee_engine.c
View File

@@ -399,7 +399,7 @@ static void EEVEE_cache_init(void *vedata)
if (wo && wo->use_nodes && wo->nodetree) {
struct GPUMaterial *gpumat = GPU_material_from_nodetree(
wo->nodetree, &wo->gpumaterial, &DRW_engine_viewport_eevee_type, 0,
scene, wo->nodetree, &wo->gpumaterial, &DRW_engine_viewport_eevee_type, 0,
datatoc_probe_vert_glsl, datatoc_probe_geom_glsl, e_data.frag_shader_lib,
"#define PROBE_CAPTURE\n"
"#define MAX_LIGHT 128\n"
@@ -541,11 +541,44 @@ static void EEVEE_cache_populate(void *vedata, Object *ob)
if (ma == NULL)
ma = &defmaterial;
DRWShadingGroup *shgrp = DRW_shgroup_create(e_data.default_lit, psl->material_pass);
DRW_shgroup_uniform_vec3(shgrp, "diffuse_col", &ma->r, 1);
DRW_shgroup_uniform_vec3(shgrp, "specular_col", &ma->specr, 1);
DRW_shgroup_uniform_short(shgrp, "hardness", &ma->har, 1);
DRW_shgroup_call_add(shgrp, mat_geom[i], ob->obmat);
if (ma->use_nodes && ma->nodetree) {
const DRWContextState *draw_ctx = DRW_context_state_get();
Scene *scene = draw_ctx->scene;
struct GPUMaterial *gpumat = GPU_material_from_nodetree(
scene, ma->nodetree, &ma->gpumaterial, &DRW_engine_viewport_eevee_type, 0,
datatoc_lit_surface_vert_glsl, NULL, e_data.frag_shader_lib,
"#define PROBE_CAPTURE\n"
"#define MAX_LIGHT 128\n"
"#define MAX_SHADOW_CUBE 42\n"
"#define MAX_SHADOW_MAP 64\n"
"#define MAX_SHADOW_CASCADE 8\n"
"#define MAX_CASCADE_NUM 4\n");
DRWShadingGroup *shgrp = DRW_shgroup_material_create(gpumat, psl->material_pass);
if (shgrp) {
DRW_shgroup_call_add(shgrp, mat_geom[i], ob->obmat);
}
else {
/* Shader failed : pink color */
static float col[3] = {1.0f, 0.0f, 1.0f};
static float spec[3] = {1.0f, 0.0f, 1.0f};
static short hardness = 1;
shgrp = DRW_shgroup_create(e_data.default_lit, psl->default_pass);
DRW_shgroup_uniform_vec3(shgrp, "diffuse_col", col, 1);
DRW_shgroup_uniform_vec3(shgrp, "specular_col", spec, 1);
DRW_shgroup_uniform_short(shgrp, "hardness", &hardness, 1);
DRW_shgroup_call_add(shgrp, mat_geom[i], ob->obmat);
}
}
else {
DRWShadingGroup *shgrp = DRW_shgroup_create(e_data.default_lit, psl->default_pass);
DRW_shgroup_uniform_vec3(shgrp, "diffuse_col", &ma->r, 1);
DRW_shgroup_uniform_vec3(shgrp, "specular_col", &ma->specr, 1);
DRW_shgroup_uniform_short(shgrp, "hardness", &ma->har, 1);
DRW_shgroup_call_add(shgrp, mat_geom[i], ob->obmat);
}
}
}
else {
@@ -555,7 +588,6 @@ static void EEVEE_cache_populate(void *vedata, Object *ob)
eevee_cascade_shadow_shgroup(psl, stl, geom, ob->obmat);
eevee_cube_shadow_shgroup(psl, stl, geom, ob->obmat);
}
// GPUMaterial *gpumat = GPU_material_from_nodetree(struct bNodeTree *ntree, ListBase *gpumaterials, void *engine_type, int options)
// DRW_shgroup_call_add(stl->g_data->shadow_shgrp, geom, ob->obmat);

2
source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl
View File

@@ -26,7 +26,9 @@ layout(std140) uniform shadow_block {
};
in vec3 worldPosition;
in vec3 viewPosition;
in vec3 worldNormal;
in vec3 viewNormal;
/* type */
#define POINT 0.0

14
source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl
View File

@@ -1,16 +1,28 @@
uniform mat4 ModelViewProjectionMatrix;
uniform mat4 ModelMatrix;
uniform mat4 ModelViewMatrix;
uniform mat3 WorldNormalMatrix;
#ifndef ATTRIB
uniform mat3 NormalMatrix;
#endif
in vec3 pos;
in vec3 nor;
out vec3 worldPosition;
out vec3 viewPosition;
out vec3 worldNormal;
out vec3 viewNormal;
void main() {
gl_Position = ModelViewProjectionMatrix * vec4(pos, 1.0);
viewPosition = (ModelViewMatrix * vec4(pos, 1.0)).xyz;
worldPosition = (ModelMatrix * vec4(pos, 1.0)).xyz;
worldNormal = WorldNormalMatrix * nor;
viewNormal = normalize(NormalMatrix * nor);
worldNormal = normalize(WorldNormalMatrix * nor);
#ifdef ATTRIB
pass_attrib();
#endif
}