QuasarApp/Snake
4
1
Fork 0
mirror of https://github.com/QuasarApp/Snake.git synced 2025-05-07 15:09:46 +00:00
Code Issues Projects Releases Wiki Activity

drop support android extrass and qt5

Browse Source
This commit is contained in:
Andrei Yankovich 2021-07-20 15:05:19 +03:00
parent 227f5d9b40
commit a49dc9a4dd
6 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Client/CMakeLists.txt
View File

@ -43,17 +43,17 @@ if (ANDROID)
QmlNotyfyService QmlNotyfyService
ViewSolutions) ViewSolutions)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED) # find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED)
addDeployAPK(${CURRENT_PROJECT} # addDeployAPK(${CURRENT_PROJECT}
"${CMAKE_CURRENT_LIST_DIR}/android" # "${CMAKE_CURRENT_LIST_DIR}/android"
"SnakeProject" # "SnakeProject"
"${SIGPATH}/Crawl.keystore" # "${SIGPATH}/Crawl.keystore"
"${SIGPASS_SNAKE}" # "${SIGPASS_SNAKE}"
"${TARGET_DIR}" # "${TARGET_DIR}"
"${SNAKE_EXTRA_LIBS}") # "${SNAKE_EXTRA_LIBS}")
target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras) # target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras)
file(GLOB java_files file(GLOB java_files
"android/src/com/quasarapp/androidtools/*.java" "android/src/com/quasarapp/androidtools/*.java"

4
src/Core/CrawlModule/DayLight.qml
View File

@ -5,8 +5,8 @@
//# of this license document, but changing it is not allowed. //# of this license document, but changing it is not allowed.
//# //#
import QtQuick 2.15 import QtQuick
import QtQuick3D 1.15 import QtQuick3D
Node { Node {
id: graphicItem id: graphicItem

4
src/Core/CrawlModule/GraphicItem.qml
View File

@ -5,8 +5,8 @@
//# of this license document, but changing it is not allowed. //# of this license document, but changing it is not allowed.
//# //#
import QtQuick 2.15 import QtQuick
import QtQuick3D 1.15 import QtQuick3D
Model { Model {
id: graphicItem id: graphicItem

12
src/Core/CrawlModule/Scene.qml
View File

@ -1,11 +1,11 @@
import QtQuick 2.15 import QtQuick
import QtQuick3D 1.15 import QtQuick3D
import QtQuick.Controls.Material 2.15 import QtQuick.Controls.Material
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
// https://doc.qt.io/qt-5/qqmlengine.html#qmlRegisterUncreatableMetaObject // https://doc.qt.io/qt-5/qqmlengine.html#qmlRegisterUncreatableMetaObject
import engine.worldstatus 1.0 import engine.worldstatus
View3D { View3D {
id: scene; id: scene;

30
src/CrawlTestLvl/TestControl.qml
View File

@ -21,7 +21,7 @@ DefaultMenu {
property real oldX: 0 property real oldX: 0
property real oldY: 0 property real oldY: 0
cursorShape: Qt.DragMoveCursor cursorShape: Qt.DragMoveCursor
onPressed: { onPressed: (mouse) => {
track = true track = true
oldX = mouse.x oldX = mouse.x
oldY = mouse.y oldY = mouse.y
@ -32,7 +32,7 @@ DefaultMenu {
track = false track = false
} }
onMouseXChanged: { onPositionChanged: (mouse) => {
if (!model) { if (!model) {
return; return;
} }
@ -41,27 +41,17 @@ DefaultMenu {
return; return;
} }
const delta = mouse.x - oldX; let delta = mouse.y - oldY;
const radianDelta = (delta / (parent.width / 2)) * 45 let radianDelta = (delta / (parent.height / 2)) * 45
model.xChanged(radianDelta)
oldX = mouse.x;
}
onMouseYChanged: {
if (!model) {
return;
}
if (!track) {
return;
}
const delta = mouse.y - oldY;
const radianDelta = (delta / (parent.height / 2)) * 45
model.yChanged(radianDelta) model.yChanged(radianDelta)
oldY = mouse.y; oldY = mouse.y;
delta = mouse.x - oldX;
radianDelta = (delta / (parent.width / 2)) * 45
model.xChanged(radianDelta)
oldX = mouse.x;
} }
anchors.fill: parent anchors.fill: parent

2
submodules/ViewSolutions

@ -1 +1 @@
Subproject commit 69dd61abe7dee5d27f70b055a26bc91a3bd00f7a Subproject commit 40e620ea324f09e31d8a8808c221710c63d28083