Cleaned up includes, fixed compiler warning

This commit is contained in:
2018-02-21 21:30:01 -08:00
parent bb8f87267b
commit fb6557fba2
15 changed files with 44 additions and 54 deletions

View File

@@ -21,7 +21,7 @@ Application::~Application() {
if (window.unique())
window.reset();
else {
Logger::log("Can't release window, shared_ptr coun : " + window.use_count(), Logger::LogLevel::WARN);
Logger::log("Can't release window, shared_ptr count : " + window.use_count(), Logger::LogLevel::WARN);
}
//light_handle->~LightHandle();
//light_controller->~LightController();

View File

@@ -1,15 +1,9 @@
#pragma once
#include <imgui/imgui-SFML.h>
#include "Input.h"
#include <iostream>
#include <memory>
#include "Logger.h"
#include "LightHandle.h"
#include "imgui/imgui-SFML.h"
Input::Input() :
keyboard_flags(sf::Keyboard::Key::KeyCount, false),
mouse_flags(sf::Mouse::Button::ButtonCount, false){
Input::Input() {
}
@@ -166,7 +160,7 @@ void Input::render_gui() {
for (auto i : held_keys) {
if (i < 0)
continue;
ImGui::Text(key_strings.at(i).c_str());
ImGui::Text("%s", key_strings.at(i).c_str());
ImGui::NextColumn();
}