Merge branch 'PPU' of github.com:AnonymusRaccoon/ComSquare into PPU

This commit is contained in:
Clément Le Bihan
2021-06-23 22:02:51 +02:00
2 changed files with 4 additions and 3 deletions
+1
View File
@@ -10,6 +10,7 @@
#include "../Memory/MemoryBus.hpp"
#include "../../ui/ui_busView.h"
#include "ClosableWindow.hpp"
#include <optional>
namespace ComSquare::Debugger
{
+3 -3
View File
@@ -17,13 +17,13 @@ namespace ComSquare
T x;
T y;
Vector2<T>()
Vector2()
: x(0), y(0) {}
Vector2<T>(T _x, T _y)
Vector2(T _x, T _y)
: x(_x), y(_y) {}
Vector2<T>(sf::Vector2<T> v)
Vector2(sf::Vector2<T> v)
: x(v.x), y(v.y) {}
template<typename T2>