Correct macos build errors

This commit is contained in:
2019-07-11 21:26:45 -07:00
parent 22daa9eeea
commit f9e1304571

View File

@@ -732,7 +732,7 @@ void kraken::set_debug_text(const std::string &print_text)
-(void) setSunTemperature:(float)t -(void) setSunTemperature:(float)t
{ {
float i = [self getSunIntensity]; float i = [self getSunIntensity];
_settings.light_intensity = Vector3( _settings.light_intensity.init(
(t < 0.5f ? t * 2.0f : 1.0f) * i, (t < 0.5f ? t * 2.0f : 1.0f) * i,
(t < 0.5f ? t * 2.0f : (1.0f - t) * 2.0f) * i, (t < 0.5f ? t * 2.0f : (1.0f - t) * 2.0f) * i,
(t < 0.5f ? 1.0f : (1.0f - t) * 2.0f) * i (t < 0.5f ? 1.0f : (1.0f - t) * 2.0f) * i
@@ -742,7 +742,7 @@ void kraken::set_debug_text(const std::string &print_text)
-(void) setSunIntensity:(float)i -(void) setSunIntensity:(float)i
{ {
float t = [self getSunTemperature]; float t = [self getSunTemperature];
_settings.light_intensity = Vector3( _settings.light_intensity.init(
(t < 0.5f ? t * 2.0f : 1.0f) * i, (t < 0.5f ? t * 2.0f : 1.0f) * i,
(t < 0.5f ? t * 2.0f : (1.0f - t) * 2.0f) * i, (t < 0.5f ? t * 2.0f : (1.0f - t) * 2.0f) * i,
(t < 0.5f ? 1.0f : (1.0f - t) * 2.0f) * i (t < 0.5f ? 1.0f : (1.0f - t) * 2.0f) * i
@@ -778,7 +778,7 @@ void kraken::set_debug_text(const std::string &print_text)
-(void) setAmbientTemperature:(float)t -(void) setAmbientTemperature:(float)t
{ {
float i = [self getAmbientIntensity]; float i = [self getAmbientIntensity];
_settings.ambient_intensity = Vector3( _settings.ambient_intensity.init(
(t < 0.5f ? t * 2.0f : 1.0f) * i, (t < 0.5f ? t * 2.0f : 1.0f) * i,
(t < 0.5f ? t * 2.0f : (1.0f - t) * 2.0f) * i, (t < 0.5f ? t * 2.0f : (1.0f - t) * 2.0f) * i,
(t < 0.5f ? 1.0f : (1.0f - t) * 2.0f) * i (t < 0.5f ? 1.0f : (1.0f - t) * 2.0f) * i
@@ -788,7 +788,7 @@ void kraken::set_debug_text(const std::string &print_text)
-(void) setAmbientIntensity:(float)i -(void) setAmbientIntensity:(float)i
{ {
float t = [self getAmbientTemperature]; float t = [self getAmbientTemperature];
_settings.ambient_intensity = Vector3( _settings.ambient_intensity.init(
(t < 0.5f ? t * 2.0f : 1.0f) * i, (t < 0.5f ? t * 2.0f : 1.0f) * i,
(t < 0.5f ? t * 2.0f : (1.0f - t) * 2.0f) * i, (t < 0.5f ? t * 2.0f : (1.0f - t) * 2.0f) * i,
(t < 0.5f ? 1.0f : (1.0f - t) * 2.0f) * i (t < 0.5f ? 1.0f : (1.0f - t) * 2.0f) * i