claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Android UI overlay touch handling

Browse source
This commit is contained in:
saschawillems 2017-11-02 17:07:07 +01:00
parent 97975a314d
commit 5795a77e7b
3 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/VulkanAndroid.h
View file

@ -158,7 +158,9 @@ namespace vks
{ {
/* @brief Touch control thresholds from Android NDK samples */ /* @brief Touch control thresholds from Android NDK samples */
const int32_t DOUBLE_TAP_TIMEOUT = 300 * 1000000; const int32_t DOUBLE_TAP_TIMEOUT = 300 * 1000000;
const int32_t TAP_TIMEOUT = 180 * 1000000;
const int32_t DOUBLE_TAP_SLOP = 100; const int32_t DOUBLE_TAP_SLOP = 100;
const int32_t TAP_SLOP = 8;
/** @brief Density of the device screen (in DPI) */ /** @brief Density of the device screen (in DPI) */
extern int32_t screenDensity; extern int32_t screenDensity;

6
base/VulkanUIOverlay.cpp
View file

@ -29,13 +29,13 @@ namespace vks
#if defined(__ANDROID__) #if defined(__ANDROID__)
if (vks::android::screenDensity >= ACONFIGURATION_DENSITY_XXHIGH) { if (vks::android::screenDensity >= ACONFIGURATION_DENSITY_XXHIGH) {
scale = 3.0f; scale = 3.5f;
} }
else if (vks::android::screenDensity >= ACONFIGURATION_DENSITY_XHIGH) { else if (vks::android::screenDensity >= ACONFIGURATION_DENSITY_XHIGH) {
scale = 2.25f; scale = 2.5f;
} }
else if (vks::android::screenDensity >= ACONFIGURATION_DENSITY_HIGH) { else if (vks::android::screenDensity >= ACONFIGURATION_DENSITY_HIGH) {
scale = 1.875f; scale = 2.0f;
}; };
#endif #endif

28
base/vulkanexamplebase.cpp
View file

@ -576,6 +576,12 @@ void VulkanExampleBase::updateOverlay()
ImGui::Render(); ImGui::Render();
UIOverlay->update(); UIOverlay->update();
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
if (mouseButtons.left) {
mouseButtons.left = false;
}
#endif
} }
void VulkanExampleBase::prepareFrame() void VulkanExampleBase::prepareFrame()
@ -1211,6 +1217,19 @@ int32_t VulkanExampleBase::handleAppInput(struct android_app* app, AInputEvent*
vulkanExample->touchTimer = 0.0; vulkanExample->touchTimer = 0.0;
vulkanExample->touchDown = false; vulkanExample->touchDown = false;
vulkanExample->camera.keys.up = false; vulkanExample->camera.keys.up = false;
// Detect single tap
int64_t eventTime = AMotionEvent_getEventTime(event);
int64_t downTime = AMotionEvent_getDownTime(event);
if (eventTime - downTime <= vks::android::TAP_TIMEOUT) {
float deadZone = (160.f / vks::android::screenDensity) * vks::android::TAP_SLOP * vks::android::TAP_SLOP;
float x = AMotionEvent_getX(event, 0) - vulkanExample->touchPos.x;
float y = AMotionEvent_getY(event, 0) - vulkanExample->touchPos.y;
if ((x * x + y * y) < deadZone) {
vulkanExample->mouseButtons.left = true;
}
};
return 1; return 1;
break; break;
} }
@ -1231,9 +1250,17 @@ int32_t VulkanExampleBase::handleAppInput(struct android_app* app, AInputEvent*
} }
vulkanExample->touchPos.x = AMotionEvent_getX(event, 0); vulkanExample->touchPos.x = AMotionEvent_getX(event, 0);
vulkanExample->touchPos.y = AMotionEvent_getY(event, 0); vulkanExample->touchPos.y = AMotionEvent_getY(event, 0);
vulkanExample->mousePos.x = AMotionEvent_getX(event, 0);
vulkanExample->mousePos.y = AMotionEvent_getY(event, 0);
break; break;
} }
case AMOTION_EVENT_ACTION_MOVE: { case AMOTION_EVENT_ACTION_MOVE: {
bool handled = false;
if (vulkanExample->settings.overlay) {
ImGuiIO& io = ImGui::GetIO();
handled = io.WantCaptureMouse;
}
if (!handled) {
int32_t eventX = AMotionEvent_getX(event, 0); int32_t eventX = AMotionEvent_getX(event, 0);
int32_t eventY = AMotionEvent_getY(event, 0); int32_t eventY = AMotionEvent_getY(event, 0);
@ -1250,6 +1277,7 @@ int32_t VulkanExampleBase::handleAppInput(struct android_app* app, AInputEvent*
vulkanExample->touchPos.x = eventX; vulkanExample->touchPos.x = eventX;
vulkanExample->touchPos.y = eventY; vulkanExample->touchPos.y = eventY;
}
break; break;
} }
default: default: