Droog71
/
oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjusted the specular BRDF to be more physically compliant and increased slightly the default gloss values in shipdata to compensate for the change.

master
AnotherCommander 2018-08-22 08:48:50 +02:00
parent 23af0abaa6
commit 8b8cb27195
2 changed files with 99 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
Resources/Config/shipdata.plist
View File

@ -128,7 +128,7 @@
"Hull" =
{
diffuse_map = "oolite_adder_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -183,7 +183,7 @@
{
"oolite_alloy_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.3, 0.4, 0.4);
shininess = 52;
@ -303,7 +303,7 @@
"Hull" =
{
diffuse_map = "oolite_anaconda_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -316,7 +316,7 @@
"Engine" =
{
diffuse_map = "oolite_anaconda_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -329,7 +329,7 @@
"Gun" =
{
diffuse_map = "oolite_anaconda_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -469,7 +469,7 @@
"Hull" =
{
diffuse_map = "oolite_asp_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -482,7 +482,7 @@
"Gun" =
{
diffuse_map = "oolite_asp_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -555,7 +555,7 @@
{
"oolite_asteroid_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 29;
specular_color = (0.3, 0.3, 0.3, 1.0);
@ -583,7 +583,7 @@
{
"oolite_alt_asteroid_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 29;
specular_color = (0.3, 0.3, 0.3, 1.0);
@ -614,7 +614,7 @@
"Hull" =
{
diffuse_map = "oolite_barrel_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 60;
@ -726,7 +726,7 @@
"Hull" =
{
diffuse_map = "oolite_boa_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -736,7 +736,7 @@
"Engine" =
{
diffuse_map = "oolite_boa_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -885,7 +885,7 @@
"Hull" =
{
diffuse_map = "oolite_boa-mk2_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -899,7 +899,7 @@
{
diffuse_map = "oolite_boa-mk2_subents.png";
specular_color = ( 0.2, 0.2, 0.2 );
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 42;
emission_map =
@ -968,7 +968,7 @@
{
"oolite_boulder_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 29;
specular_color = (0.3, 0.3, 0.3, 1.0);
@ -996,7 +996,7 @@
{
"oolite_alt_boulder_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 29;
specular_color = (0.3, 0.3, 0.3, 1.0);
@ -1031,7 +1031,7 @@
{
"target_metal.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 60;
specular_color = (0.8, 0.83, 0.85, 1.0);
@ -1097,7 +1097,7 @@
{
"target_metal.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 49;
specular_color = (0.55, 0.58, 0.6, 1.0);
@ -1143,7 +1143,7 @@
"Hull" =
{
diffuse_map = "oolite_barrel2_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -1250,7 +1250,7 @@
{
diffuse_map = "oolite_cobra3_diffuse.png";
specular_color = ( 0.2, 0.2, 0.2 );
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 42;
emission_map = { name = "oolite_cobra3_diffuse.png"; extract_channel = "a"; };
@ -1258,7 +1258,7 @@
};
"Gun" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
diffuse_map = "oolite_cobra3_subents.png";
specular_color = ( 0.2, 0.2, 0.2 );
@ -1307,7 +1307,7 @@
"Hull" =
{
diffuse_map = "oolite_cobra3_diffuse_alt.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -1320,7 +1320,7 @@
"Gun" =
{
diffuse_map = "oolite_cobra3_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -1344,7 +1344,7 @@
"Hull" =
{
diffuse_map = "oolite_cobra3_diffuse_pirate.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -1357,7 +1357,7 @@
"Gun" =
{
diffuse_map = "oolite_cobra3_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -1461,7 +1461,7 @@
"Hull" =
{
diffuse_map = "oolite_cobramk1_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -1510,7 +1510,7 @@
"Hull" =
{
diffuse_map = "oolite_cobramk1_diffuse_alt.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -1536,7 +1536,7 @@
"Hull" =
{
diffuse_map = "oolite_cobramk1_diffuse_miner.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -1580,7 +1580,7 @@
"Hull" =
{
diffuse_map = "oolite_constrictor_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -1590,7 +1590,7 @@
"Engine" =
{
diffuse_map = "oolite_constrictor_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -1638,7 +1638,7 @@
"oolite_coriolis_diffuse.png" =
{
specular_color = ( 0.2, 0.2, 0.2 );
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 42;
emission_map =
@ -1817,7 +1817,7 @@
{
"oolite_dodo_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 ); // Applies when specular map is not used (no shaders)
shininess = 42;
@ -1981,7 +1981,7 @@
"Hull" =
{
diffuse_map = "oolite_missile_hardhead_diffuse.png";
gloss = 0.5;
gloss = 0.65;
ior = 2.16;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 65;
@ -2022,7 +2022,7 @@
"Hull" =
{
diffuse_map = "oolite_escape_capsule_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2137,7 +2137,7 @@
"Hull" =
{
diffuse_map = "oolite_ferdelance_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2150,7 +2150,7 @@
"Engine" =
{
diffuse_map = "oolite_ferdelance_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.6, 0.5, 0.5 );
shininess = 29;
@ -2211,7 +2211,7 @@
"Hull" =
{
diffuse_map = "oolite_gecko_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2224,7 +2224,7 @@
"Gun" =
{
diffuse_map = "oolite_gecko_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.6, 0.5, 0.5 );
shininess = 29;
@ -2269,7 +2269,7 @@
{
"oolite_ico_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 ); // Applies when specular map is not used (no shaders)
shininess = 42;
@ -2448,7 +2448,7 @@
"Hull" =
{
diffuse_map = "oolite_krait_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2519,7 +2519,7 @@
"Hull" =
{
diffuse_map = "oolite_mamba_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2532,7 +2532,7 @@
"Gun" =
{
diffuse_map = "oolite_mamba_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.6, 0.5, 0.5 );
shininess = 40;
@ -2566,7 +2566,7 @@
"Hull" =
{
diffuse_map = "oolite_mamba_diffuse_escort.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2579,7 +2579,7 @@
"Gun" =
{
diffuse_map = "oolite_mamba_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.6, 0.5, 0.5 );
shininess = 40;
@ -2602,7 +2602,7 @@
"Hull" =
{
diffuse_map = "oolite_missile_diffuse.png";
gloss = 0.5;
gloss = 0.62;
ior = 2.16;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 60;
@ -2715,7 +2715,7 @@
"Hull" =
{
diffuse_map = "oolite_moray_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2728,7 +2728,7 @@
"Engine" =
{
diffuse_map = "oolite_moray_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2780,7 +2780,7 @@
"Hull" =
{
diffuse_map = "oolite_moray_diffuse_med.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2793,7 +2793,7 @@
"Engine" =
{
diffuse_map = "oolite_moray_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2817,7 +2817,7 @@
"Hull" =
{
diffuse_map = "oolite_moray_diffuse_med.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2830,7 +2830,7 @@
"Engine" =
{
diffuse_map = "oolite_moray_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2935,7 +2935,7 @@
"Hull" =
{
diffuse_map = "oolite_python_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2945,7 +2945,7 @@
"Engine" =
{
diffuse_map = "oolite_python_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -2958,7 +2958,7 @@
"Gun" =
{
diffuse_map = "oolite_python_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -3004,7 +3004,7 @@
"Hull" =
{
diffuse_map = "oolite_python_diffuse_blackdog.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -3017,7 +3017,7 @@
"Engine" =
{
diffuse_map = "oolite_python_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -3030,7 +3030,7 @@
"Gun" =
{
diffuse_map = "oolite_python_subents.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -3054,7 +3054,7 @@
"Hull" =
{
diffuse_map = "oolite_python_diffuse_trader.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -3064,7 +3064,7 @@
"Engines" =
{
diffuse_map = "oolite_python_subents_trader.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -3099,7 +3099,7 @@
"Hull" =
{
diffuse_map = "oolite_python_diffuse_trader.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -3109,7 +3109,7 @@
"Engines" =
{
diffuse_map = "oolite_python_subents_trader.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -3207,7 +3207,7 @@
{
"oolite_rock_hermit_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -3389,7 +3389,7 @@
"oolite_alloy_diffuse.png" =
{
diffuse_map = "oolite_alloy_diffuse_scarred.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.3, 0.4, 0.4);
shininess = 52;
@ -3419,7 +3419,7 @@
"Hull" =
{
diffuse_map = "oolite_shuttle_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -3475,7 +3475,7 @@
"Hull" =
{
diffuse_map = "oolite_sidewinder_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -3514,7 +3514,7 @@
"Hull" =
{
diffuse_map = "oolite_sidewinder_diffuse_escort.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 40;
@ -3544,7 +3544,7 @@
{
"oolite_splinter_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 29;
specular_color = (0.3, 0.3, 0.3, 1.0);
@ -3585,7 +3585,7 @@
"Hull" =
{
diffuse_map = "oolite_thargon_diffuse.png";
gloss = 0.42;
gloss = 0.58;
ior = 2.95;
specular_color = (0.5, 0.9, 0.3);
shininess = 49;
@ -3632,7 +3632,7 @@
"Hull" =
{
diffuse_map = "oolite_thargoid_diffuse.png";
gloss = 0.42;
gloss = 0.58;
ior = 2.95;
specular_color = (0.2, 0.3, 0.2);
shininess = 49;
@ -3676,7 +3676,7 @@
"Hull" =
{
diffuse_map = "oolite_transporter_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -3714,7 +3714,7 @@
"Hull" =
{
diffuse_map = "oolite_transporter_diffuse_miner.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -3748,7 +3748,7 @@
"Hull" =
{
diffuse_map = "oolite_viper_diffuse.png";
gloss = 0.4;
gloss = 0.55;
ior = 2.95;
specular_color = (0.3, 0.3, 0.3 );
shininess = 45;
@ -3761,7 +3761,7 @@
"Engine" =
{
diffuse_map = "oolite_viper_diffuse.png";
gloss = 0.4;
gloss = 0.55;
ior = 2.95;
specular_color = (0.6, 0.5, 0.5 );
shininess = 45;
@ -3889,7 +3889,7 @@
"Hull" =
{
diffuse_map = "oolite_viper_interceptor_diffuse.png";
gloss = 0.4;
gloss = 0.55;
ior = 2.95;
specular_color = (0.3, 0.3, 0.3);
shininess = 45;
@ -3902,7 +3902,7 @@
"Engine" =
{
diffuse_map = "oolite_viper_interceptor_diffuse.png";
gloss = 0.4;
gloss = 0.55;
ior = 2.95;
specular_color = ( 0.3, 0.3, 0.3 );
shininess = 45;
@ -4015,7 +4015,7 @@
"Hull" =
{
diffuse_map = "oolite_viper_diffuse_pursuit.png";
gloss = 0.4;
gloss = 0.55;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 45;
@ -4028,7 +4028,7 @@
"Engine" =
{
diffuse_map = "oolite_viper_diffuse_pursuit.png";
gloss = 0.4;
gloss = 0.55;
ior = 2.95;
specular_color = (0.6, 0.5, 0.5 );
shininess = 45;
@ -4064,7 +4064,7 @@
"Hull" =
{
diffuse_map = "oolite_worm_diffuse.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -4108,7 +4108,7 @@
"Hull" =
{
diffuse_map = "oolite_worm_diffuse_miner.png";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = (0.2, 0.2, 0.2);
shininess = 42;
@ -4537,14 +4537,14 @@
{
"back_metal.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 49;
specular_color = (0.75, 0.75, 0.75, 1.0);
};
"oolite-ball-turret.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 49;
specular_color = (0.75, 0.75, 0.75, 1.0);
@ -4609,7 +4609,7 @@
{
"oolite_coriolis_faceplate_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 ); // Applies when specular map is not used (no shaders)
shininess = 42;
@ -4632,7 +4632,7 @@
"oolite_coriolis_tris_diffuse.png" =
{
specular_color = ( 0.2, 0.2, 0.2 ); // Applies when specular map is not used (no shaders)
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 42;
emission_map =
@ -4654,7 +4654,7 @@
"oolite_coriolis_dock_diffuse.png" =
{
specular_color = ( 0.2, 0.2, 0.2 ); // Applies when specular map is not used (no shaders)
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 42;
emission_map =
@ -4677,7 +4677,7 @@
"oolite_dodo_faceplate_diffuse.png" =
{
specular_color = ( 0.2, 0.2, 0.2 ); // Applies when specular map is not used (no shaders)
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 42;
emission_map =
@ -4699,7 +4699,7 @@
"oolite_dodo_dock_diffuse.png" =
{
specular_color = ( 0.2, 0.2, 0.2 ); // Applies when specular map is not used (no shaders)
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 42;
emission_map =
@ -4724,7 +4724,7 @@
"oolite_ico_hull_diffuse.png" =
{
specular_color = ( 0.2, 0.2, 0.2 ); // Applies when specular map is not used (no shaders)
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 42;
emission_map =
@ -4746,7 +4746,7 @@
"oolite_ico_dock_diffuse.png" =
{
specular_color = ( 0.2, 0.2, 0.2 ); // Applies when specular map is not used (no shaders)
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
shininess = 42;
emission_map =
@ -4766,7 +4766,7 @@
{
"oolite_rock_hermit_rock_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -4782,7 +4782,7 @@
{
"oolite_rock_hermit_pipes_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -4804,7 +4804,7 @@
{
"oolite_rock_hermit_tunnel_extras_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -4826,7 +4826,7 @@
{
"oolite_rock_hermit_dock_diffuse.png" =
{
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
specular_color = ( 0.2, 0.2, 0.2 );
shininess = 42;
@ -4874,7 +4874,7 @@
{
diffuse_color = "42 40 40";
diffuse_map = "";
gloss = 0.375;
gloss = 0.5;
ior = 2.95;
emission_color = "200 175 25";
shininess = 52;

9
Resources/Shaders/oolite-default-shader.fragment
View File

@ -207,11 +207,11 @@ vec3 CalcSpecularGGX(vec3 light, vec3 normal, vec3 halfVec, vec3 view, float glo
float alphaPrime = roughness + 1.0f;
float k = alphaPrime * alphaPrime / 8.0f;
float g1vNL = 1.0f / (NdotL * (1.0f - k) + k);
float g1vNV = 1.0f / (NdotV * (1.0f - k) + k);
float g1vNL = NdotL/ (NdotL * (1.0f - k) + k);
float g1vNV = NdotV / (NdotV * (1.0f - k) + k);
float visibility = g1vNL * g1vNV;
return distribution * fresnel * visibility * NdotL;
return distribution * fresnel * visibility * NdotL / max(4.0 * NdotL * NdotV, 0.001f);
}
@ -382,6 +382,9 @@ void main(void)
#endif
// light energy conservation here
// normally we would want to use the full fresnel term here, i.e.:
// float fresnelTerm = f0 + (1.0 - f0) * pow(1.0 - clamp(dot(lightVector, halfVector), 0.0, 1.0), 5.0);
// but f0 is already available and is close enough
totalColor += (ambientColor * ambientLight + diffuseColor * diffuseLight) * (1.0 - f0);
#if OOSTD_SPECULAR
totalColor += specularColor * specularLight;