diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-06-01 18:55:24 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-06-01 18:56:02 -0300 |
| commit | c03131fc9f7aef119f864cc266330855134feb62 (patch) | |
| tree | 5d6f3268548724e17a5d986118a9a2f7c4950dce /scene/resources | |
| parent | 5dd52320cb5f85cf9cab0be18bf105f46344200d (diff) | |
Rework shading modes and change location of light shader
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/material.cpp | 8 | ||||
| -rw-r--r-- | scene/resources/material.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 9184b86237..026b243b21 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -278,6 +278,12 @@ void SpatialMaterial::_update_shader() { case CULL_FRONT: code += ",cull_front"; break; case CULL_DISABLED: code += ",cull_disabled"; break; } + switch (diffuse_mode) { + case DIFFUSE_LAMBERT: code += ",diffuse_lambert"; break; + case DIFFUSE_HALF_LAMBERT: code += ",diffuse_half_lambert"; break; + case DIFFUSE_OREN_NAYAR: code += ",diffuse_oren_nayar"; break; + case DIFFUSE_BURLEY: code += ",diffuse_burley"; break; + } if (flags[FLAG_UNSHADED]) { code += ",unshaded"; @@ -1248,7 +1254,7 @@ void SpatialMaterial::_bind_methods() { BIND_CONSTANT(FLAG_MAX); BIND_CONSTANT(DIFFUSE_LAMBERT); - BIND_CONSTANT(DIFFUSE_LAMBERT_WRAP); + BIND_CONSTANT(DIFFUSE_HALF_LAMBERT); BIND_CONSTANT(DIFFUSE_OREN_NAYAR); BIND_CONSTANT(DIFFUSE_BURLEY); diff --git a/scene/resources/material.h b/scene/resources/material.h index f974db0aa7..f4d93da017 100644 --- a/scene/resources/material.h +++ b/scene/resources/material.h @@ -160,7 +160,7 @@ public: enum DiffuseMode { DIFFUSE_LAMBERT, - DIFFUSE_LAMBERT_WRAP, + DIFFUSE_HALF_LAMBERT, DIFFUSE_OREN_NAYAR, DIFFUSE_BURLEY, }; |