godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10194 from Keetz/update-default-values 

Updated default values in SpatialMaterial and Environment
This commit is contained in:
Rémi Verschelde 2017-08-11 10:39:12 +02:00 committed by GitHub
parent f67a8d715c 141aac48ff
commit b47e6c0dba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/environment.cpp
View File

@ -1140,7 +1140,7 @@ Environment::Environment() {
bg_energy = 1.0; bg_energy = 1.0;
bg_canvas_max_layer = 0; bg_canvas_max_layer = 0;
ambient_energy = 1.0; ambient_energy = 1.0;
ambient_sky_contribution = 0; ambient_sky_contribution = 1.0;
tone_mapper = TONE_MAPPER_LINEAR; tone_mapper = TONE_MAPPER_LINEAR;
tonemap_exposure = 1.0; tonemap_exposure = 1.0;

4
scene/resources/material.cpp
View File

@ -1805,10 +1805,10 @@ SpatialMaterial::SpatialMaterial()
: element(this) { : element(this) {
//initialize to right values //initialize to right values
set_albedo(Color(0.7, 0.7, 0.7, 1.0)); set_albedo(Color(1.0, 1.0, 1.0, 1.0));
set_specular(0.5); set_specular(0.5);
set_roughness(0.0); set_roughness(0.0);
set_metallic(0.1); set_metallic(0.0);
set_emission(Color(0, 0, 0)); set_emission(Color(0, 0, 0));
set_emission_energy(1.0); set_emission_energy(1.0);
set_normal_scale(1); set_normal_scale(1);