[WIP] Basic pause menu settings #6965

ThomasMonroe314 · 2018-01-25T01:01:14Z

This is a work in progress of issue #6722

Please give suggestions for settings you would like to see in #6722

WIP Screenshots(will be updated as work gets done):

paramat · 2018-01-25T13:14:02Z

The minimum normal FOV allowable needs to be tuned to avoid normal FOV being treated as a zoom and triggering the loading of distant world.

paramat · 2018-01-25T14:59:38Z

src/camera.cpp

@@ -457,6 +457,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, f32 tool_r
 		fov_degrees = player->getZoomFOV();
 	} else {
 		fov_degrees = m_cache_fov;
+		//if the callback(see line 63) gets added then this won't need to be here.
+		m_cache_fov = g_settings->getFloat("fov");


I guess this is temporary as we can't fetch this from settings this often.

right, all it needs to do is be able to be reset when the FOV gets changed, but as there is no callback yet, this has to be here. As far as I have checked, it doesn't affect my performance at all.

The performance impact is probably not very noticeable, but these small efforts add up.

true, which is why the callbacks would need to be added

ThomasMonroe314 · 2018-01-26T14:06:34Z

@paramat I got the fov to use a callback 😃

paramat · 2018-01-26T16:12:50Z

Enabling fog doesn't need to be in an in-game menu because we have F3 for that, neither does enable 3D clouds, that is something a user sets very rarely.

paramat · 2018-01-26T16:17:59Z

Or fast mode, there is a key for that.

ThomasMonroe314 · 2018-01-26T20:24:08Z

@paramat the reason I added fast, fly, etc is because a server owner asked if it would be possible because they are getting tired of explaining exactly how to go fast, fly, etc step-by-step.

ThomasMonroe314 · 2018-01-26T20:41:18Z

@TekhnaeRaav I would like the feature discussion to be on #6722 while the code gets discussed here

paramat · 2018-01-26T21:22:48Z

the reason I added fast, fly, etc is because a server owner asked if it would be possible because they are getting tired of explaining exactly how to go fast, fly, etc step-by-step.

From IRC this refers to touchscreens:

20:48 ThomasMonroe paramat I added fast, fly, and noclip because of a convo I had with aerozoic in which he said:
20:48 ThomasMonroe [08:15:56] �<�aerozoic�>�� I've had to explain fast/fly/noclip to so many people on touch screens and they can never find it.

I'm not sure what controls Android users have access to, and i suggest we wait for discussion of Android controls before adding them in this PR. So for this PR i suggest only being concerned about desktop MT.

This still stands so i am 👎 for now:

Enabling fog doesn't need to be in an in-game menu because we have F3 for that, neither does enable 3D clouds, that is something a user sets very rarely.

'enable build where you stand' might be justified if builders need to switch often between those modes while building, @Sokomine

paramat · 2018-01-26T21:30:38Z

IRC:
21:16 Wayward_One noclip, fast, fly, f5, and f7 are all available on android by pressing the gear icon on the right of the screen.

So no need for those. Any new controls added for Android could be added to that 'gear' menu.
Please keep this PR for desktop only.

ThomasMonroe314 · 2018-01-26T23:16:50Z

Ok I will do that

paramat · 2018-01-28T15:36:55Z

Why are 'fall bobbing' and 'view bobbing' present in the code changes?

ThomasMonroe314 · 2018-01-28T21:59:32Z

erm idk, I think I just did all of them XD

Wuzzy2 · 2018-01-29T08:17:55Z

The minimum normal FOV allowable needs to be larger than 1.775 / 2 radians

Does the engine actively prevent this from happening, even if set in minetest.conf? Or is it currently just a GUI thing?

paramat · 2018-01-29T16:07:41Z

It might be better to make the minimum FOV 55 or 60 degrees because 51 is a weird number.

ThomasMonroe314 · 2018-01-29T17:02:56Z

I agree, 51 is kind of odd

paramat · 2018-01-30T18:53:54Z

We have a key for autoforward already.
'build where you stand' needs to be discussed, i don't see a good reason for it, even Sokomine who added the setting and relies on it doesn't see much need for it to be changed in-game.

How about just adding FOV for now?

ThomasMonroe314 · 2018-01-30T20:48:20Z

ok, sounds good to me, as I already re-adjusted the files to make it easier to add new settings.

red-001 · 2018-01-30T22:44:26Z

src/camera.cpp

@@ -40,6 +40,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define WIELDMESH_OFFSET_X 55.0f
 #define WIELDMESH_OFFSET_Y -35.0f

+void Camera::onSettingsChange(const std::string &name){
+	if (name == "fov"){


brace removal in this whole block.

red-001 · 2018-01-30T22:45:37Z

src/camera.h

@@ -165,6 +168,8 @@ class Camera
 	void drawNametags();

 	inline void addArmInertia(f32 player_yaw);
+
+	//f32 m_cache_fov;


what is this?

leftover from an experiment

red-001 · 2018-01-30T22:46:41Z

src/game.cpp

@@ -139,7 +139,7 @@ struct LocalFormspecHandler : public TextDest
 	void gotText(const StringMap &fields)
 	{
 		if (m_formname == "MT_PAUSE_MENU") {
-			if (fields.find("btn_sound") != fields.end()) {
+			if (fields.find("btn_options") != fields.end()) {
 				g_gamecallback->changeVolume();


rename the callback

ah good catch, thanks

red-001 · 2018-01-30T22:47:42Z

src/gui/guiOptionsChange.cpp

@@ -0,0 +1,259 @@
+/*
+Part of Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <[email protected]>


Add yourself to the copyright headers?

are you sure?

Yes.

Also, the filename could be better, maybe something like 'guiPauseSettings'?

red-001 · 2018-01-30T22:50:07Z

src/gui/guiOptionsChange.h

 	void removeChildren();
 	/*
 		Remove and re-add (or reposition) stuff
 	*/
+	void addCheckBox(const std::string name,const std::string setting, int ID, int xoff, int yoff);


These helper functions should be put in GUIModalMenu imo.

No I don't that would be a good idea because these functions work only with GUIOptionsChange as they use m_size.

red-001 · 2018-01-30T22:53:57Z

src/gui/guiOptionsChange.cpp

+	e->setPos(init);
+}
+
+void GUIOptionsChange::addDynText(const std::string name, int value, const std::string ending, int ID, int xoff, int yoff){


whitespace issues

name and ending can be const references.

red-001 · 2018-01-30T22:54:18Z

src/gui/guiOptionsChange.cpp

+	core::stringw temp_text = text;
+	delete[] text;
+
+	temp_text += core::stringw(value)+core::stringw(wgettext(ending.c_str()));


space after +

red-001 · 2018-01-30T22:55:01Z

src/gui/guiOptionsChange.cpp

+			true, this, ID);
+}
+
+void GUIOptionsChange::addText(const std::string name, int ID, int xoff, int yoff){


name can be a const reference.

red-001 · 2018-01-30T22:56:03Z

src/gui/guiOptionsChange.cpp

+			true, this, ID);
+}
+
+void GUIOptionsChange::updateDynText(const SEvent& event, const std::string setting, int scale, int ID, const std::string beginning, const std::string ending){


space and const references to strings

red-001 · 2018-01-30T23:09:10Z

src/gui/mainmenumanager.h

@@ -140,7 +140,7 @@ class MainGameCallback : public IGameCallback

 	virtual void changeVolume()


rename this

good catch, I had forgotten about doing that.

red-001 · 2018-01-30T23:15:12Z

https://travis-ci.org/minetest/minetest/jobs/334840979

paramat · 2018-01-31T01:04:28Z

src/camera.cpp

+		m_cache_fov = g_settings->getFloat("fov");
+	}else if(name == "view_bobbing_amount"){
+		m_cache_view_bobbing_amount = g_settings->getFloat("view_bobbing_amount");
+	}else if(name == "fall_bobbing_amount"){


I'm wondering why 'view/fall bobbing' settings are included here if they are not being changed in-game?

I'm removing those in the next commit

red-001 · 2018-01-31T16:28:46Z

src/gui/guiOptionsChange.cpp

-
-	if (gui::IGUIElement *e = getElementFromId(ID_forwardButton))
-		e->remove();
+	GUIModalMenu::removeChildren();


just removeChildren(); not GUIModalMenu::removeChildren();

🤦‍♂️ I knew that

paramat · 2018-02-20T15:59:29Z

Is the screenshot up to date? 'build where you stand' and 'autoforward' need removing.
The formspec is too tall for the settings it contains.
I'm not sure about the way this is structured in the expectation of adding many extra in-game settings. Maybe it could be simpler if it just did what it needed to adjust FOV?
I'm unconvinced FOV needs to be settable in-game, it's something that you adjust a few times to see what you like then never touch again, so low priority to be in-game settable.
👎

ThomasMonroe314 · 2018-02-20T17:13:14Z

@paramat updated screenshot.

thecow275 · 2018-04-11T09:49:16Z

@paramat @ThomasMonroe314 almost all modern game engines have FOV sliders in pause menu under settings though but i havent had any need myself to change fov ingame but some other settings could be usefull though

paramat · 2018-04-12T01:11:47Z

See #7234 the lowest settable FOV is 45 degrees, not 55 as i stated before.

paramat · 2018-04-12T01:14:31Z

src/gui/guiOptionsChange.cpp

+	row+=spacing;
+	addDynText("Field Of View: ", FOV, "", ID_fovText, column_pos, row);
+	row+=spacing;
+	addSlider(ID_fovSlider, 160, 51, FOV, column_pos, row);


Minimum can be 45 degrees, i tested the lowest that does not trigger loading of distant world.

paramat · 2018-04-12T01:18:08Z

Closing for now due to inactivity but should be reopened on progress.

ClobberXD · 2018-12-07T05:20:44Z

@ThomasMonroe314 Any progress? Are you still interested in working on this?

ThomasMonroe314 added 2 commits January 24, 2018 11:00

rename major files, classes and variables

7797206

add fov setting

738c2a8

paramat reviewed Jan 25, 2018

View reviewed changes

paramat added @ Client / Audiovisuals WIP Feature ✨ PRs that add or enhance a feature labels Jan 25, 2018

ThomasMonroe314 force-pushed the basic_pause_menu_settings branch from 233d2a2 to 612e1db Compare January 26, 2018 02:41

Better arrange settings and add build inside player setting

cb3f4a0

ThomasMonroe314 force-pushed the basic_pause_menu_settings branch from 612e1db to cb3f4a0 Compare January 26, 2018 02:48

ThomasMonroe314 added 2 commits January 25, 2018 21:20

Add fog setting

0deeaa5

redo fov setting to use callback

66c734f

ThomasMonroe314 mentioned this pull request Jan 26, 2018

F3 (toggle fog) does not affect the 'enable_fog' setting #6969

Closed

Clean up code and prepare for new settings

59e6564

paramat added the Action / change needed Code still needs changes (PR) / more information requested (Issues) label Jan 29, 2018

streamline code

1cb03a0

red-001 suggested changes Jan 30, 2018

View reviewed changes

paramat reviewed Jan 31, 2018

View reviewed changes

ThomasMonroe314 added 2 commits January 31, 2018 09:00

clean up code

6d2a1da

use GUIModalMenu::removeChildren()

38a9866

red-001 reviewed Jan 31, 2018

View reviewed changes

use removeChildren()

e4a4128

paramat reviewed Apr 12, 2018

View reviewed changes

paramat added the Rebase needed The PR needs to be rebased by its author label Apr 12, 2018

paramat closed this Apr 12, 2018

paramat added the Neglect closure label Apr 12, 2018

ClobberXD mentioned this pull request Dec 7, 2018

Add more settings to the pause menu. #6722

Closed

		@@ -140,7 +140,7 @@ class MainGameCallback : public IGameCallback

		virtual void changeVolume()

[WIP] Basic pause menu settings #6965

[WIP] Basic pause menu settings #6965

Conversation

ThomasMonroe314 commented Jan 25, 2018 • edited Loading

paramat commented Jan 25, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ThomasMonroe314 commented Jan 26, 2018

paramat commented Jan 26, 2018 • edited Loading

paramat commented Jan 26, 2018 • edited Loading

ThomasMonroe314 commented Jan 26, 2018

ThomasMonroe314 commented Jan 26, 2018

paramat commented Jan 26, 2018 • edited Loading

paramat commented Jan 26, 2018

ThomasMonroe314 commented Jan 26, 2018

paramat commented Jan 28, 2018 • edited Loading

ThomasMonroe314 commented Jan 28, 2018

Wuzzy2 commented Jan 29, 2018

paramat commented Jan 29, 2018 • edited Loading

ThomasMonroe314 commented Jan 29, 2018

paramat commented Jan 30, 2018 • edited Loading

ThomasMonroe314 commented Jan 30, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

red-001 Jan 30, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

red-001 Jan 30, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

red-001 commented Jan 30, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

paramat commented Feb 20, 2018 • edited Loading

ThomasMonroe314 commented Feb 20, 2018

thecow275 commented Apr 11, 2018

paramat commented Apr 12, 2018

Choose a reason for hiding this comment

paramat commented Apr 12, 2018

ClobberXD commented Dec 7, 2018

ThomasMonroe314 commented Jan 25, 2018 •

edited

Loading

paramat commented Jan 25, 2018 •

edited

Loading

paramat commented Jan 26, 2018 •

edited

Loading

paramat commented Jan 26, 2018 •

edited

Loading

paramat commented Jan 26, 2018 •

edited

Loading

paramat commented Jan 28, 2018 •

edited

Loading

paramat commented Jan 29, 2018 •

edited

Loading

paramat commented Jan 30, 2018 •

edited

Loading

red-001 Jan 30, 2018 •

edited

Loading

red-001 Jan 30, 2018 •

edited

Loading

paramat commented Feb 20, 2018 •

edited

Loading