Remove Irrlicht GUI gradients (#16015)

Co-authored-by: rollerozxa <rollerozxa@voxelmanip.se>
Co-authored-by: grorp <grorp@posteo.de>

irr/include/IGUIEnvironment.h

@@ -130,26 +130,18 @@ public:
 
 	//! Sets a new GUI Skin
 	/** You can use this to change the appearance of the whole GUI
-	Environment. You can set one of the built-in skins or implement your
+	Environment.
-	own class derived from IGUISkin and enable it using this method.
-	To set for example the built-in Windows classic skin, use the following
-	code:
-	\code
-	gui::IGUISkin* newskin = environment->createSkin(gui::EGST_WINDOWS_CLASSIC);
-	environment->setSkin(newskin);
-	newskin->drop();
-	\endcode
 	\param skin New skin to use.
 	*/
 	virtual void setSkin(IGUISkin *skin) = 0;
 
-	//! Creates a new GUI Skin based on a template.
+	//! Creates a new GUI Skin.
 	/** Use setSkin() to set the created skin.
 	\param type The type of the new skin.
 	\return Pointer to the created skin.
 	If you no longer need it, you should call IGUISkin::drop().
 	See IReferenceCounted::drop() for more information. */
-	virtual IGUISkin *createSkin(EGUI_SKIN_TYPE type) = 0;
+	virtual IGUISkin *createSkin() = 0;
 
 	//! Creates the image list from the given texture.
 	/** \param texture Texture to split into images

irr/include/IGUISkin.h

@@ -17,42 +17,6 @@ class IGUIFont;
 class IGUISpriteBank;
 class IGUIElement;
 
-//! Enumeration of available default skins.
-/** To set one of the skins, use the following code, for example to set
-the Windows classic skin:
-\code
-gui::IGUISkin* newskin = environment->createSkin(gui::EGST_WINDOWS_CLASSIC);
-environment->setSkin(newskin);
-newskin->drop();
-\endcode
-*/
-enum EGUI_SKIN_TYPE
-{
-	//! Default windows look and feel
-	EGST_WINDOWS_CLASSIC = 0,
-
-	//! Like EGST_WINDOWS_CLASSIC, but with metallic shaded windows and buttons
-	EGST_WINDOWS_METALLIC,
-
-	//! Burning's skin
-	EGST_BURNING_SKIN,
-
-	//! An unknown skin, not serializable at present
-	EGST_UNKNOWN,
-
-	//! this value is not used, it only specifies the number of skin types
-	EGST_COUNT
-};
-
-//! Names for gui element types
-const c8 *const GUISkinTypeNames[EGST_COUNT + 1] = {
-		"windowsClassic",
-		"windowsMetallic",
-		"burning",
-		"unknown",
-		0,
-	};
-
 //! Enumeration for skin colors
 enum EGUI_DEFAULT_COLOR
 {
@@ -570,9 +534,6 @@ public:
 	If the pointer is null, no clipping will be performed. */
 	virtual void draw2DRectangle(IGUIElement *element, const video::SColor &color,
 			const core::rect<s32> &pos, const core::rect<s32> *clip = 0) = 0;
-
-	//! get the type of this skin
-	virtual EGUI_SKIN_TYPE getType() const { return EGST_UNKNOWN; }
 };
 
 } // end namespace gui

irr/src/CGUIEnvironment.cpp

@@ -52,7 +52,7 @@ CGUIEnvironment::CGUIEnvironment(io::IFileSystem *fs, video::IVideoDriver *drive
 
 	loadBuiltInFont();
 
-	IGUISkin *skin = createSkin(gui::EGST_WINDOWS_METALLIC);
+	IGUISkin *skin = createSkin();
 	setSkin(skin);
 	skin->drop();
 
@@ -584,13 +584,13 @@ void CGUIEnvironment::setSkin(IGUISkin *skin)
 		CurrentSkin->grab();
 }
 
-//! Creates a new GUI Skin based on a template.
+//! Creates a new GUI Skin.
 /** \return Returns a pointer to the created skin.
 If you no longer need the skin, you should call IGUISkin::drop().
 See IReferenceCounted::drop() for more information. */
-IGUISkin *CGUIEnvironment::createSkin(EGUI_SKIN_TYPE type)
+IGUISkin *CGUIEnvironment::createSkin()
 {
-	IGUISkin *skin = new CGUISkin(type, Driver);
+	IGUISkin *skin = new CGUISkin(Driver);
 
 	IGUIFont *builtinfont = getBuiltInFont();
 	IGUIFontBitmap *bitfont = 0;

irr/src/CGUIEnvironment.h

@@ -56,11 +56,11 @@ public:
 	//! Sets a new GUI Skin
 	void setSkin(IGUISkin *skin) override;
 
-	//! Creates a new GUI Skin based on a template.
+	//! Creates a new GUI Skin.
 	/** \return Returns a pointer to the created skin.
 	If you no longer need the skin, you should call IGUISkin::drop().
 	See IReferenceCounted::drop() for more information. */
-	IGUISkin *createSkin(EGUI_SKIN_TYPE type) override;
+	IGUISkin *createSkin() override;
 
 	//! Creates the image list from the given texture.
 	virtual IGUIImageList *createImageList(video::ITexture *texture,

irr/src/CGUISkin.cpp

@@ -16,14 +16,12 @@ namespace irr
 namespace gui
 {
 
-CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
+CGUISkin::CGUISkin(video::IVideoDriver* driver)
-: SpriteBank(0), Driver(driver), Type(type)
+: SpriteBank(0), Driver(driver)
 {
-	if ((Type == EGST_WINDOWS_CLASSIC) || (Type == EGST_WINDOWS_METALLIC))
-	{
 	Colors[EGDC_3D_DARK_SHADOW]     = video::SColor(101,50,50,50);
 	Colors[EGDC_3D_SHADOW]          = video::SColor(101,130,130,130);
-		Colors[EGDC_3D_FACE]            = video::SColor(220,100,100,100);
+	Colors[EGDC_3D_FACE]            = video::SColor(185,85,85,85);
 	Colors[EGDC_3D_HIGH_LIGHT]      = video::SColor(101,255,255,255);
 	Colors[EGDC_3D_LIGHT]           = video::SColor(101,210,210,210);
 	Colors[EGDC_ACTIVE_BORDER]      = video::SColor(101,16,14,115);
@@ -62,53 +60,6 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
 
 	Sizes[EGDS_TITLEBARTEXT_DISTANCE_X] = 2;
 	Sizes[EGDS_TITLEBARTEXT_DISTANCE_Y] = 0;
-	}
-	else
-	{
-		//0x80a6a8af
-		Colors[EGDC_3D_DARK_SHADOW] 	=	0x60767982;
-		//Colors[EGDC_3D_FACE]			=	0xc0c9ccd4;		// tab background
-		Colors[EGDC_3D_FACE]			=	0xc0cbd2d9;		// tab background
-		Colors[EGDC_3D_SHADOW]			=	0x50e4e8f1;		// tab background, and left-top highlight
-		Colors[EGDC_3D_HIGH_LIGHT]		=	0x40c7ccdc;
-		Colors[EGDC_3D_LIGHT]			=	0x802e313a;
-		Colors[EGDC_ACTIVE_BORDER]		=	0x80404040;		// window title
-		Colors[EGDC_ACTIVE_CAPTION] 	=	0xffd0d0d0;
-		Colors[EGDC_APP_WORKSPACE]		=	0xc0646464;		// unused
-		Colors[EGDC_BUTTON_TEXT]		=	0xd0161616;
-		Colors[EGDC_GRAY_TEXT]			=	0x3c141414;
-		Colors[EGDC_HIGH_LIGHT]			=	0x6c606060;
-		Colors[EGDC_HIGH_LIGHT_TEXT]	=	0xd0e0e0e0;
-		Colors[EGDC_INACTIVE_BORDER]	=	0xf0a5a5a5;
-		Colors[EGDC_INACTIVE_CAPTION]	=	0xffd2d2d2;
-		Colors[EGDC_TOOLTIP]			=	0xf00f2033;
-		Colors[EGDC_TOOLTIP_BACKGROUND]	= 	0xc0cbd2d9;
-		Colors[EGDC_SCROLLBAR]			= 	0xf0e0e0e0;
-		Colors[EGDC_WINDOW]				= 	0xf0f0f0f0;
-		Colors[EGDC_WINDOW_SYMBOL]		= 	0xd0161616;
-		Colors[EGDC_ICON]				= 	0xd0161616;
-		Colors[EGDC_ICON_HIGH_LIGHT]	= 	0xd0606060;
-		Colors[EGDC_GRAY_WINDOW_SYMBOL] = 	0x3c101010;
-		Colors[EGDC_EDITABLE] 			= 	0xf0ffffff;
-		Colors[EGDC_GRAY_EDITABLE]		= 	0xf0cccccc;
-		Colors[EGDC_FOCUSED_EDITABLE]	= 	0xf0fffff0;
-
-		Sizes[EGDS_SCROLLBAR_SIZE] = 14;
-		Sizes[EGDS_MENU_HEIGHT] = 48;
-		Sizes[EGDS_WINDOW_BUTTON_WIDTH] = 15;
-		Sizes[EGDS_CHECK_BOX_WIDTH] = 18;
-		Sizes[EGDS_MESSAGE_BOX_WIDTH] = 500;
-		Sizes[EGDS_MESSAGE_BOX_HEIGHT] = 200;
-		Sizes[EGDS_BUTTON_WIDTH] = 80;
-		Sizes[EGDS_BUTTON_HEIGHT] = 30;
-
-		Sizes[EGDS_TEXT_DISTANCE_X] = 3;
-		Sizes[EGDS_TEXT_DISTANCE_Y] = 2;
-
-		Sizes[EGDS_TITLEBARTEXT_DISTANCE_X] = 3;
-		Sizes[EGDS_TITLEBARTEXT_DISTANCE_Y] = 2;
-	}
-
 	Sizes[EGDS_MESSAGE_BOX_GAP_SPACE] = 15;
 	Sizes[EGDS_MESSAGE_BOX_MIN_TEXT_WIDTH] = 0;
 	Sizes[EGDS_MESSAGE_BOX_MAX_TEXT_WIDTH] = 500;
@@ -156,8 +107,6 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver)
 
 	for (u32 i=0; i<EGDF_COUNT; ++i)
 		Fonts[i] = 0;
-
-	UseGradient = (Type == EGST_WINDOWS_METALLIC) || (Type == EGST_BURNING_SKIN) ;
 }
 
 
@@ -319,18 +268,6 @@ void CGUISkin::drawColored3DButtonPaneStandard(IGUIElement* element,
 
 	core::rect<s32> rect = r;
 
-	if ( Type == EGST_BURNING_SKIN )
-	{
-		rect.UpperLeftCorner.X -= 1;
-		rect.UpperLeftCorner.Y -= 1;
-		rect.LowerRightCorner.X += 1;
-		rect.LowerRightCorner.Y += 1;
-		draw3DSunkenPane(element,
-					colors[ EGDC_WINDOW ].getInterpolated( 0xFFFFFFFF, 0.9f )
-					,false, true, rect, clip);
-		return;
-	}
-
 	Driver->draw2DRectangle(colors[EGDC_3D_DARK_SHADOW], rect, clip);
 
 	rect.LowerRightCorner.X -= 1;
@@ -344,16 +281,7 @@ void CGUISkin::drawColored3DButtonPaneStandard(IGUIElement* element,
 	rect.LowerRightCorner.X -= 1;
 	rect.LowerRightCorner.Y -= 1;
 
-	if (!UseGradient)
-	{
 	Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
-	}
-	else
-	{
-		const video::SColor c1 = colors[EGDC_3D_FACE];
-		const video::SColor c2 = c1.getInterpolated(colors[EGDC_3D_DARK_SHADOW], 0.4f);
-		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
-	}
 }
 // END PATCH
 
@@ -393,16 +321,8 @@ void CGUISkin::drawColored3DButtonPanePressed(IGUIElement* element,
 	rect.UpperLeftCorner.X += 1;
 	rect.UpperLeftCorner.Y += 1;
 
-	if (!UseGradient)
-	{
 	Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
-	}
+
-	else
-	{
-		const video::SColor c1 = colors[EGDC_3D_FACE];
-		const video::SColor c2 = c1.getInterpolated(colors[EGDC_3D_DARK_SHADOW], 0.4f);
-		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
-	}
 }
 // END PATCH
 
@@ -595,25 +515,9 @@ core::rect<s32> CGUISkin::drawColored3DWindowBackground(IGUIElement* element,
 	}
 
 	if ( !checkClientArea )
-	{
-		if (!UseGradient)
 	{
 		Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
 	}
-		else if ( Type == EGST_BURNING_SKIN )
-		{
-			const video::SColor c1 = colors[EGDC_WINDOW].getInterpolated ( 0xFFFFFFFF, 0.9f );
-			const video::SColor c2 = colors[EGDC_WINDOW].getInterpolated ( 0xFFFFFFFF, 0.8f );
-
-			Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
-		}
-		else
-		{
-			const video::SColor c2 = colors[EGDC_3D_SHADOW];
-			const video::SColor c1 = colors[EGDC_3D_FACE];
-			Driver->draw2DRectangle(rect, c1, c1, c1, c2, clip);
-		}
-	}
 
 	// title bar
 	rect = r;
@@ -631,19 +535,7 @@ core::rect<s32> CGUISkin::drawColored3DWindowBackground(IGUIElement* element,
 		else
 		{
 			// draw title bar
-			//if (!UseGradient)
+			Driver->draw2DRectangle(titleBarColor, rect, clip);
-			//	Driver->draw2DRectangle(titleBarColor, rect, clip);
-			//else
-			if ( Type == EGST_BURNING_SKIN )
-			{
-				const video::SColor c = titleBarColor.getInterpolated( video::SColor(titleBarColor.getAlpha(),255,255,255), 0.8f);
-				Driver->draw2DRectangle(rect, titleBarColor, titleBarColor, c, c, clip);
-			}
-			else
-			{
-				const video::SColor c = titleBarColor.getInterpolated(video::SColor(titleBarColor.getAlpha(),0,0,0), 0.2f);
-				Driver->draw2DRectangle(rect, titleBarColor, c, titleBarColor, c, clip);
-			}
 		}
 	}
 
@@ -674,13 +566,6 @@ void CGUISkin::drawColored3DMenuPane(IGUIElement* element,
 
 	core::rect<s32> rect = r;
 
-	if ( Type == EGST_BURNING_SKIN )
-	{
-		rect.UpperLeftCorner.Y -= 3;
-		draw3DButtonPaneStandard(element, rect, clip);
-		return;
-	}
-
 	// in this skin, this is exactly what non pressed buttons look like,
 	// so we could simply call
 	// draw3DButtonPaneStandard(element, rect, clip);
@@ -726,14 +611,7 @@ void CGUISkin::drawColored3DMenuPane(IGUIElement* element,
 	rect.LowerRightCorner.X -= 2;
 	rect.LowerRightCorner.Y -= 2;
 
-	if (!UseGradient)
 	Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
-	else
-	{
-		const video::SColor c1 = colors[EGDC_3D_FACE];
-		const video::SColor c2 = colors[EGDC_3D_SHADOW];
-		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
-	}
 }
 // END PATCH
 
@@ -768,25 +646,7 @@ void CGUISkin::drawColored3DToolBar(IGUIElement* element,
 	rect = r;
 	rect.LowerRightCorner.Y -= 1;
 
-	if (!UseGradient)
-	{
 	Driver->draw2DRectangle(colors[EGDC_3D_FACE], rect, clip);
-	}
-	else
-	if ( Type == EGST_BURNING_SKIN )
-	{
-		const video::SColor c1 = 0xF0000000 | colors[EGDC_3D_FACE].color;
-		const video::SColor c2 = 0xF0000000 | colors[EGDC_3D_SHADOW].color;
-
-		rect.LowerRightCorner.Y += 1;
-		Driver->draw2DRectangle(rect, c1, c2, c1, c2, clip);
-	}
-	else
-	{
-		const video::SColor c1 = colors[EGDC_3D_FACE];
-		const video::SColor c2 = colors[EGDC_3D_SHADOW];
-		Driver->draw2DRectangle(rect, c1, c1, c2, c2, clip);
-	}
 }
 // END PATCH
 
@@ -960,14 +820,7 @@ void CGUISkin::drawColored3DTabBody(IGUIElement* element, bool border, bool back
 			//tr.UpperLeftCorner.X += 1;
 		}
 
-		if (!UseGradient)
 		Driver->draw2DRectangle(colors[EGDC_3D_FACE], tr, clip);
-		else
-		{
-			video::SColor c1 = colors[EGDC_3D_FACE];
-			video::SColor c2 = colors[EGDC_3D_SHADOW];
-			Driver->draw2DRectangle(tr, c1, c1, c2, c2, clip);
-		}
 	}
 }
 // END PATCH
@@ -1003,12 +856,6 @@ void CGUISkin::drawColoredIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
 // END PATCH
 
 
-EGUI_SKIN_TYPE CGUISkin::getType() const
-{
-	return Type;
-}
-
-
 //! draws a 2d rectangle.
 void CGUISkin::draw2DRectangle(IGUIElement* element,
 		const video::SColor &color, const core::rect<s32>& pos,

irr/src/CGUISkin.h

@@ -21,7 +21,7 @@ namespace gui
 	{
 	public:
 
-		CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver* driver);
+		CGUISkin(video::IVideoDriver* driver);
 
 		//! destructor
 		virtual ~CGUISkin();
@@ -288,10 +288,6 @@ namespace gui
 		virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color,
 				const core::rect<s32>& pos, const core::rect<s32>* clip = 0);
 
-
-		//! get the type of this skin
-		virtual EGUI_SKIN_TYPE getType() const;
-
 		//! gets the colors
 		virtual void getColors(video::SColor* colors); // ::PATCH:
 
@@ -305,9 +301,6 @@ namespace gui
 		IGUISpriteBank* SpriteBank;
 		core::stringw Texts[EGDT_COUNT];
 		video::IVideoDriver* Driver;
-		bool UseGradient;
-
-		EGUI_SKIN_TYPE Type;
 	};
 
 } // end namespace gui