eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 03:09:18 +02:00
Code Issues 121 Wiki Activity

motion telemetry preparations

Browse Source
This commit is contained in:
milek7
2018-01-15 13:44:27 +01:00
parent 4d2d777737
commit 943eabf8a1
8 changed files with 126 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
EU07.cpp
View File

@@ -40,6 +40,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others
#include "resource.h"
#include "uilayer.h"
#include "uart.h"
#include "motiontelemetry.h"
#pragma comment (lib, "glu32.lib")
#pragma comment (lib, "dsound.lib")
@@ -61,6 +62,7 @@ mouse_input Mouse;
gamepad_input Gamepad;
glm::dvec2 mouse_pickmodepos; // stores last mouse position in control picking mode
std::unique_ptr<uart_input> uart;
std::unique_ptr<motiontelemetry> motiontelemetry;
}
void screenshot_save_thread( char *img )
@@ -356,6 +358,8 @@ int main(int argc, char *argv[])
input::Gamepad.init();
if (Global::uart_conf.enable)
input::uart = std::make_unique<uart_input>();
if (Global::motiontelemetry_conf.enable)
input::motiontelemetry = std::make_unique<motiontelemetry>();
Global::pWorld = &World;
if( false == World.Init( window ) ) {
@@ -398,6 +402,8 @@ int main(int argc, char *argv[])
while( ( false == glfwWindowShouldClose( window ) )
&& ( true == World.Update() )
&& ( true == GfxRenderer.Render() ) ) {
if (input::motiontelemetry)
input::motiontelemetry->update();
glfwPollEvents();
input::Keyboard.poll();
if (input::uart)