Restore keyPressed() function to support MVK_textoverlay sample
This commit is contained in:
parent
a74afb20fc
commit
3941a5becd
3 changed files with 16 additions and 19 deletions
|
|
@ -20,16 +20,18 @@ void MVKExample::displayLinkOutputCb() { // SRS - expose VulkanExampl
|
|||
_vulkanExample->displayLinkOutputCb();
|
||||
}
|
||||
|
||||
void MVKExample::windowWillResize(float x, float y)
|
||||
{
|
||||
void MVKExample::windowWillResize(float x, float y) {
|
||||
_vulkanExample->windowWillResize(x, y);
|
||||
}
|
||||
|
||||
void MVKExample::windowDidResize()
|
||||
{
|
||||
void MVKExample::windowDidResize() {
|
||||
_vulkanExample->windowDidResize();
|
||||
}
|
||||
|
||||
void MVKExample::keyPressed(uint32_t keyCode) {
|
||||
_vulkanExample->keyPressed(keyCode);
|
||||
}
|
||||
|
||||
void MVKExample::keyDown(uint32_t keyCode) {
|
||||
switch (keyCode)
|
||||
{
|
||||
|
|
@ -73,40 +75,33 @@ void MVKExample::keyUp(uint32_t keyCode) {
|
|||
}
|
||||
}
|
||||
|
||||
void MVKExample::mouseDown(double x, double y)
|
||||
{
|
||||
void MVKExample::mouseDown(double x, double y) {
|
||||
_vulkanExample->mousePos = glm::vec2(x, y);
|
||||
_vulkanExample->mouseButtons.left = true;
|
||||
}
|
||||
|
||||
void MVKExample::mouseUp(double x, double y)
|
||||
{
|
||||
void MVKExample::mouseUp(double x, double y) {
|
||||
_vulkanExample->mousePos = glm::vec2(x, y);
|
||||
_vulkanExample->mouseButtons.left = false;
|
||||
}
|
||||
|
||||
void MVKExample::otherMouseDown()
|
||||
{
|
||||
void MVKExample::otherMouseDown() {
|
||||
_vulkanExample->mouseButtons.right = true;
|
||||
}
|
||||
|
||||
void MVKExample::otherMouseUp()
|
||||
{
|
||||
void MVKExample::otherMouseUp() {
|
||||
_vulkanExample->mouseButtons.right = false;
|
||||
}
|
||||
|
||||
void MVKExample::mouseDragged(double x, double y)
|
||||
{
|
||||
void MVKExample::mouseDragged(double x, double y) {
|
||||
_vulkanExample->mouseDragged(x, y);
|
||||
}
|
||||
|
||||
void MVKExample::mouseMoved(double x, double y)
|
||||
{
|
||||
void MVKExample::mouseMoved(double x, double y) {
|
||||
_vulkanExample->mouseDragged(x, y);
|
||||
}
|
||||
|
||||
void MVKExample::scrollWheel(short wheelDelta)
|
||||
{
|
||||
void MVKExample::scrollWheel(short wheelDelta) {
|
||||
_vulkanExample->camera.translate(glm::vec3(0.0f, 0.0f, wheelDelta * 0.05f * _vulkanExample->camera.movementSpeed));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ public:
|
|||
void windowWillResize(float x, float y); // SRS - expose window resize events to DemoViewController
|
||||
void windowDidResize();
|
||||
|
||||
void keyDown(uint32_t keyCode); // SRS - expose keyboard events to DemoViewController
|
||||
void keyPressed(uint32_t keyCode); // SRS - expose keyboard events to DemoViewController
|
||||
void keyDown(uint32_t keyCode);
|
||||
void keyUp(uint32_t keyCode);
|
||||
|
||||
void mouseDown(double x, double y); // SRS - expose mouse events to DemoViewController
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ MVKExample* _mvkExample;
|
|||
|
||||
// SRS - Handle keyboard events
|
||||
-(void) keyDown:(NSEvent*) theEvent {
|
||||
_mvkExample->keyPressed(theEvent.keyCode);
|
||||
_mvkExample->keyDown(theEvent.keyCode);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue