Added inverse, fixing server bug
This commit is contained in:
1 parent
785b96ce82
commit
c88784a669
4 files changed
+59
-9
No files matched your search
@@ -3,6 +3,8 @@
|
||||
|
||||
namespace ZL {
|
||||
|
||||
extern bool inverseVertical;
|
||||
|
||||
MenuManager::MenuManager(Renderer& iRenderer) :
|
||||
renderer(iRenderer)
|
||||
{
|
||||
@@ -189,6 +191,14 @@ namespace ZL {
|
||||
if (onShowPlayersPressed) onShowPlayersPressed();
|
||||
});
|
||||
|
||||
//inverseMouseButton
|
||||
|
||||
uiManager.setButtonPressCallback("inverseMouseButton", [this](const std::string&) {
|
||||
inverseVertical = !inverseVertical;
|
||||
std::cout << "Inverse mouse: " << (inverseVertical ? "ON" : "OFF") << std::endl;
|
||||
});
|
||||
|
||||
|
||||
|
||||
/*
|
||||
uiManager.setSliderCallback("velocitySlider", [this](const std::string&, float value) {
|
||||
|
||||
+31
-7
@@ -36,6 +36,8 @@ namespace ZL
|
||||
extern float y;
|
||||
extern float z;
|
||||
|
||||
bool inverseVertical = true;
|
||||
|
||||
Eigen::Quaternionf generateRandomQuaternion(std::mt19937& gen)
|
||||
{
|
||||
|
||||
@@ -2079,11 +2081,22 @@ namespace ZL
|
||||
|
||||
Environment::tapDownHold = true;
|
||||
|
||||
Environment::tapDownStartPos(0) = mx;
|
||||
Environment::tapDownStartPos(1) = my;
|
||||
if (inverseVertical)
|
||||
{
|
||||
Environment::tapDownStartPos(0) = mx;
|
||||
Environment::tapDownStartPos(1) = my;
|
||||
|
||||
Environment::tapDownCurrentPos(0) = mx;
|
||||
Environment::tapDownCurrentPos(1) = my;
|
||||
Environment::tapDownCurrentPos(0) = mx;
|
||||
Environment::tapDownCurrentPos(1) = my;
|
||||
}
|
||||
else
|
||||
{
|
||||
Environment::tapDownStartPos(0) = mx;
|
||||
Environment::tapDownStartPos(1) = -my;
|
||||
|
||||
Environment::tapDownCurrentPos(0) = mx;
|
||||
Environment::tapDownCurrentPos(1) = -my;
|
||||
}
|
||||
}
|
||||
|
||||
void Space::handleUp(int mx, int my)
|
||||
@@ -2096,9 +2109,20 @@ namespace ZL
|
||||
{
|
||||
if (playerListVisible) return;
|
||||
|
||||
if (Environment::tapDownHold) {
|
||||
Environment::tapDownCurrentPos(0) = mx;
|
||||
Environment::tapDownCurrentPos(1) = my;
|
||||
|
||||
if (inverseVertical)
|
||||
{
|
||||
if (Environment::tapDownHold) {
|
||||
Environment::tapDownCurrentPos(0) = mx;
|
||||
Environment::tapDownCurrentPos(1) = my;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Environment::tapDownHold) {
|
||||
Environment::tapDownCurrentPos(0) = mx;
|
||||
Environment::tapDownCurrentPos(1) = -my;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user