mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-03-22 15:05:03 +01:00
Rewrite #includes to use explicit subdirectory paths
Co-authored-by: Hirek193 <23196899+Hirek193@users.noreply.github.com>
This commit is contained in:
@@ -8,14 +8,14 @@ http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "command.h"
|
||||
#include "input/command.h"
|
||||
|
||||
#include "Globals.h"
|
||||
#include "Logs.h"
|
||||
#include "Timer.h"
|
||||
#include "utilities.h"
|
||||
#include "simulation.h"
|
||||
#include "Train.h"
|
||||
#include "utilities/Globals.h"
|
||||
#include "utilities/Logs.h"
|
||||
#include "utilities/Timer.h"
|
||||
#include "utilities/utilities.h"
|
||||
#include "simulation/simulation.h"
|
||||
#include "vehicle/Train.h"
|
||||
|
||||
namespace simulation {
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "driverkeyboardinput.h"
|
||||
#include "input/driverkeyboardinput.h"
|
||||
|
||||
bool
|
||||
driverkeyboard_input::init() {
|
||||
|
||||
@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "keyboardinput.h"
|
||||
#include "input/keyboardinput.h"
|
||||
|
||||
class driverkeyboard_input : public keyboard_input {
|
||||
|
||||
|
||||
@@ -8,19 +8,19 @@ http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "drivermouseinput.h"
|
||||
#include "input/drivermouseinput.h"
|
||||
|
||||
#include "Globals.h"
|
||||
#include "application.h"
|
||||
#include "utilities.h"
|
||||
#include "Globals.h"
|
||||
#include "Timer.h"
|
||||
#include "simulation.h"
|
||||
#include "Train.h"
|
||||
#include "AnimModel.h"
|
||||
#include "renderer.h"
|
||||
#include "uilayer.h"
|
||||
#include "Logs.h"
|
||||
#include "utilities/Globals.h"
|
||||
#include "application/application.h"
|
||||
#include "utilities/utilities.h"
|
||||
#include "utilities/Globals.h"
|
||||
#include "utilities/Timer.h"
|
||||
#include "simulation/simulation.h"
|
||||
#include "vehicle/Train.h"
|
||||
#include "model/AnimModel.h"
|
||||
#include "rendering/renderer.h"
|
||||
#include "application/uilayer.h"
|
||||
#include "utilities/Logs.h"
|
||||
|
||||
auto const EU07_CONTROLLER_MOUSESLIDERSIZE{ 0.6 };
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
#pragma once
|
||||
|
||||
#include <unordered_map>
|
||||
#include "command.h"
|
||||
#include "input/command.h"
|
||||
|
||||
// virtual slider; value determined by position of the mouse
|
||||
class mouse_slider {
|
||||
|
||||
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "editorkeyboardinput.h"
|
||||
#include "input/editorkeyboardinput.h"
|
||||
|
||||
bool
|
||||
editorkeyboard_input::init() {
|
||||
|
||||
@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "keyboardinput.h"
|
||||
#include "input/keyboardinput.h"
|
||||
|
||||
class editorkeyboard_input : public keyboard_input {
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "editormouseinput.h"
|
||||
#include "input/editormouseinput.h"
|
||||
|
||||
bool
|
||||
editormouse_input::init() {
|
||||
|
||||
@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "command.h"
|
||||
#include "input/command.h"
|
||||
|
||||
class editormouse_input {
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "gamepadinput.h"
|
||||
#include "Logs.h"
|
||||
#include "Timer.h"
|
||||
#include "utilities.h"
|
||||
#include "parser.h"
|
||||
#include "input/gamepadinput.h"
|
||||
#include "utilities/Logs.h"
|
||||
#include "utilities/Timer.h"
|
||||
#include "utilities/utilities.h"
|
||||
#include "utilities/parser.h"
|
||||
|
||||
glm::vec2 circle_to_square( glm::vec2 const &Point, int const Roundness = 0 ) {
|
||||
|
||||
@@ -172,7 +172,7 @@ gamepad_input::recall_bindings() {
|
||||
}
|
||||
#endif
|
||||
|
||||
// bindingparser tworzony zawsze, z wybran¹ œcie¿k¹
|
||||
// bindingparser tworzony zawsze, z wybran<EFBFBD> <20>cie<69>k<EFBFBD>
|
||||
cParser bindingparser(filePath.c_str(), cParser::buffer_FILE);
|
||||
|
||||
if( false == bindingparser.ok() ) {
|
||||
|
||||
@@ -10,8 +10,8 @@ http://mozilla.org/MPL/2.0/.
|
||||
#pragma once
|
||||
|
||||
#include <vector>
|
||||
#include "command.h"
|
||||
#include "parser.h"
|
||||
#include "input/command.h"
|
||||
#include "utilities/parser.h"
|
||||
|
||||
class gamepad_input {
|
||||
|
||||
|
||||
@@ -8,10 +8,10 @@ http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "keyboardinput.h"
|
||||
#include "Globals.h"
|
||||
#include "Logs.h"
|
||||
#include "parser.h"
|
||||
#include "input/keyboardinput.h"
|
||||
#include "utilities/Globals.h"
|
||||
#include "utilities/Logs.h"
|
||||
#include "utilities/parser.h"
|
||||
|
||||
namespace input {
|
||||
|
||||
@@ -143,7 +143,7 @@ keyboard_input::recall_bindings() {
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fallback – plik w folderze symulatora
|
||||
// Fallback <EFBFBD> plik w folderze symulatora
|
||||
path = "eu07_input-keyboard.ini";
|
||||
}
|
||||
cParser bindingparser(path.c_str(), cParser::buffer_FILE);
|
||||
|
||||
@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
|
||||
#include <unordered_map>
|
||||
#include <array>
|
||||
#include "command.h"
|
||||
#include "input/command.h"
|
||||
|
||||
namespace input {
|
||||
|
||||
|
||||
@@ -8,17 +8,17 @@ http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "messaging.h"
|
||||
#include "input/messaging.h"
|
||||
|
||||
#include "Globals.h"
|
||||
#include "application.h"
|
||||
#include "simulation.h"
|
||||
#include "simulationtime.h"
|
||||
#include "Event.h"
|
||||
#include "DynObj.h"
|
||||
#include "Driver.h"
|
||||
#include "mtable.h"
|
||||
#include "Logs.h"
|
||||
#include "utilities/Globals.h"
|
||||
#include "application/application.h"
|
||||
#include "simulation/simulation.h"
|
||||
#include "simulation/simulationtime.h"
|
||||
#include "world/Event.h"
|
||||
#include "vehicle/DynObj.h"
|
||||
#include "vehicle/Driver.h"
|
||||
#include "world/mtable.h"
|
||||
#include "utilities/Logs.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
extern "C"
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#include "stdafx.h"
|
||||
#include "zmq_input.h"
|
||||
#include "Globals.h"
|
||||
#include "Logs.h"
|
||||
#include "simulation.h"
|
||||
#include "simulationtime.h"
|
||||
#include "Train.h"
|
||||
#include "input/zmq_input.h"
|
||||
#include "utilities/Globals.h"
|
||||
#include "utilities/Logs.h"
|
||||
#include "simulation/simulation.h"
|
||||
#include "simulation/simulationtime.h"
|
||||
#include "vehicle/Train.h"
|
||||
|
||||
zmq_input::zmq_input()
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <zmq_addon.hpp>
|
||||
#include "command.h"
|
||||
#include "input/command.h"
|
||||
|
||||
class zmq_input
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user