From: RealBadAngel <maciej.kasatkin@o2.pl>
Date: Wed, 4 Jun 2014 14:39:15 +0000 (+0200)
Subject: Re-add missing shaders setting. (Generate normalmaps)
X-Git-Tag: 0.4.10~96
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f70e0556fcf28b21b5a6717524caa29ccd49a516;p=oweals%2Fminetest.git

Re-add missing shaders setting. (Generate normalmaps)
---

diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua
index 8710290cb..2d013a5ac 100644
--- a/builtin/mainmenu/tab_settings.lua
+++ b/builtin/mainmenu/tab_settings.lua
@@ -104,7 +104,7 @@ local function formspec(tabview, name, tabdata)
 				.. dump(core.setting_getbool("bilinear_filter")) .. "]"..
 		"checkbox[4.5,1.5;cb_trilinear;".. fgettext("Tri-Linear Filtering") .. ";"
 				.. dump(core.setting_getbool("trilinear_filter")) .. "]"..
-		"box[7.75,0;4,3.5;#999999]" ..
+		"box[7.75,0;4,4;#999999]" ..
 		"checkbox[8,0;cb_shaders;".. fgettext("Shaders") .. ";"
 				.. dump(core.setting_getbool("enable_shaders")) .. "]"..
 		"button[1,4.5;2.25,0.5;btn_change_keys;".. fgettext("Change keys") .. "]"
@@ -129,21 +129,24 @@ local function formspec(tabview, name, tabdata)
 		tab_string = tab_string ..
 				"checkbox[8,0.5;cb_bumpmapping;".. fgettext("Bumpmapping") .. ";"
 						.. dump(core.setting_getbool("enable_bumpmapping")) .. "]"..
-				"checkbox[8,1.0;cb_parallax;".. fgettext("Parallax Occlusion") .. ";"
+				"checkbox[8,1.0;cb_generate_normalmaps;".. fgettext("Generate Normalmaps") .. ";"
+						.. dump(core.setting_getbool("generate_normalmaps")) .. "]"..
+				"checkbox[8,1.5;cb_parallax;".. fgettext("Parallax Occlusion") .. ";"
 						.. dump(core.setting_getbool("enable_parallax_occlusion")) .. "]"..
-				"checkbox[8,1.5;cb_waving_water;".. fgettext("Waving Water") .. ";"
+				"checkbox[8,2.0;cb_waving_water;".. fgettext("Waving Water") .. ";"
 						.. dump(core.setting_getbool("enable_waving_water")) .. "]"..
-				"checkbox[8,2.0;cb_waving_leaves;".. fgettext("Waving Leaves") .. ";"
+				"checkbox[8,2.5;cb_waving_leaves;".. fgettext("Waving Leaves") .. ";"
 						.. dump(core.setting_getbool("enable_waving_leaves")) .. "]"..
-				"checkbox[8,2.5;cb_waving_plants;".. fgettext("Waving Plants") .. ";"
+				"checkbox[8,3.0;cb_waving_plants;".. fgettext("Waving Plants") .. ";"
 						.. dump(core.setting_getbool("enable_waving_plants")) .. "]"
 	else
 		tab_string = tab_string ..
-				"textlist[8.33,0.7;3,1;;#888888" .. fgettext("Bumpmapping") .. ";0;true]" ..
-				"textlist[8.33,1.2;3,1;;#888888" .. fgettext("Parallax Occlusion") .. ";0;true]" ..
-				"textlist[8.33,1.7;3,1;;#888888" .. fgettext("Waving Water") .. ";0;true]" ..
-				"textlist[8.33,2.2;3,1;;#888888" .. fgettext("Waving Leaves") .. ";0;true]" ..
-				"textlist[8.33,2.7;3,1;;#888888" .. fgettext("Waving Plants") .. ";0;true]"
+				"textlist[8.33,0.7;4,1;;#888888" .. fgettext("Bumpmapping") .. ";0;true]" ..
+				"textlist[8.33,1.2;4,1;;#888888" .. fgettext("Generate Normalmaps") .. ";0;true]" ..
+				"textlist[8.33,1.7;4,1;;#888888" .. fgettext("Parallax Occlusion") .. ";0;true]" ..
+				"textlist[8.33,2.2;4,1;;#888888" .. fgettext("Waving Water") .. ";0;true]" ..
+				"textlist[8.33,2.7;4,1;;#888888" .. fgettext("Waving Leaves") .. ";0;true]" ..
+				"textlist[8.33,3.2;4,1;;#888888" .. fgettext("Waving Plants") .. ";0;true]"
 		end
 	return tab_string
 end
@@ -206,6 +209,9 @@ local function handle_settings_buttons(this, fields, tabname, tabdata)
 	if fields["cb_bumpmapping"] then
 		core.setting_set("enable_bumpmapping", fields["cb_bumpmapping"])
 	end
+	if fields["cb_generate_normalmaps"] then
+		core.setting_set("generate_normalmaps", fields["cb_generate_normalmaps"])
+	end
 	if fields["cb_parallax"] then
 		core.setting_set("enable_parallax_occlusion", fields["cb_parallax"])
 		return true