eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 23:19:19 +02:00
Code Issues 123 Wiki Activity

lowercase vehicle name, tweaks

Browse Source
This commit is contained in:
VB
2017-02-21 17:53:24 +01:00
parent 64e3e8102d
commit 62e9766962
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
EU07.cpp
View File

@@ -38,13 +38,7 @@ void window_resize_callback(GLFWwindow *window, int w, int h)
{ {
Global::ScreenWidth = w; Global::ScreenWidth = w;
Global::ScreenHeight = h; Global::ScreenHeight = h;
glViewport(0, 0, w, h); // Reset The Current Viewport glViewport(0, 0, w, h);
glMatrixMode(GL_PROJECTION); // select the Projection Matrix
glLoadIdentity(); // reset the Projection Matrix
// calculate the aspect ratio of the window
gluPerspective(45.0f, (GLdouble)w / (GLdouble)h, 0.2f, 2500.0f);
glMatrixMode(GL_MODELVIEW); // select the Modelview Matrix
glLoadIdentity(); // reset the Modelview Matrix
} }
void cursor_pos_callback(GLFWwindow *window, double x, double y) void cursor_pos_callback(GLFWwindow *window, double x, double y)
@@ -132,12 +126,14 @@ int main(int argc, char *argv[])
else else
Global::iConvertModels = -7; // z optymalizacją, bananami i prawidłowym Opacity Global::iConvertModels = -7; // z optymalizacją, bananami i prawidłowym Opacity
} }
else if (argc <= i + 1) else if (i + 1 < argc && token == "-s")
continue;
else if (token == "-s")
Global::SceneryFile = std::string(argv[++i]); Global::SceneryFile = std::string(argv[++i]);
else if (token == "-v") else if (i + 1 < argc && token == "-v")
Global::asHumanCtrlVehicle = std::string(argv[++i]); {
std::string v(argv[++i]);
std::transform(v.begin(), v.end(), v.begin(), ::tolower);
Global::asHumanCtrlVehicle = v;
}
else else
{ {
std::cout << "usage: " << std::string(argv[0]) << " [-s sceneryfilepath] " std::cout << "usage: " << std::string(argv[0]) << " [-s sceneryfilepath] "
@@ -146,8 +142,6 @@ int main(int argc, char *argv[])
} }
} }
glfwWindowHint(GLFW_SAMPLES, Global::iMultisampling);
// match requested video mode to current to allow for // match requested video mode to current to allow for
// fullwindow creation when resolution is the same // fullwindow creation when resolution is the same
GLFWmonitor *monitor = glfwGetPrimaryMonitor(); GLFWmonitor *monitor = glfwGetPrimaryMonitor();
@@ -158,6 +152,8 @@ int main(int argc, char *argv[])
glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits);
glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate);
glfwWindowHint(GLFW_SAMPLES, Global::iMultisampling);
GLFWwindow *window = GLFWwindow *window =
glfwCreateWindow(Global::iWindowWidth, Global::iWindowHeight, glfwCreateWindow(Global::iWindowWidth, Global::iWindowHeight,
"EU07++NG", Global::bFullScreen ? monitor : nullptr, nullptr); "EU07++NG", Global::bFullScreen ? monitor : nullptr, nullptr);

3
World.cpp
View File

@@ -174,9 +174,6 @@ bool TWorld::Init(GLFWwindow *w)
Global::detonatoryOK = true; Global::detonatoryOK = true;
WriteLog("Starting MaSzyna rail vehicle simulator."); WriteLog("Starting MaSzyna rail vehicle simulator.");
WriteLog(Global::asVersion); WriteLog(Global::asVersion);
if( sizeof( TSubModel ) != 256 ) {
std::cout << "sizeof(TSubModel) != 256: E3D file support unavailable" << std::endl;
}
WriteLog("Online documentation and additional files on http://eu07.pl"); WriteLog("Online documentation and additional files on http://eu07.pl");
WriteLog("Authors: Marcin_EU, McZapkie, ABu, Winger, Tolaris, nbmx, OLO_EU, Bart, Quark-t, " WriteLog("Authors: Marcin_EU, McZapkie, ABu, Winger, Tolaris, nbmx, OLO_EU, Bart, Quark-t, "
"ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others"); "ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others");