Merge remote-tracking branch 'origin/Develop' into #111-Snake-Logic

Northeastern-Electric-Racing · Nov 6, 2024 · 1f862ea · 1f862ea
2 parents d635c6e + 4805cdc
commit 1f862ea
Show file tree

Hide file tree

Showing 14 changed files with 247 additions and 178 deletions.
diff --git a/NERODesign/content/Battery.qml b/NERODesign/content/Battery.qml
@@ -11,29 +11,51 @@ Item {
     Rectangle {
         id: topOutlet
         x: parent.width / 2 - parent.width / 4
-        width: parent.width / 2
+        width: parent.width / 4.5
         height: parent.height
-        color: "white"
+        radius: 30
+        color: battery.value > 70 ? "#55FF00" : battery.value > 40 ? "orange" : "red"
         anchors.centerIn: parent
     }
 
     Rectangle {
         id: mainContainer
-        width: parent.width
+        y: 48
+        width: parent.width / 2.15
         height: parent.height - parent.height / 10
-        color: "white"
+        radius: 30
+        color: battery.value > 70 ? "#55FF00" : battery.value > 40 ? "orange" : "red"
         anchors.bottom: parent.bottom
+        anchors.bottomMargin: 0
+        anchors.horizontalCenterOffset: 0
         anchors.horizontalCenter: parent.horizontalCenter
 
         Rectangle {
-            id: fillContainer
-            width: parent.width - (battery.horizontalFillMargin * 2)
-            height: (parent.height - (battery.verticalFillMargin * 2))
-                    * (battery.value / battery.maxValue)
-            color: battery.value > 70 ? "#55FF00" : battery.value > 40 ? "orange" : "red"
+            id: emptyContainer
+            y: 123
+            width: parent.width - (battery.horizontalFillMargin * 1.5)
+            height: (parent.height - (battery.verticalFillMargin * 3))
+            radius: 30
+            color: "black"
             anchors.bottom: parent.bottom
+            anchors.bottomMargin: 36
+            anchors.horizontalCenterOffset: 0
             anchors.horizontalCenter: parent.horizontalCenter
-            anchors.bottomMargin: battery.verticalFillMargin
+
+            Rectangle {
+                id: fillContainer
+                y: 136
+                width: parent.width
+                height: (parent.height * (battery.value / battery.maxValue))
+                gradient: Gradient {
+                                GradientStop { position: 0.0; color: battery.value > 70 ? "#55FF00" : battery.value > 40 ? "orange" : "red" }
+                                GradientStop { position: 1.0; color: "black" }
+                            }
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: 0
+                anchors.horizontalCenterOffset: 0
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
         }
     }
 }
diff --git a/NERODesign/content/Snake.qml b/NERODesign/content/Snake.qml
@@ -0,0 +1,40 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+
+Rectangle {
+    id: snake
+
+    width: 800
+    height: 480
+    color: "black"
+
+    property int minX: 200
+    property int maxX: 600
+    property int minY: 40
+    property int maxY: 440
+
+    property var snakeBody: [{"x": 300, "y": 300}, {"x": 280, "y": 300}, {"x": 260, "y": 300}]
+    property int segmentSize: 20
+    property string direction: "right"
+
+    property int score: 0
+
+    Rectangle {
+        width: 400
+        height: 400
+        anchors.centerIn: parent
+        border.color: "white"
+        border.width: 2
+        color: "transparent"
+    }
+
+    Text {
+        id: scoreText
+        text: "Score: " + snake.score
+        font.pixelSize: 24
+        color: "white"
+        anchors.top: parent.top
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.topMargin: 10
+    }
+}
diff --git a/NERODesign/content/SnakeBody.qml b/NERODesign/content/SnakeBody.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+
+Item {
+    id: food
+    property int dimension: 20
+
+    width: dimension
+    height: dimension
+
+    Rectangle {
+        id: foodColor
+        height: dimension
+        width: dimension
+        color: "lime"
+    }
+}
diff --git a/NERODesign/content/SnakeFood.qml b/NERODesign/content/SnakeFood.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+
+Item {
+    id: food
+    property int dimension: 20
+
+    width: dimension
+    height: dimension
+
+    Rectangle {
+        id: foodColor
+        height: dimension
+        width: dimension
+        color: "red"
+    }
+}
diff --git a/NERODevelopment/CMakeLists.txt b/NERODevelopment/CMakeLists.txt
@@ -72,7 +72,9 @@ set(PROJECT_SOURCES
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Network Mqtt Protobuf Widgets)
 
-qt_add_executable(NEROApp ${PROJECT_SOURCES})
+qt_add_executable(NEROApp ${PROJECT_SOURCES}
+    src/controllers/snakecontroller.h
+    src/controllers/snakecontroller.cpp)
 
 qt_add_resources(NEROApp "configuration"
     PREFIX "/"

diff --git a/NERODevelopment/content/CMakeLists.txt b/NERODevelopment/content/CMakeLists.txt
@@ -48,6 +48,9 @@ qt6_add_qml_module(content
         Arrow.qml
         OffScreen2.qml
         StatusDisplay.qml
+        Snake.qml
+        SnakeBody.qml
+        SnakeFood.qml
 
     RESOURCES
         fonts/fonts.txt

diff --git a/NERODevelopment/content/HomeMenuItem.qml b/NERODevelopment/content/HomeMenuItem.qml
@@ -13,7 +13,7 @@ Rectangle {
     LabelText {
         id: label
         padding: 8
-        font.pixelSize: 16
+        font.pixelSize: 12
         text: parent.text
     }
 }
diff --git a/NERODevelopment/content/NavigationController.qml b/NERODevelopment/content/NavigationController.qml
@@ -7,14 +7,15 @@ Item {
     focus: !navigation.isSelected
     property int selectedPageIndex: navigationController.selectedPageIndex
     property bool isSelected: navigationController.isSelected
-    property int exitPageIndex: 7
+    property int exitPageIndex: 8
     property int offPageIndex: 0
     property int pitPageIndex: 1
     property int speedPageIndex: 2
     property int efficiencyPageIndex: 3
     property int debugPageIndex: 4
     property int configurationPageIndex: 5
     property int flappyPageIndex: 6
+    property int snakePageIndex: 7
 
     Keys.onPressed: event => {
                         console.log(navigationController.isSelected,
@@ -89,6 +90,11 @@ Item {
             text: "Flappy Bird"
         }
 
+        HomeMenuItem {
+            highlighted: selectedPageIndex === snakePageIndex
+            text: "Snake"
+        }
+
         HomeMenuItem {
             highlighted: selectedPageIndex === exitPageIndex
             text: "Exit"
@@ -129,4 +135,9 @@ Item {
         visible: selectedPageIndex === flappyPageIndex && isSelected
         isFocused: selectedPageIndex === flappyPageIndex && isSelected
     }
+
+    Snake {
+        visible: selectedPageIndex === snakePageIndex && isSelected
+        isFocused: selectedPageIndex === snakePageIndex && isSelected
+    }
 }