diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-10-27 11:50:26 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-10-27 11:50:26 -0300 |
commit | 53d8f2b1ec1d86b189800b7fe156c464fdf9e380 (patch) | |
tree | a86ac6591239fd58193701419750bdfac3d89417 /scene/3d/particles.cpp | |
parent | cb34b70df13ad9f7942b0c363edc71cfd417bb21 (diff) | |
download | redot-engine-53d8f2b1ec1d86b189800b7fe156c464fdf9e380.tar.gz |
PBR more or less working, still working on bringing gizmos back
Diffstat (limited to 'scene/3d/particles.cpp')
-rw-r--r-- | scene/3d/particles.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp index 994e329853..1e18ba2c79 100644 --- a/scene/3d/particles.cpp +++ b/scene/3d/particles.cpp @@ -319,10 +319,10 @@ RES Particles::_get_gizmo_geometry() const { Ref<SurfaceTool> surface_tool( memnew( SurfaceTool )); - Ref<FixedMaterial> mat( memnew( FixedMaterial )); + Ref<FixedSpatialMaterial> mat( memnew( FixedSpatialMaterial )); - mat->set_parameter( FixedMaterial::PARAM_DIFFUSE,Color(0.0,0.6,0.7,0.2) ); - mat->set_parameter( FixedMaterial::PARAM_EMISSION,Color(0.5,0.7,0.8) ); + mat->set_parameter( FixedSpatialMaterial::PARAM_DIFFUSE,Color(0.0,0.6,0.7,0.2) ); + mat->set_parameter( FixedSpatialMaterial::PARAM_EMISSION,Color(0.5,0.7,0.8) ); mat->set_blend_mode( Material::BLEND_MODE_ADD ); mat->set_flag(Material::FLAG_DOUBLE_SIDED,true); // mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true); @@ -382,9 +382,9 @@ RES Particles::_get_gizmo_geometry() const { Ref<Mesh> mesh = surface_tool->commit(); - Ref<FixedMaterial> mat_aabb( memnew( FixedMaterial )); + Ref<FixedSpatialMaterial> mat_aabb( memnew( FixedSpatialMaterial )); - mat_aabb->set_parameter( FixedMaterial::PARAM_DIFFUSE,Color(0.8,0.8,0.9,0.7) ); + mat_aabb->set_parameter( FixedSpatialMaterial::PARAM_DIFFUSE,Color(0.8,0.8,0.9,0.7) ); mat_aabb->set_line_width(3); mat_aabb->set_flag( Material::FLAG_UNSHADED, true ); |