Add option to disable weather gloom and rain effects #4302

wolfreak99 · 2016-08-17T23:22:49Z

I've always hated the gloomy colours when it rains, I mean it's nice when not building anything, but if I'm designing something I want to be able to see it in its entirety but that will be addressed later. I've also noticed that when streaming, if it begins to rain it can add excessive noise to the video stream and distort the image. One could freeze the weather, but that will remove game logic such as plants getting watered, increase in umbrella sales, etc. This allows a user to disable the rendering of the weather gloom and effects while still keeping core gameplay normal.

For now this is not yet finished as I may consider adding that option to only disable gloom when in construction mode. I also noticed that VS merged changes in the solution and project user file, which I need to remove. But for now I'm posting this commit (via phone) because I'm not sure when I will have time to get on my computer again (swing shift jobs suck), and this can get some feedback in the meantime.

Gymnasiast · 2016-08-18T11:06:05Z

src/interface/viewport.c

@@ -768,7 +768,7 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
 		paint_quadrant_ps();

 		int weather_colour = WeatherColours[gClimateCurrentWeatherGloom];
-		if ((weather_colour != -1) && (!(gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES)) && (!(RCT2_GLOBAL(0x9DEA6F, uint8) & 1))){
+		if ((weather_colour != -1) && (!(gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES)) && (!(RCT2_GLOBAL(0x9DEA6F, uint8) & 1)) && gConfigGeneral.render_weather_gloom){


This if statement would better be spread out over multiple lines to increase legibility.

Gymnasiast · 2016-08-18T11:06:59Z

Hm, I can understand the gloom option, but the weather effects?
Apart from this and the line note I left, it looks decent.

Ryder17z · 2016-08-18T11:12:54Z

I think it's because of video compression

On Thu, Aug 18, 2016, 13:07 Michael Steenbeek notifications@github.com
wrote:

Hm, I can understand the gloom option, but the weather effects?
Apart from this and the line note I left, it looks decent.

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#4302 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AB6HP_u_rM1vsgKML7F4W3OVKyV32_RIks5qhDzUgaJpZM4Jm_JW
.

AaronVanGeffen · 2016-08-18T11:12:59Z

Weather effects tend to have a bad effect on stream quality.

Gymnasiast · 2016-08-18T11:39:21Z

Ah, that's a good reason. :)

(Yay, a Tom Scott link :D )

Still, does this need to be split, though? I'd say one toggle would suffice.

wolfreak99 · 2016-08-20T22:20:29Z

I have some ideas in mind and have been meaning to respond to the comments but this week I've been working more than usual so i haven't had a chance. I sincerely apologize for such delay.

Gymnasiast · 2016-08-31T06:51:35Z

Could you rebase this?

wolfreak99 · 2016-09-02T15:41:04Z

Okay so I've rebased it and broke the long line (and following long line) for readability sake. it looks a little funky to me so let me know if i can improve the formatting. As far as making the option into one, i've still kept the config file with 2 options, while the in game interface displays one option. this allows power users to adjust if they wish to disable rain but keep gloom (say, someone streaming and they want to show some effect that it's raining).. But I'm not sure on weather this will be okay with everyone. I can see where it would be a bit hogging in the interface, but as far as config options, it's probably not something that's viewed as often

I'm also curious on thoughts of making an indented option to allow effects/gloom to be disabled only if in construction mode.

Gymnasiast · 2016-09-03T07:16:40Z

src/interface/viewport.c

@@ -768,13 +768,24 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
 		paint_quadrant_ps();

 		int weather_colour = WeatherColours[gClimateCurrentWeatherGloom];
-		if ((weather_colour != -1) && (!(gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES)) && (!(RCT2_GLOBAL(0x9DEA6F, uint8) & 1))){
-			gfx_fill_rect(dpi2, dpi2->x, dpi2->y, dpi2->width + dpi2->x - 1, dpi2->height + dpi2->y - 1, weather_colour);
+		if ((weather_colour != -1) 


There should be a newline between the two left parentheses.

Gymnasiast · 2016-09-03T07:38:01Z

Seems to work. 👍
Some things I'd like to see changed:

I left some notes about formatting
I think disabling weather effects should imply disabling lightning effects as well, as lightning is a subset of weather. I would therefore put the checkbox of the lightning effect indented under that of weather effects, disable it when weather effects are disabled, and only render lightning when both options are on.

AaronVanGeffen · 2016-09-03T07:48:22Z

I think disabling weather effects should imply disabling lightning effects as well, as lightning is a subset of weather. I would therefore put the checkbox of the lightning effect indented under that of weather effects, disable it when weather effects are disabled, and only render lightning when both options are on.

I'm not sure they should be. One of the reasons for disabling the weather effects is the effect they have on streaming quality, which, sure, the lightning effect likely also has a detrimental effect on. However, non-streamers may like to disable just the lightning effect, as it may trigger epileptic seizures. I believe this was the main reason it was introduced to begin with.

Therefore, I think these options shouldn't be intertwined.

Gymnasiast · 2016-09-03T09:00:46Z

Uhm, you can still disable only the lighting effects under my plans. What you can't do is turn weather effects off and leave lightning on.

AaronVanGeffen · 2016-09-03T10:31:25Z

My point exactly. Why take away rain if you don't have to?

Gymnasiast · 2016-09-03T10:34:44Z

I think you still don't get what I mean. Under my plans you can either have rain and lightning, rain and no lightning, or no rain and no lightning.

AaronVanGeffen · 2016-09-03T11:35:09Z

Right, I understand that. My point is that under what you propose, you will not be able to have rain enabled while lightning is disabled. This, too, is a valid use case.

wolfreak99 · 2016-09-03T11:43:39Z

Gymnasiast is assuming this checkbox will say "disable rain", but it says "render rain", but i'll switch this around and see if i can't recreate what he's talking about. if not, then i'd propose we go back to a dropdown where it'd allow you to disable lightning, gloom, and raindrops all individually with no restriction.

Gymnasiast · 2016-09-19T20:26:17Z

src/world/climate.c

@@ -296,15 +296,14 @@ static void climate_update_thunder_sound()

 static void climate_update_lightning()
 {
-	if (_lightningTimer == 0)
+	if (_lightningTimer == 0 || gConfigGeneral.disable_lightning_effect || 
+		(!gConfigGeneral.render_weather_effects && !gConfigGeneral.render_weather_gloom))


Change this check to:

if (_lightningTimer == 0 || gConfigGeneral.disable_lightning_effect || !gConfigGeneral.render_weather_effects)

@Gymnasiast .. :/ do i have to? the way it is currently done would benefit the power users who use the ini file, as the in game interface toggles both effects and gloom at the same time (under the disguise as weather effects), where as if someone manually edits the file, i'm sure they'll explicitly want lightning to show if they set it to show. i'd really like if this part stays an exception, unless theres a legit clear reasoning towards the change.

Hm, alright, let's leave it as it is now, then.

@Gymnasiast thanks! I also rebased this as well.

Gymnasiast · 2016-09-19T20:27:52Z

Sorry for the long delay.

I have left a line note. In addition to that, could you rebase as well?

suggestion) Interpreting Gymnasiast part 2

Formatting improvement pt 2

Broxzier · 2016-09-23T08:56:20Z

distribution/changelog.txt

@@ -8,7 +9,7 @@
 - Feature: Add ride console command for diagnostics and changing vehicle type.
 - Feature: Allow selecting corners when using the mountain tool.
 - Feature: Allow setting ownership of map edges.
- Feature: Allow up to 255 cars per train.
+- Feature: Allow up to 255 cars per train and 32 track units per station


This comes from another PR, maybe you made a mistake while rebasing?

that was just something i noticed wasn't added into the changelog back when it was implemented. I should probably make that a seperate pull request.

Nubbie · 2016-10-03T09:54:12Z

Have no idea if it's just me who gets this (new computer etc so much is different) but there is a huge spacing in between the boarder and text ~~+ the checkbox gets auto ticked when disabling the 'Render weather effect', something that should just be grayed out and left in the setting it were before~~

Edit: New computer - Little Time

Gymnasiast · 2016-10-03T10:25:34Z

If you had read the conversation, you'd know why the checkbox is checked when disabling weather effects.

wolfreak99 · 2016-10-03T12:12:09Z

i figured that would cause confusion tbh, that's why i was weary about doing it.

IntelOrca · 2016-10-03T12:16:12Z

"Disable lightning effect" probably should have been "Render lightning effect". Then it would be common sense that not rendering any weather effects would not render the lightning effect thus not requiring the setting to change value.

wolfreak99 · 2016-10-04T11:26:05Z

Should I patch it to say render? If I do, would I just change the text and not the setting variable name (and make the in game interface just act as a reverse option?) ? Or should I trash disable_lightning_effect and put in render_lightning_effect?

Gymnasiast · 2016-10-04T11:53:31Z

I don't think it's really worth the effort.

wolfreak99 force-pushed the render_rain_toggle branch 2 times, most recently from 47e69b7 to e325f59 Compare August 18, 2016 08:03

Gymnasiast reviewed Aug 18, 2016
View reviewed changes

duncanspumpkin force-pushed the develop branch from 2e9e6c1 to 8ffe0fb Compare August 22, 2016 20:09

wolfreak99 force-pushed the render_rain_toggle branch from d4ff2c9 to 7126326 Compare September 1, 2016 08:38

Gymnasiast added pending review testing required PR needs to be tested before it is merged. labels Sep 1, 2016

Gymnasiast force-pushed the develop branch from 0793b0a to dd7bfdc Compare September 1, 2016 20:49

wolfreak99 force-pushed the render_rain_toggle branch 2 times, most recently from c528f9e to 10d66f9 Compare September 2, 2016 15:31

Gymnasiast reviewed Sep 3, 2016
View reviewed changes

Gymnasiast added pending improvement and removed pending review testing required PR needs to be tested before it is merged. labels Sep 3, 2016

Gymnasiast added this to the v0.0.5 - fourth stable milestone Sep 13, 2016

Gymnasiast reviewed Sep 19, 2016

View reviewed changes

Gymnasiast added pending improvement pending rebase PR needs to be rebased. and removed pending review testing required PR needs to be tested before it is merged. labels Sep 19, 2016

wolfreak99 added 5 commits September 21, 2016 10:35

Add option to disable weather gloom and rain effects

c60396c

Break long lines for readability

98eb272

Make lightning disabled while weather effects are disabled (Gymnasiast

ce85e0e

suggestion) Interpreting Gymnasiast part 2

Formatting improvements

c8714b7

Formatting improvement pt 2

auto-disable lightning without modifying config.

9a708cd

wolfreak99 force-pushed the render_rain_toggle branch from 51fcae0 to 9a708cd Compare September 21, 2016 14:47

Gymnasiast added pending review testing required PR needs to be tested before it is merged. and removed pending improvement pending rebase PR needs to be rebased. labels Sep 23, 2016

Broxzier reviewed Sep 23, 2016

View reviewed changes

Remove unrelated changelog modification

b7212d3

Gymnasiast merged commit a170eeb into OpenRCT2:develop Sep 24, 2016

Gymnasiast removed pending review testing required PR needs to be tested before it is merged. labels Sep 24, 2016

octaroot mentioned this pull request Oct 2, 2016

Strings 5920-5921 OpenRCT2/Localisation#903

Closed

13 tasks

wolfreak99 deleted the render_rain_toggle branch November 5, 2016 05:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add option to disable weather gloom and rain effects #4302

Add option to disable weather gloom and rain effects #4302

wolfreak99 commented Aug 17, 2016

Gymnasiast Aug 18, 2016

Gymnasiast commented Aug 18, 2016

Ryder17z commented Aug 18, 2016

AaronVanGeffen commented Aug 18, 2016

Gymnasiast commented Aug 18, 2016 •

edited

Loading

wolfreak99 commented Aug 20, 2016

Gymnasiast commented Aug 31, 2016

wolfreak99 commented Sep 2, 2016

Gymnasiast Sep 3, 2016

Gymnasiast commented Sep 3, 2016

AaronVanGeffen commented Sep 3, 2016

Gymnasiast commented Sep 3, 2016

AaronVanGeffen commented Sep 3, 2016

Gymnasiast commented Sep 3, 2016

AaronVanGeffen commented Sep 3, 2016

wolfreak99 commented Sep 3, 2016

Gymnasiast Sep 19, 2016

wolfreak99 Sep 20, 2016 •

edited

Loading

Gymnasiast Sep 22, 2016

wolfreak99 Sep 23, 2016

Gymnasiast commented Sep 19, 2016

Broxzier Sep 23, 2016

wolfreak99 Sep 23, 2016

Nubbie commented Oct 3, 2016 •

edited

Loading

Gymnasiast commented Oct 3, 2016

wolfreak99 commented Oct 3, 2016

IntelOrca commented Oct 3, 2016 •

edited

Loading

wolfreak99 commented Oct 4, 2016

Gymnasiast commented Oct 4, 2016

Add option to disable weather gloom and rain effects #4302

Add option to disable weather gloom and rain effects #4302

Conversation

wolfreak99 commented Aug 17, 2016

Gymnasiast Aug 18, 2016

Choose a reason for hiding this comment

Gymnasiast commented Aug 18, 2016

Ryder17z commented Aug 18, 2016

AaronVanGeffen commented Aug 18, 2016

Gymnasiast commented Aug 18, 2016 • edited Loading

wolfreak99 commented Aug 20, 2016

Gymnasiast commented Aug 31, 2016

wolfreak99 commented Sep 2, 2016

Gymnasiast Sep 3, 2016

Choose a reason for hiding this comment

Gymnasiast commented Sep 3, 2016

AaronVanGeffen commented Sep 3, 2016

Gymnasiast commented Sep 3, 2016

AaronVanGeffen commented Sep 3, 2016

Gymnasiast commented Sep 3, 2016

AaronVanGeffen commented Sep 3, 2016

wolfreak99 commented Sep 3, 2016

Gymnasiast Sep 19, 2016

Choose a reason for hiding this comment

wolfreak99 Sep 20, 2016 • edited Loading

Choose a reason for hiding this comment

Gymnasiast Sep 22, 2016

Choose a reason for hiding this comment

wolfreak99 Sep 23, 2016

Choose a reason for hiding this comment

Gymnasiast commented Sep 19, 2016

Broxzier Sep 23, 2016

Choose a reason for hiding this comment

wolfreak99 Sep 23, 2016

Choose a reason for hiding this comment

Nubbie commented Oct 3, 2016 • edited Loading

Gymnasiast commented Oct 3, 2016

wolfreak99 commented Oct 3, 2016

IntelOrca commented Oct 3, 2016 • edited Loading

wolfreak99 commented Oct 4, 2016

Gymnasiast commented Oct 4, 2016

Gymnasiast commented Aug 18, 2016 •

edited

Loading

wolfreak99 Sep 20, 2016 •

edited

Loading

Nubbie commented Oct 3, 2016 •

edited

Loading

IntelOrca commented Oct 3, 2016 •

edited

Loading