Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 10:04:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Android fly - Use new asset and screen position

Browse source
This commit is contained in:
Cristian Luis Duarte 2018-04-04 18:19:01 -03:00
parent 88c83f3bfe
commit ffb8b0a60e
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/images/fly.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

3
libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
View file

@ -71,13 +71,14 @@ void Basic2DWindowOpenGLDisplayPlugin::customizeContext() {
} }
_virtualPadJumpBtnPixelSize = dpi * VirtualPad::Manager::JUMP_BTN_FULL_PIXELS / VirtualPad::Manager::DPI; _virtualPadJumpBtnPixelSize = dpi * VirtualPad::Manager::JUMP_BTN_FULL_PIXELS / VirtualPad::Manager::DPI;
iconPath = PathUtils::resourcesPath() + "images/analog_stick.png"; iconPath = PathUtils::resourcesPath() + "images/fly.png";
image = QImage(iconPath); image = QImage(iconPath);
if (image.format() != QImage::Format_ARGB32) { if (image.format() != QImage::Format_ARGB32) {
image = image.convertToFormat(QImage::Format_ARGB32); image = image.convertToFormat(QImage::Format_ARGB32);
} }
if ((image.width() > 0) && (image.height() > 0)) { if ((image.width() > 0) && (image.height() > 0)) {
image = image.scaled(_virtualPadJumpBtnPixelSize, _virtualPadJumpBtnPixelSize, Qt::KeepAspectRatio); image = image.scaled(_virtualPadJumpBtnPixelSize, _virtualPadJumpBtnPixelSize, Qt::KeepAspectRatio);
image = image.mirrored();
_virtualPadJumpBtnTexture = gpu::Texture::createStrict( _virtualPadJumpBtnTexture = gpu::Texture::createStrict(
gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA), gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA),

3
libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h
View file

@ -132,8 +132,7 @@ protected:
void jumpTouchEnd(); void jumpTouchEnd();
bool jumpTouchBeginIsValid(glm::vec2 touchPoint); bool jumpTouchBeginIsValid(glm::vec2 touchPoint);
void setupFixedCenter(VirtualPad::Manager& virtualPadManager, bool force = false); void setupControlsPositions(VirtualPad::Manager& virtualPadManager, bool force = false);
void setupJumpButton(VirtualPad::Manager& virtualPadManager);
void processInputDeviceForMove(VirtualPad::Manager& virtualPadManager); void processInputDeviceForMove(VirtualPad::Manager& virtualPadManager);
glm::vec2 clippedPointInCircle(float radius, glm::vec2 origin, glm::vec2 touchPoint); glm::vec2 clippedPointInCircle(float radius, glm::vec2 origin, glm::vec2 touchPoint);

7
libraries/ui/src/VirtualPadManager.cpp
View file

@ -38,9 +38,10 @@ namespace VirtualPad {
const float Manager::BASE_DIAMETER_PIXELS = 512.0f; const float Manager::BASE_DIAMETER_PIXELS = 512.0f;
const float Manager::BASE_MARGIN_PIXELS = 59.0f; const float Manager::BASE_MARGIN_PIXELS = 59.0f;
const float Manager::STICK_RADIUS_PIXELS = 105.0f; const float Manager::STICK_RADIUS_PIXELS = 105.0f;
const float Manager::JUMP_BTN_TOP_MARGIN_PIXELS = 59.0f; const float Manager::JUMP_BTN_TRIMMED_RADIUS_PIXELS = 67.0f;
const float Manager::JUMP_BTN_TRIMMED_RADIUS_PIXELS = 105.0f; const float Manager::JUMP_BTN_FULL_PIXELS = 134.0f;
const float Manager::JUMP_BTN_FULL_PIXELS = 512.0f; const float Manager::JUMP_BTN_BOTTOM_MARGIN_PIXELS = 67.0f;
const float Manager::JUMP_BTN_LEFT_MARGIN_PIXELS = 547.0f;
Manager::Manager() { Manager::Manager() {

3
libraries/ui/src/VirtualPadManager.h
View file

@ -51,9 +51,10 @@ namespace VirtualPad {
static const float BASE_DIAMETER_PIXELS; static const float BASE_DIAMETER_PIXELS;
static const float BASE_MARGIN_PIXELS; static const float BASE_MARGIN_PIXELS;
static const float STICK_RADIUS_PIXELS; static const float STICK_RADIUS_PIXELS;
static const float JUMP_BTN_TOP_MARGIN_PIXELS;
static const float JUMP_BTN_TRIMMED_RADIUS_PIXELS; static const float JUMP_BTN_TRIMMED_RADIUS_PIXELS;
static const float JUMP_BTN_FULL_PIXELS; static const float JUMP_BTN_FULL_PIXELS;
static const float JUMP_BTN_BOTTOM_MARGIN_PIXELS;
static const float JUMP_BTN_LEFT_MARGIN_PIXELS;
private: private:
Instance _leftVPadInstance; Instance _leftVPadInstance;