diff options
Diffstat (limited to 'examples/vulkan/hellovulkancubes/vulkanwindow.cpp')
| -rw-r--r-- | examples/vulkan/hellovulkancubes/vulkanwindow.cpp | 59 |
1 files changed, 6 insertions, 53 deletions
diff --git a/examples/vulkan/hellovulkancubes/vulkanwindow.cpp b/examples/vulkan/hellovulkancubes/vulkanwindow.cpp index 9a4eaf1901..ec5dbdc6c6 100644 --- a/examples/vulkan/hellovulkancubes/vulkanwindow.cpp +++ b/examples/vulkan/hellovulkancubes/vulkanwindow.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "vulkanwindow.h" #include "renderer.h" @@ -82,7 +35,7 @@ void VulkanWindow::meshSwitched(bool enable) void VulkanWindow::mousePressEvent(QMouseEvent *e) { m_pressed = true; - m_lastPos = e->pos(); + m_lastPos = e->position().toPoint(); } void VulkanWindow::mouseReleaseEvent(QMouseEvent *) @@ -95,8 +48,8 @@ void VulkanWindow::mouseMoveEvent(QMouseEvent *e) if (!m_pressed) return; - int dx = e->pos().x() - m_lastPos.x(); - int dy = e->pos().y() - m_lastPos.y(); + int dx = e->position().toPoint().x() - m_lastPos.x(); + int dy = e->position().toPoint().y() - m_lastPos.y(); if (dy) m_renderer->pitch(dy / 10.0f); @@ -104,7 +57,7 @@ void VulkanWindow::mouseMoveEvent(QMouseEvent *e) if (dx) m_renderer->yaw(dx / 10.0f); - m_lastPos = e->pos(); + m_lastPos = e->position().toPoint(); } void VulkanWindow::keyPressEvent(QKeyEvent *e) |