mirror of
https://github.com/celisej567/mcpe.git
synced 2025-12-31 17:49:17 +03:00
f83ead9f8d
* WIP Android Port Android port. Still needs touch controls and mouse turning (if that's even possible on android) and file saving and SoundSystemSL You control the camera and movement with your controller for now. You can navigate the gui using touch. Options.cpp,LocalPlayer.cpp,Minecraft.cpp is configured to use controller. Blocked out some code in ControllerTurnInput.cpp,Controller.cpp that didn't make sense. * Fix glClear glClear is supossed to use GL_DEPTH_BUFFER_BIT (thx TheBrokenRail) * * Fix build. * * Ignore assets. * * More stuff * * Fix more build errors. * * It finally built What I needed to do is rebuild the debug keystore because apparently android studio created it with sha1 digest alg which isn't supported by ant * * Clean up filters. * * Add cramped mode to the pause screen. * * Fix a bug with the hotbar * * In NinecraftApp::handleBack, pause the game if there is no screen. * * AppPlatform_android: Add placeholder SoundSystem instance till we get SoundSystemSL working * * Add properly working touch code. * * Oh, remove some testing things * * Fix state resetting when going in background and back in foreground * Fix bug where the sky isn't being regenerated on graphics reset * Fix bug where the m_currBoundTex isn't reset in Textures::clear potentially leaving a texture with that ID unassigned and corrupted * Fix bug in CThread where the thread is detached and then also joined. * Don't log anything if the program isn't in debug mode. * * Add virtual keyboard support. The screen instance slides so that the focused text box is kept visible. * Rename from com.minecraftcpp to com.reminecraftpe --------- Co-authored-by: iProgramInCpp <iprogramincpp@gmail.com>
114 lines
2.3 KiB
C++
114 lines
2.3 KiB
C++
/********************************************************************
|
|
Minecraft: Pocket Edition - Decompilation Project
|
|
Copyright (C) 2023 iProgramInCpp
|
|
|
|
The following code is licensed under the BSD 1 clause license.
|
|
SPDX-License-Identifier: BSD-1-Clause
|
|
********************************************************************/
|
|
|
|
#include "Controller.hpp"
|
|
#include <cmath>
|
|
|
|
bool Controller::isTouchedValues[2];
|
|
float Controller::stickValuesX[2];
|
|
float Controller::stickValuesY[2];
|
|
|
|
#ifndef __ANDROID__
|
|
const float Controller_unk_1[3] = { 0.0f, 0.64f, -0.64f };
|
|
#endif
|
|
|
|
bool Controller::isValidStick(int stickNo)
|
|
{
|
|
// We have 2 'sticks' on the Xperia Play
|
|
return stickNo >= 1 && stickNo <= 2;
|
|
}
|
|
|
|
float Controller::linearTransform(float a1, float a2, float a3, bool b)
|
|
{
|
|
float x1 = fabsf(a2);
|
|
float x2 = a1;
|
|
float x3 = fabsf(x1);
|
|
if (x3 >= x2)
|
|
return 0.0f;
|
|
|
|
float x4 = (a1 - x1) * a3;
|
|
if (b)
|
|
{
|
|
float x5 = fabsf(x4);
|
|
|
|
if (x5 > 1.0f)
|
|
{
|
|
x4 = -1.0;
|
|
if (x4 > 0.0f)
|
|
x4 = 1.0;
|
|
}
|
|
}
|
|
|
|
return x4;
|
|
}
|
|
|
|
void Controller::feed(int stickNo, int touched, float x, float y)
|
|
{
|
|
if (!isValidStick(stickNo))
|
|
return;
|
|
|
|
#ifdef __ANDROID__
|
|
int index = stickNo - 1;
|
|
#else
|
|
int index = (x >= 0.0f) ? 1 : 0;
|
|
#endif
|
|
|
|
// maybe the 2 'touch sticks' are actually internally 1 single surface??
|
|
|
|
isTouchedValues[index] = touched != 0;
|
|
#ifdef __ANDROID__
|
|
stickValuesX[index] = x;
|
|
#else
|
|
stickValuesX[index] = linearTransform(x + Controller_unk_1[index + 1], 0.0f, 2.78f, true);
|
|
#endif
|
|
|
|
stickValuesY[index] = y;
|
|
}
|
|
|
|
float Controller::getX(int stickNo)
|
|
{
|
|
if (!isValidStick(stickNo))
|
|
return 0.0f;
|
|
|
|
return stickValuesX[stickNo - 1];
|
|
}
|
|
|
|
float Controller::getY(int stickNo)
|
|
{
|
|
if (!isValidStick(stickNo))
|
|
return 0.0f;
|
|
|
|
return stickValuesY[stickNo - 1];
|
|
}
|
|
|
|
float Controller::getTransformedX(int stickNo, float a2, float a3, bool b)
|
|
{
|
|
if (!isValidStick(stickNo))
|
|
return 0.0f;
|
|
|
|
// @BUG: subtracting by 1? What if we're trying to grab stick 0?
|
|
return linearTransform(stickValuesX[stickNo - 1], a2, a3, b);
|
|
}
|
|
|
|
float Controller::getTransformedY(int stickNo, float a2, float a3, bool b)
|
|
{
|
|
if (!isValidStick(stickNo))
|
|
return 0.0f;
|
|
|
|
// @BUG: subtracting by 1? What if we're trying to grab stick 0?
|
|
return linearTransform(stickValuesY[stickNo - 1], a2, a3, b);
|
|
}
|
|
|
|
bool Controller::isTouched(int stickNo)
|
|
{
|
|
if (!isValidStick(stickNo))
|
|
return false;
|
|
|
|
return isTouchedValues[stickNo - 1];
|
|
}
|