-Added textures for the sneaking and diagonal movement buttons

-Fixed sneaking button not working properly
-Fixed touch area being set in some buttons, causing unintentional hits

Author: Wilyicaro

game/assets/gui/touchscreen.png

@@ -650,13 +650,18 @@ int Gui::getNumUsableSlots()
 	return getNumSlots() - m_pMinecraft->isTouchscreen();
 }
 
-RectangleArea Gui::getRectangleArea(bool b)
+void Gui::addRectangleArea(std::vector<RectangleArea>& touchArea)
 {
 	float centerX = Minecraft::width / 2;
 	float hotbarWidthHalf = (10 * getNumSlots() + 5) / InvGuiScale;
-	return RectangleArea(
-		b ? (centerX - hotbarWidthHalf) : 0,
+	touchArea.push_back(RectangleArea(
+		centerX - hotbarWidthHalf,
 		Minecraft::height - 24.0f / InvGuiScale,
 		centerX + hotbarWidthHalf,
-		Minecraft::height);
+		Minecraft::height));
+	touchArea.push_back(RectangleArea(
+		centerX - 26 / InvGuiScale,
+		0,
+		centerX + 10 / InvGuiScale,
+		16 / InvGuiScale));
 }

source/client/gui/Gui.cpp

@@ -47,7 +47,7 @@ class Gui : public GuiComponent
 	void renderMessages(bool bShowAll);
 	int getNumSlots();					  // Gets the number of slots in the inventory. Includes the '...' if in touch mode.
 	int getNumUsableSlots();			  // Gets the number of usable slots in the inventory. Does not include the '...' if in touch mode.
-	RectangleArea getRectangleArea(bool b);
+	void addRectangleArea(std::vector<RectangleArea>&);
 
 public:
 	static float InvGuiScale;

source/client/gui/Gui.hpp

@@ -39,4 +39,9 @@ void IMoveInput::setScreenSize(int width, int height)
 
 void IMoveInput::tick(Player* pPlayer)
 {
+	if (m_bSneaking)
+	{
+		m_horzInput = m_horzInput * 0.3f;
+		m_vertInput = m_vertInput * 0.3f;
+	}
 }

source/client/player/input/IMoveInput.cpp

@@ -58,9 +58,5 @@ void KeyboardInput::tick(Player* pPlayer)
 	m_bJumping  = m_keys[INPUT_JUMP];
 	m_bSneaking = m_keys[INPUT_SNEAK];
 
-	if (m_keys[INPUT_SNEAK])
-	{
-		m_horzInput = m_horzInput * 0.3f;
-		m_vertInput = m_vertInput * 0.3f;
-	}
+	IMoveInput::tick(pPlayer);
 }

source/client/player/input/KeyboardInput.cpp

@@ -57,7 +57,8 @@ IBuildInput* TouchInputHolder::getBuildInput()
 void TouchInputHolder::setScreenSize(int width, int height)
 {
 	m_touchScreenInput.setScreenSize(width, height);
-	m_unifiedTurnBuild.field_40 = m_touchScreenInput.getRectangleArea();
-	m_unifiedTurnBuild.field_58 = m_pMinecraft->m_gui.getRectangleArea(false);
+	m_unifiedTurnBuild.m_touchArea.clear();
+	m_touchScreenInput.addRectangleArea(m_unifiedTurnBuild.m_touchArea);
+	m_pMinecraft->m_gui.addRectangleArea(m_unifiedTurnBuild.m_touchArea);
 	m_unifiedTurnBuild.setScreenSize(width, height);
 }

source/client/player/input/TouchInputHolder.cpp

@@ -14,6 +14,7 @@
 
 TouchscreenInput_TestFps::TouchscreenInput_TestFps(Minecraft* pMinecraft, Options* pOptions) :
 	m_rectArea(0.0f, 0.0f, 1.0f, 1.0f),
+	m_rightRectArea(0.0f, 0.0f, 1.0f, 1.0f),
 	m_pOptions(pOptions),
 	field_40(false),
 	m_bJumpBeingHeld(false),
@@ -33,7 +34,7 @@ TouchscreenInput_TestFps::TouchscreenInput_TestFps(Minecraft* pMinecraft, Option
 
 	// Note! Only the first five button entries are used.
 	for (int i = 0; i < 8; i++)
-		field_6C[i] = 0;
+		m_pressedInputs[i] = 0;
 
 	setScreenSize(Minecraft::width, Minecraft::height);
 }
@@ -43,7 +44,7 @@ void TouchscreenInput_TestFps::releaseAllKeys()
 	m_horzInput = 0.0f;
 	m_vertInput = 0.0f;
 	for (int i = 0; i < 5; i++)
-		field_6C[i] = false;
+		m_pressedInputs[i] = false;
 }
 
 void TouchscreenInput_TestFps::setKey(int eventKey, bool eventKeyState)
@@ -109,7 +110,10 @@ void TouchscreenInput_TestFps::setScreenSize(int width, int height)
 	right = middleX + widthM * 2;
 	bottom = middleY + heightM * 2;
 
+	float rightSideX = scaledWidth - widthM - 8;
+
 	m_rectArea = RectangleArea(left / Gui::InvGuiScale, top / Gui::InvGuiScale, right / Gui::InvGuiScale, bottom / Gui::InvGuiScale);
+	m_rightRectArea = RectangleArea(rightSideX / Gui::InvGuiScale, middleY / Gui::InvGuiScale, (rightSideX + widthM) / Gui::InvGuiScale, (middleY + heightM) / Gui::InvGuiScale);
 
 	TransformArray(4, x1, y1, x2, y2, middleX, middleY - heightM, 1.0f, 1.0f);
 	m_pAreaForward = new PolygonArea(4, x2, y2);
@@ -131,10 +135,9 @@ void TouchscreenInput_TestFps::setScreenSize(int width, int height)
 	m_pAreaRight = new PolygonArea(4, x2, y2);
 	m_touchAreaModel.addArea(100 + INPUT_RIGHT, m_pAreaRight);
 
-	/*float rightSideX = scaledWidth - widthM - 8;
 	TransformArray(4, x1, y1, x2, y2, rightSideX, middleY, 1.0f, 1.0f);
 	m_pAreaSneak = new PolygonArea(4, x2, y2);
-	m_touchAreaModel.addArea(100 + INPUT_SNEAK, m_pAreaSneak);*/
+	m_touchAreaModel.addArea(100 + INPUT_SNEAK, m_pAreaSneak);
 
 	TransformArray(4, x1, y1, x2, y2, middleX - widthM, middleY - heightM, 1.0f, 1.0f);
 	m_pAreaForwardLeft = new PolygonArea(4, x2, y2);
@@ -157,8 +160,8 @@ void TouchscreenInput_TestFps::tick(Player* pPlayer)
 	m_vertInput = 0.0f;
 	m_bJumping = false;
 
-	for (int i = 0; i < 5; i++)
-		field_6C[i] = false;
+	for (bool& value : m_pressedInputs)
+		value = false;
 
 	const int* activePointers;
 	int activePointerCount = Multitouch::getActivePointerIds(&activePointers);
@@ -173,7 +176,7 @@ void TouchscreenInput_TestFps::tick(Player* pPlayer)
 		int pointerId = m_touchAreaModel.getPointerId(x * Gui::InvGuiScale, y * Gui::InvGuiScale, finger);
 
 		if (pointerId > 99)
-			field_6C[pointerId - 100] = true;
+			m_pressedInputs[pointerId - 100] = true;
 
 		if (pointerId == 100 + INPUT_SNEAK) // sneak
 		{
@@ -261,7 +264,11 @@ void TouchscreenInput_TestFps::tick(Player* pPlayer)
 	else
 	{
 		m_bSneakBeingHeld = false;
+		if (pPlayer->getAbilities().m_bFlying)
+			m_bSneaking = false;
 	}
+
+	IMoveInput::tick(pPlayer);
 }
 
 static void RenderTouchButton(Tesselator* t, PolygonArea* pArea, int srcX, int srcY)
@@ -324,21 +331,22 @@ void TouchscreenInput_TestFps::render(float f)
 	t.color(isButtonDown(100 + INPUT_JUMP) ? 0xC0C0C0 : 0xFFFFFF, 0x80);
 	RenderTouchButton(&t, m_pAreaJump, 0, 176);
 
-	/*t.color(isButtonDown(100 + INPUT_SNEAK) ? 0xC0C0C0 : 0xFFFFFF, 0x80);
-	RenderTouchButton(&t, m_pAreaSneak, 48, 176);*/
+	t.color(m_bSneaking ? 0xC0C0C0 : 0xFFFFFF, 0x80);
+	RenderTouchButton(&t, m_pAreaSneak, 48, 176);
 
 	t.draw();
 
 	glDisable(GL_BLEND);
 	glEnable(GL_CULL_FACE);
 }
 
-RectangleArea TouchscreenInput_TestFps::getRectangleArea()
+void TouchscreenInput_TestFps::addRectangleArea(std::vector<RectangleArea>& touchArea)
 {
-	return m_rectArea;
+	touchArea.push_back(m_rectArea);
+	touchArea.push_back(m_rightRectArea);
 }
 
 bool TouchscreenInput_TestFps::isButtonDown(int key)
 {
-	return field_6C[key - 100];
+	return m_pressedInputs[key - 100];
 }

source/client/player/input/TouchscreenInput_TestFps.cpp

@@ -13,6 +13,7 @@
 #include "RectangleArea.hpp"
 #include "PolygonArea.hpp"
 #include "TouchAreaModel.hpp"
+#include <vector>
 
 class Minecraft;
 class Options;
@@ -29,11 +30,12 @@ class TouchscreenInput_TestFps : public IMoveInput, public GuiComponent
 	void tick(Player*) override;
 	void render(float f) override;
 
-	RectangleArea getRectangleArea();
+	void addRectangleArea(std::vector<RectangleArea>& touchArea);
 	bool isButtonDown(int key);
 
 private:
 	RectangleArea m_rectArea;
+	RectangleArea m_rightRectArea;
 	bool m_noNeighborUpdate[10];
 	Options* m_pOptions;
 	bool field_40;
@@ -49,6 +51,6 @@ class TouchscreenInput_TestFps : public IMoveInput, public GuiComponent
 	PolygonArea* m_pAreaSneak;
 	PolygonArea* m_pAreaForwardLeft;
 	PolygonArea* m_pAreaForwardRight;
-	bool field_6C[8];
+	bool m_pressedInputs[8];
 };
 

source/client/player/input/TouchscreenInput_TestFps.hpp

@@ -16,8 +16,6 @@ UnifiedTurnBuild::UnifiedTurnBuild(int a, int width, int height, float d, float
 	field_C(a),
 	field_10(0),
 	m_screenArea(-1, -1, 0, 0),
-	field_40(-1, -1, 0, 0),
-	field_58(-1, -1, 0, 0),
 	m_pInputHolder(pHolder),
 	field_78(0.0f),
 	field_7C(0.0f),
@@ -44,8 +42,10 @@ void UnifiedTurnBuild::setScreenSize(int width, int height)
 
 	m_includeExcludeArea.clear();
 	m_includeExcludeArea.include(&m_screenArea);
-	m_includeExcludeArea.exclude(&field_40);
-	m_includeExcludeArea.exclude(&field_58);
+	for (auto& area : m_touchArea)
+	{
+		m_includeExcludeArea.exclude(&area);
+	}
 
 	m_touchAreaModel.clear();
 	m_touchAreaModel.addArea(100, &m_includeExcludeArea);

source/client/player/input/UnifiedTurnBuild.cpp

@@ -41,8 +41,7 @@ class UnifiedTurnBuild : public ITurnInput, public IBuildInput
 	SmoothFloat m_smoothFloat;
 	bool m_bStarted;
 	RectangleArea m_screenArea;
-	RectangleArea field_40;
-	RectangleArea field_58;
+	std::vector<RectangleArea> m_touchArea;
 	IInputHolder* m_pInputHolder;
 	float field_78;
 	float field_7C;