diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-05-12 18:45:21 -0400 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2024-05-12 18:45:21 -0400 |
commit | e3fbcc9f29a1b1c83b23a4cef3819631fd3117d0 (patch) | |
tree | ececdc789eda39a9d07da037a839a9906591864e | |
parent | 00658b38bd65e2cb81a502bd72e98ad9c411a7b4 (diff) | |
download | lingo-ap-tracker-e3fbcc9f29a1b1c83b23a4cef3819631fd3117d0.tar.gz lingo-ap-tracker-e3fbcc9f29a1b1c83b23a4cef3819631fd3117d0.tar.bz2 lingo-ap-tracker-e3fbcc9f29a1b1c83b23a4cef3819631fd3117d0.zip |
Subway map hover detection with a quadtree
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/subway_map.cpp | 37 | ||||
-rw-r--r-- | src/subway_map.h | 10 | ||||
-rw-r--r-- | vendor/quadtree/Box.h | 67 | ||||
-rw-r--r-- | vendor/quadtree/LICENSE | 21 | ||||
-rw-r--r-- | vendor/quadtree/Quadtree.h | 315 | ||||
-rw-r--r-- | vendor/quadtree/Vector2.h | 47 |
7 files changed, 498 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 99b15f8..d6170a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -22,6 +22,7 @@ include_directories( | |||
22 | ${yaml-cpp_INCLUDE_DIRS} | 22 | ${yaml-cpp_INCLUDE_DIRS} |
23 | ${OpenSSL_INCLUDE_DIRS} | 23 | ${OpenSSL_INCLUDE_DIRS} |
24 | vendor/whereami | 24 | vendor/whereami |
25 | vendor | ||
25 | ) | 26 | ) |
26 | 27 | ||
27 | find_path(SYSTEM_INCLUDE_DIR zlib.h) | 28 | find_path(SYSTEM_INCLUDE_DIR zlib.h) |
diff --git a/src/subway_map.cpp b/src/subway_map.cpp index 0aa7df3..230a256 100644 --- a/src/subway_map.cpp +++ b/src/subway_map.cpp | |||
@@ -25,6 +25,13 @@ SubwayMap::SubwayMap(wxWindow *parent) : wxPanel(parent, wxID_ANY) { | |||
25 | return; | 25 | return; |
26 | } | 26 | } |
27 | 27 | ||
28 | tree_ = std::make_unique<quadtree::Quadtree<int, GetItemBox>>( | ||
29 | quadtree::Box<float>{0, 0, static_cast<float>(map_image_.GetWidth()), | ||
30 | static_cast<float>(map_image_.GetHeight())}); | ||
31 | for (const SubwayItem &subway_item : GD_GetSubwayItems()) { | ||
32 | tree_->add(subway_item.id); | ||
33 | } | ||
34 | |||
28 | Redraw(); | 35 | Redraw(); |
29 | 36 | ||
30 | Bind(wxEVT_PAINT, &SubwayMap::OnPaint, this); | 37 | Bind(wxEVT_PAINT, &SubwayMap::OnPaint, this); |
@@ -47,6 +54,30 @@ void SubwayMap::OnPaint(wxPaintEvent &event) { | |||
47 | } | 54 | } |
48 | 55 | ||
49 | void SubwayMap::OnMouseMove(wxMouseEvent &event) { | 56 | void SubwayMap::OnMouseMove(wxMouseEvent &event) { |
57 | int mouse_x = std::clamp( | ||
58 | (event.GetX() - render_x_) * map_image_.GetWidth() / render_width_, | ||
59 | 0, map_image_.GetWidth() - 1); | ||
60 | int mouse_y = std::clamp( | ||
61 | (event.GetY() - render_y_) * map_image_.GetWidth() / render_width_, | ||
62 | 0, map_image_.GetHeight() - 1); | ||
63 | |||
64 | std::vector<int> hovered = tree_->query( | ||
65 | {static_cast<float>(mouse_x), static_cast<float>(mouse_y), 2, 2}); | ||
66 | std::optional<int> new_hovered_item; | ||
67 | if (!hovered.empty()) { | ||
68 | new_hovered_item = hovered[0]; | ||
69 | } | ||
70 | |||
71 | if (new_hovered_item != hovered_item_) { | ||
72 | if (new_hovered_item) { | ||
73 | wxLogVerbose("Hovered: %d", *new_hovered_item); | ||
74 | } else { | ||
75 | wxLogVerbose("Un-hovered: %d", *hovered_item_); | ||
76 | } | ||
77 | |||
78 | hovered_item_ = new_hovered_item; | ||
79 | } | ||
80 | |||
50 | event.Skip(); | 81 | event.Skip(); |
51 | } | 82 | } |
52 | 83 | ||
@@ -121,3 +152,9 @@ void SubwayMap::Redraw() { | |||
121 | } | 152 | } |
122 | } | 153 | } |
123 | } | 154 | } |
155 | |||
156 | quadtree::Box<float> SubwayMap::GetItemBox::operator()(const int& id) const { | ||
157 | const SubwayItem &subway_item = GD_GetSubwayItem(id); | ||
158 | return {static_cast<float>(subway_item.x), static_cast<float>(subway_item.y), | ||
159 | AREA_ACTUAL_SIZE, AREA_ACTUAL_SIZE}; | ||
160 | } | ||
diff --git a/src/subway_map.h b/src/subway_map.h index e375750..6cb5c63 100644 --- a/src/subway_map.h +++ b/src/subway_map.h | |||
@@ -7,8 +7,12 @@ | |||
7 | #include <wx/wx.h> | 7 | #include <wx/wx.h> |
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #include <memory> | ||
11 | #include <optional> | ||
10 | #include <vector> | 12 | #include <vector> |
11 | 13 | ||
14 | #include <quadtree/Quadtree.h> | ||
15 | |||
12 | class SubwayMap : public wxPanel { | 16 | class SubwayMap : public wxPanel { |
13 | public: | 17 | public: |
14 | SubwayMap(wxWindow *parent); | 18 | SubwayMap(wxWindow *parent); |
@@ -29,7 +33,13 @@ class SubwayMap : public wxPanel { | |||
29 | int render_y_ = 0; | 33 | int render_y_ = 0; |
30 | int render_width_ = 0; | 34 | int render_width_ = 0; |
31 | int render_height_ = 0; | 35 | int render_height_ = 0; |
36 | |||
37 | struct GetItemBox { | ||
38 | quadtree::Box<float> operator()(const int &id) const; | ||
39 | }; | ||
32 | 40 | ||
41 | std::unique_ptr<quadtree::Quadtree<int, GetItemBox>> tree_; | ||
42 | std::optional<int> hovered_item_; | ||
33 | }; | 43 | }; |
34 | 44 | ||
35 | #endif /* end of include guard: SUBWAY_MAP_H_BD2D843E */ | 45 | #endif /* end of include guard: SUBWAY_MAP_H_BD2D843E */ |
diff --git a/vendor/quadtree/Box.h b/vendor/quadtree/Box.h new file mode 100644 index 0000000..65182bf --- /dev/null +++ b/vendor/quadtree/Box.h | |||
@@ -0,0 +1,67 @@ | |||
1 | #pragma once | ||
2 | |||
3 | #include "Vector2.h" | ||
4 | |||
5 | namespace quadtree | ||
6 | { | ||
7 | |||
8 | template<typename T> | ||
9 | class Box | ||
10 | { | ||
11 | public: | ||
12 | T left; | ||
13 | T top; | ||
14 | T width; // Must be positive | ||
15 | T height; // Must be positive | ||
16 | |||
17 | constexpr Box(T Left = 0, T Top = 0, T Width = 0, T Height = 0) noexcept : | ||
18 | left(Left), top(Top), width(Width), height(Height) | ||
19 | { | ||
20 | |||
21 | } | ||
22 | |||
23 | constexpr Box(const Vector2<T>& position, const Vector2<T>& size) noexcept : | ||
24 | left(position.x), top(position.y), width(size.x), height(size.y) | ||
25 | { | ||
26 | |||
27 | } | ||
28 | |||
29 | constexpr T getRight() const noexcept | ||
30 | { | ||
31 | return left + width; | ||
32 | } | ||
33 | |||
34 | constexpr T getBottom() const noexcept | ||
35 | { | ||
36 | return top + height; | ||
37 | } | ||
38 | |||
39 | constexpr Vector2<T> getTopLeft() const noexcept | ||
40 | { | ||
41 | return Vector2<T>(left, top); | ||
42 | } | ||
43 | |||
44 | constexpr Vector2<T> getCenter() const noexcept | ||
45 | { | ||
46 | return Vector2<T>(left + width / 2, top + height / 2); | ||
47 | } | ||
48 | |||
49 | constexpr Vector2<T> getSize() const noexcept | ||
50 | { | ||
51 | return Vector2<T>(width, height); | ||
52 | } | ||
53 | |||
54 | constexpr bool contains(const Box<T>& box) const noexcept | ||
55 | { | ||
56 | return left <= box.left && box.getRight() <= getRight() && | ||
57 | top <= box.top && box.getBottom() <= getBottom(); | ||
58 | } | ||
59 | |||
60 | constexpr bool intersects(const Box<T>& box) const noexcept | ||
61 | { | ||
62 | return !(left >= box.getRight() || getRight() <= box.left || | ||
63 | top >= box.getBottom() || getBottom() <= box.top); | ||
64 | } | ||
65 | }; | ||
66 | |||
67 | } \ No newline at end of file | ||
diff --git a/vendor/quadtree/LICENSE b/vendor/quadtree/LICENSE new file mode 100644 index 0000000..1b226d3 --- /dev/null +++ b/vendor/quadtree/LICENSE | |||
@@ -0,0 +1,21 @@ | |||
1 | MIT License | ||
2 | |||
3 | Copyright (c) 2019 Pierre Vigier | ||
4 | |||
5 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
6 | of this software and associated documentation files (the "Software"), to deal | ||
7 | in the Software without restriction, including without limitation the rights | ||
8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
9 | copies of the Software, and to permit persons to whom the Software is | ||
10 | furnished to do so, subject to the following conditions: | ||
11 | |||
12 | The above copyright notice and this permission notice shall be included in all | ||
13 | copies or substantial portions of the Software. | ||
14 | |||
15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
21 | SOFTWARE. | ||
diff --git a/vendor/quadtree/Quadtree.h b/vendor/quadtree/Quadtree.h new file mode 100644 index 0000000..06097c5 --- /dev/null +++ b/vendor/quadtree/Quadtree.h | |||
@@ -0,0 +1,315 @@ | |||
1 | #pragma once | ||
2 | |||
3 | #include <cassert> | ||
4 | #include <algorithm> | ||
5 | #include <array> | ||
6 | #include <memory> | ||
7 | #include <type_traits> | ||
8 | #include <vector> | ||
9 | #include "Box.h" | ||
10 | |||
11 | namespace quadtree | ||
12 | { | ||
13 | |||
14 | template<typename T, typename GetBox, typename Equal = std::equal_to<T>, typename Float = float> | ||
15 | class Quadtree | ||
16 | { | ||
17 | static_assert(std::is_convertible_v<std::invoke_result_t<GetBox, const T&>, Box<Float>>, | ||
18 | "GetBox must be a callable of signature Box<Float>(const T&)"); | ||
19 | static_assert(std::is_convertible_v<std::invoke_result_t<Equal, const T&, const T&>, bool>, | ||
20 | "Equal must be a callable of signature bool(const T&, const T&)"); | ||
21 | static_assert(std::is_arithmetic_v<Float>); | ||
22 | |||
23 | public: | ||
24 | Quadtree(const Box<Float>& box, const GetBox& getBox = GetBox(), | ||
25 | const Equal& equal = Equal()) : | ||
26 | mBox(box), mRoot(std::make_unique<Node>()), mGetBox(getBox), mEqual(equal) | ||
27 | { | ||
28 | |||
29 | } | ||
30 | |||
31 | void add(const T& value) | ||
32 | { | ||
33 | add(mRoot.get(), 0, mBox, value); | ||
34 | } | ||
35 | |||
36 | void remove(const T& value) | ||
37 | { | ||
38 | remove(mRoot.get(), mBox, value); | ||
39 | } | ||
40 | |||
41 | std::vector<T> query(const Box<Float>& box) const | ||
42 | { | ||
43 | auto values = std::vector<T>(); | ||
44 | query(mRoot.get(), mBox, box, values); | ||
45 | return values; | ||
46 | } | ||
47 | |||
48 | std::vector<std::pair<T, T>> findAllIntersections() const | ||
49 | { | ||
50 | auto intersections = std::vector<std::pair<T, T>>(); | ||
51 | findAllIntersections(mRoot.get(), intersections); | ||
52 | return intersections; | ||
53 | } | ||
54 | |||
55 | Box<Float> getBox() const | ||
56 | { | ||
57 | return mBox; | ||
58 | } | ||
59 | |||
60 | private: | ||
61 | static constexpr auto Threshold = std::size_t(16); | ||
62 | static constexpr auto MaxDepth = std::size_t(8); | ||
63 | |||
64 | struct Node | ||
65 | { | ||
66 | std::array<std::unique_ptr<Node>, 4> children; | ||
67 | std::vector<T> values; | ||
68 | }; | ||
69 | |||
70 | Box<Float> mBox; | ||
71 | std::unique_ptr<Node> mRoot; | ||
72 | GetBox mGetBox; | ||
73 | Equal mEqual; | ||
74 | |||
75 | bool isLeaf(const Node* node) const | ||
76 | { | ||
77 | return !static_cast<bool>(node->children[0]); | ||
78 | } | ||
79 | |||
80 | Box<Float> computeBox(const Box<Float>& box, int i) const | ||
81 | { | ||
82 | auto origin = box.getTopLeft(); | ||
83 | auto childSize = box.getSize() / static_cast<Float>(2); | ||
84 | switch (i) | ||
85 | { | ||
86 | // North West | ||
87 | case 0: | ||
88 | return Box<Float>(origin, childSize); | ||
89 | // Norst East | ||
90 | case 1: | ||
91 | return Box<Float>(Vector2<Float>(origin.x + childSize.x, origin.y), childSize); | ||
92 | // South West | ||
93 | case 2: | ||
94 | return Box<Float>(Vector2<Float>(origin.x, origin.y + childSize.y), childSize); | ||
95 | // South East | ||
96 | case 3: | ||
97 | return Box<Float>(origin + childSize, childSize); | ||
98 | default: | ||
99 | assert(false && "Invalid child index"); | ||
100 | return Box<Float>(); | ||
101 | } | ||
102 | } | ||
103 | |||
104 | int getQuadrant(const Box<Float>& nodeBox, const Box<Float>& valueBox) const | ||
105 | { | ||
106 | auto center = nodeBox.getCenter(); | ||
107 | // West | ||
108 | if (valueBox.getRight() < center.x) | ||
109 | { | ||
110 | // North West | ||
111 | if (valueBox.getBottom() < center.y) | ||
112 | return 0; | ||
113 | // South West | ||
114 | else if (valueBox.top >= center.y) | ||
115 | return 2; | ||
116 | // Not contained in any quadrant | ||
117 | else | ||
118 | return -1; | ||
119 | } | ||
120 | // East | ||
121 | else if (valueBox.left >= center.x) | ||
122 | { | ||
123 | // North East | ||
124 | if (valueBox.getBottom() < center.y) | ||
125 | return 1; | ||
126 | // South East | ||
127 | else if (valueBox.top >= center.y) | ||
128 | return 3; | ||
129 | // Not contained in any quadrant | ||
130 | else | ||
131 | return -1; | ||
132 | } | ||
133 | // Not contained in any quadrant | ||
134 | else | ||
135 | return -1; | ||
136 | } | ||
137 | |||
138 | void add(Node* node, std::size_t depth, const Box<Float>& box, const T& value) | ||
139 | { | ||
140 | assert(node != nullptr); | ||
141 | assert(box.contains(mGetBox(value))); | ||
142 | if (isLeaf(node)) | ||
143 | { | ||
144 | // Insert the value in this node if possible | ||
145 | if (depth >= MaxDepth || node->values.size() < Threshold) | ||
146 | node->values.push_back(value); | ||
147 | // Otherwise, we split and we try again | ||
148 | else | ||
149 | { | ||
150 | split(node, box); | ||
151 | add(node, depth, box, value); | ||
152 | } | ||
153 | } | ||
154 | else | ||
155 | { | ||
156 | auto i = getQuadrant(box, mGetBox(value)); | ||
157 | // Add the value in a child if the value is entirely contained in it | ||
158 | if (i != -1) | ||
159 | add(node->children[static_cast<std::size_t>(i)].get(), depth + 1, computeBox(box, i), value); | ||
160 | // Otherwise, we add the value in the current node | ||
161 | else | ||
162 | node->values.push_back(value); | ||
163 | } | ||
164 | } | ||
165 | |||
166 | void split(Node* node, const Box<Float>& box) | ||
167 | { | ||
168 | assert(node != nullptr); | ||
169 | assert(isLeaf(node) && "Only leaves can be split"); | ||
170 | // Create children | ||
171 | for (auto& child : node->children) | ||
172 | child = std::make_unique<Node>(); | ||
173 | // Assign values to children | ||
174 | auto newValues = std::vector<T>(); // New values for this node | ||
175 | for (const auto& value : node->values) | ||
176 | { | ||
177 | auto i = getQuadrant(box, mGetBox(value)); | ||
178 | if (i != -1) | ||
179 | node->children[static_cast<std::size_t>(i)]->values.push_back(value); | ||
180 | else | ||
181 | newValues.push_back(value); | ||
182 | } | ||
183 | node->values = std::move(newValues); | ||
184 | } | ||
185 | |||
186 | bool remove(Node* node, const Box<Float>& box, const T& value) | ||
187 | { | ||
188 | assert(node != nullptr); | ||
189 | assert(box.contains(mGetBox(value))); | ||
190 | if (isLeaf(node)) | ||
191 | { | ||
192 | // Remove the value from node | ||
193 | removeValue(node, value); | ||
194 | return true; | ||
195 | } | ||
196 | else | ||
197 | { | ||
198 | // Remove the value in a child if the value is entirely contained in it | ||
199 | auto i = getQuadrant(box, mGetBox(value)); | ||
200 | if (i != -1) | ||
201 | { | ||
202 | if (remove(node->children[static_cast<std::size_t>(i)].get(), computeBox(box, i), value)) | ||
203 | return tryMerge(node); | ||
204 | } | ||
205 | // Otherwise, we remove the value from the current node | ||
206 | else | ||
207 | removeValue(node, value); | ||
208 | return false; | ||
209 | } | ||
210 | } | ||
211 | |||
212 | void removeValue(Node* node, const T& value) | ||
213 | { | ||
214 | // Find the value in node->values | ||
215 | auto it = std::find_if(std::begin(node->values), std::end(node->values), | ||
216 | [this, &value](const auto& rhs){ return mEqual(value, rhs); }); | ||
217 | assert(it != std::end(node->values) && "Trying to remove a value that is not present in the node"); | ||
218 | // Swap with the last element and pop back | ||
219 | *it = std::move(node->values.back()); | ||
220 | node->values.pop_back(); | ||
221 | } | ||
222 | |||
223 | bool tryMerge(Node* node) | ||
224 | { | ||
225 | assert(node != nullptr); | ||
226 | assert(!isLeaf(node) && "Only interior nodes can be merged"); | ||
227 | auto nbValues = node->values.size(); | ||
228 | for (const auto& child : node->children) | ||
229 | { | ||
230 | if (!isLeaf(child.get())) | ||
231 | return false; | ||
232 | nbValues += child->values.size(); | ||
233 | } | ||
234 | if (nbValues <= Threshold) | ||
235 | { | ||
236 | node->values.reserve(nbValues); | ||
237 | // Merge the values of all the children | ||
238 | for (const auto& child : node->children) | ||
239 | { | ||
240 | for (const auto& value : child->values) | ||
241 | node->values.push_back(value); | ||
242 | } | ||
243 | // Remove the children | ||
244 | for (auto& child : node->children) | ||
245 | child.reset(); | ||
246 | return true; | ||
247 | } | ||
248 | else | ||
249 | return false; | ||
250 | } | ||
251 | |||
252 | void query(Node* node, const Box<Float>& box, const Box<Float>& queryBox, std::vector<T>& values) const | ||
253 | { | ||
254 | assert(node != nullptr); | ||
255 | assert(queryBox.intersects(box)); | ||
256 | for (const auto& value : node->values) | ||
257 | { | ||
258 | if (queryBox.intersects(mGetBox(value))) | ||
259 | values.push_back(value); | ||
260 | } | ||
261 | if (!isLeaf(node)) | ||
262 | { | ||
263 | for (auto i = std::size_t(0); i < node->children.size(); ++i) | ||
264 | { | ||
265 | auto childBox = computeBox(box, static_cast<int>(i)); | ||
266 | if (queryBox.intersects(childBox)) | ||
267 | query(node->children[i].get(), childBox, queryBox, values); | ||
268 | } | ||
269 | } | ||
270 | } | ||
271 | |||
272 | void findAllIntersections(Node* node, std::vector<std::pair<T, T>>& intersections) const | ||
273 | { | ||
274 | // Find intersections between values stored in this node | ||
275 | // Make sure to not report the same intersection twice | ||
276 | for (auto i = std::size_t(0); i < node->values.size(); ++i) | ||
277 | { | ||
278 | for (auto j = std::size_t(0); j < i; ++j) | ||
279 | { | ||
280 | if (mGetBox(node->values[i]).intersects(mGetBox(node->values[j]))) | ||
281 | intersections.emplace_back(node->values[i], node->values[j]); | ||
282 | } | ||
283 | } | ||
284 | if (!isLeaf(node)) | ||
285 | { | ||
286 | // Values in this node can intersect values in descendants | ||
287 | for (const auto& child : node->children) | ||
288 | { | ||
289 | for (const auto& value : node->values) | ||
290 | findIntersectionsInDescendants(child.get(), value, intersections); | ||
291 | } | ||
292 | // Find intersections in children | ||
293 | for (const auto& child : node->children) | ||
294 | findAllIntersections(child.get(), intersections); | ||
295 | } | ||
296 | } | ||
297 | |||
298 | void findIntersectionsInDescendants(Node* node, const T& value, std::vector<std::pair<T, T>>& intersections) const | ||
299 | { | ||
300 | // Test against the values stored in this node | ||
301 | for (const auto& other : node->values) | ||
302 | { | ||
303 | if (mGetBox(value).intersects(mGetBox(other))) | ||
304 | intersections.emplace_back(value, other); | ||
305 | } | ||
306 | // Test against values stored into descendants of this node | ||
307 | if (!isLeaf(node)) | ||
308 | { | ||
309 | for (const auto& child : node->children) | ||
310 | findIntersectionsInDescendants(child.get(), value, intersections); | ||
311 | } | ||
312 | } | ||
313 | }; | ||
314 | |||
315 | } | ||
diff --git a/vendor/quadtree/Vector2.h b/vendor/quadtree/Vector2.h new file mode 100644 index 0000000..302d73e --- /dev/null +++ b/vendor/quadtree/Vector2.h | |||
@@ -0,0 +1,47 @@ | |||
1 | #pragma once | ||
2 | |||
3 | namespace quadtree | ||
4 | { | ||
5 | |||
6 | template<typename T> | ||
7 | class Vector2 | ||
8 | { | ||
9 | public: | ||
10 | T x; | ||
11 | T y; | ||
12 | |||
13 | constexpr Vector2<T>(T X = 0, T Y = 0) noexcept : x(X), y(Y) | ||
14 | { | ||
15 | |||
16 | } | ||
17 | |||
18 | constexpr Vector2<T>& operator+=(const Vector2<T>& other) noexcept | ||
19 | { | ||
20 | x += other.x; | ||
21 | y += other.y; | ||
22 | return *this; | ||
23 | } | ||
24 | |||
25 | constexpr Vector2<T>& operator/=(T t) noexcept | ||
26 | { | ||
27 | x /= t; | ||
28 | y /= t; | ||
29 | return *this; | ||
30 | } | ||
31 | }; | ||
32 | |||
33 | template<typename T> | ||
34 | constexpr Vector2<T> operator+(Vector2<T> lhs, const Vector2<T>& rhs) noexcept | ||
35 | { | ||
36 | lhs += rhs; | ||
37 | return lhs; | ||
38 | } | ||
39 | |||
40 | template<typename T> | ||
41 | constexpr Vector2<T> operator/(Vector2<T> vec, T t) noexcept | ||
42 | { | ||
43 | vec /= t; | ||
44 | return vec; | ||
45 | } | ||
46 | |||
47 | } | ||