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

field of view setting, t3d loader fix

Browse Source
This commit is contained in:
tmj-fstate
2017-02-20 16:17:04 +01:00
parent 6c35276427
commit 1ea207b60f
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Globals.cpp
View File

@@ -52,6 +52,7 @@ HWND Global::hWnd = NULL; // uchwyt okna
int Global::ScreenWidth = 1; int Global::ScreenWidth = 1;
int Global::ScreenHeight = 1; int Global::ScreenHeight = 1;
float Global::ZoomFactor = 1.0f; float Global::ZoomFactor = 1.0f;
float Global::FieldOfView = 45.0f;
int Global::iCameraLast = -1; int Global::iCameraLast = -1;
std::string Global::asRelease = "16.0.1172.482"; std::string Global::asRelease = "16.0.1172.482";
std::string Global::asVersion = std::string Global::asVersion =
@@ -261,6 +262,14 @@ void Global::ConfigParse(cParser &Parser)
Parser.getTokens(); Parser.getTokens();
Parser >> Global::asHumanCtrlVehicle; Parser >> Global::asHumanCtrlVehicle;
} }
else if( token == "fieldofview" ) {
Parser.getTokens( 1, false );
Parser >> Global::FieldOfView;
// guard against incorrect values
Global::FieldOfView = std::min( 75.0f, Global::FieldOfView );
Global::FieldOfView = std::max( 15.0f, Global::FieldOfView );
}
else if (token == "width") else if (token == "width")
{ {

1
Globals.h
View File

@@ -256,6 +256,7 @@ class Global
static int ScreenWidth; // current window dimensions. TODO: move it to renderer static int ScreenWidth; // current window dimensions. TODO: move it to renderer
static int ScreenHeight; static int ScreenHeight;
static float ZoomFactor; // determines current camera zoom level. TODO: move it to the renderer static float ZoomFactor; // determines current camera zoom level. TODO: move it to the renderer
static float FieldOfView; // vertical field of view for the camera. TODO: move it to the renderer
static int iCameraLast; static int iCameraLast;
static std::string asRelease; // numer static std::string asRelease; // numer
static std::string asVersion; // z opisem static std::string asVersion; // z opisem

3
Model3d.cpp
View File

@@ -219,6 +219,9 @@ template <typename ColorT> inline void readColor(cParser &parser, ColorT *color)
double discard; double discard;
parser.getTokens(4, false); parser.getTokens(4, false);
parser >> discard >> color[0] >> color[1] >> color[2]; parser >> discard >> color[0] >> color[1] >> color[2];
color[ 0 ] /= 255.0;
color[ 1 ] /= 255.0;
color[ 2 ] /= 255.0;
}; };
inline void readColor(cParser &parser, int &color) inline void readColor(cParser &parser, int &color)

2
World.cpp
View File

@@ -1517,7 +1517,7 @@ bool TWorld::Render()
glMatrixMode( GL_PROJECTION ); // select the Projection Matrix glMatrixMode( GL_PROJECTION ); // select the Projection Matrix
glLoadIdentity(); // reset the Projection Matrix glLoadIdentity(); // reset the Projection Matrix
// calculate the aspect ratio of the window // calculate the aspect ratio of the window
gluPerspective( 45.0f / Global::ZoomFactor, (GLdouble)Global::ScreenWidth / (GLdouble)Global::ScreenHeight, 0.1f * Global::ZoomFactor, 2500.0f * Global::ZoomFactor ); gluPerspective( Global::FieldOfView / Global::ZoomFactor, (GLdouble)Global::ScreenWidth / (GLdouble)Global::ScreenHeight, 0.1f * Global::ZoomFactor, 2500.0f * Global::ZoomFactor );
glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix
glLoadIdentity(); glLoadIdentity();