#include "root.h"
#include "systemkeyboardinput.h"
+using namespace std;
+
namespace Msp {
namespace GLtk {
-Root::Root(Resources &r, Graphics::Window &window):
- Root(r, &window, new Input::Keyboard(window), new Input::Mouse(window), nullptr)
+Root::Root(Resources &r, Graphics::Window &window, unique_ptr<Input::Keyboard> k, unique_ptr<Input::Mouse> m):
+ Root(r, &window, k.get(), m.get(), nullptr)
{
- own_input = true;
+ own_input[0] = move(k);
+ own_input[1] = move(m);
}
+Root::Root(Resources &r, Graphics::Window &window):
+ Root(r, window, make_unique<Input::Keyboard>(window), make_unique<Input::Mouse>(window))
+{ }
+
Root::Root(Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
resources(r),
keyboard(k),
}
if(keyboard && !input_method)
- input_method = new SystemKeyboardInput(*this, *keyboard);
+ input_method = make_unique<SystemKeyboardInput>(*this, *keyboard);
if(touchscreen)
{
}
}
-Root::~Root()
-{
- delete input_method;
- if(own_input)
- {
- delete keyboard;
- delete mouse;
- }
-}
-
void Root::tick()
{
Time::TimeStamp t = Time::now();