eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

skydome optimization, vsync .ini setting

Browse Source
This commit is contained in:
tmj-fstate
2017-03-02 17:16:29 +01:00
parent 146d6b036d
commit ab9a8835d6
4 changed files with 60 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EU07.cpp
View File

@@ -281,7 +281,7 @@ int main( int argc, char *argv[] ) {
return -1;
}
glfwMakeContextCurrent( window );
glfwSwapInterval( 0 ); //vsync // NOTE: disabled, as slight drop below refresh rate seems to cause drastic drop in framerate
glfwSwapInterval( (Global::VSync ? 1 : 0) ); //vsync
glfwSetInputMode( window, GLFW_CURSOR, GLFW_CURSOR_DISABLED ); //capture cursor
glfwSetCursorPos( window, 0.0, 0.0 );
glfwSetFramebufferSizeCallback( window, window_resize_callback );

84
Globals.cpp
View File

@@ -125,6 +125,7 @@ int Global::iFeedbackMode = 1; // tryb pracy informacji zwrotnej
int Global::iFeedbackPort = 0; // dodatkowy adres dla informacji zwrotnych
bool Global::bFreeFly = false;
bool Global::bFullScreen = false;
bool Global::VSync{ true };
bool Global::bInactivePause = true; // automatyczna pauza, gdy okno nieaktywne
float Global::fMouseXScale = 1.5;
float Global::fMouseYScale = 0.2;
@@ -308,15 +309,18 @@ void Global::ConfigParse(cParser &Parser)
{
Parser.getTokens();
Parser >> token;
Global::bFullScreen = (token == "yes");
Parser >> Global::bFullScreen;
}
else if( token == "vsync" ) {
Parser.getTokens();
Parser >> Global::VSync;
}
else if (token == "freefly")
{ // Mczapkie-130302
Parser.getTokens();
Parser >> token;
Global::bFreeFly = (token == "yes");
Parser >> Global::bFreeFly;
Parser.getTokens(3, false);
Parser >> Global::pFreeCameraInit[0].x, Global::pFreeCameraInit[0].y,
Global::pFreeCameraInit[0].z;
@@ -325,23 +329,20 @@ void Global::ConfigParse(cParser &Parser)
{
Parser.getTokens();
Parser >> token;
Global::bWireFrame = (token == "yes");
Parser >> Global::bWireFrame;
}
else if (token == "debugmode")
{ // McZapkie! - DebugModeFlag uzywana w mover.pas,
// warto tez blokowac cheaty gdy false
Parser.getTokens();
Parser >> token;
DebugModeFlag = (token == "yes");
Parser >> DebugModeFlag;
}
else if (token == "soundenabled")
{ // McZapkie-040302 - blokada dzwieku - przyda
// sie do debugowania oraz na komp. bez karty
// dzw.
Parser.getTokens();
Parser >> token;
Global::bSoundEnabled = (token == "yes");
Parser >> Global::bSoundEnabled;
}
// else if (str==AnsiString("renderalpha")) //McZapkie-1312302 - dwuprzebiegowe renderowanie
// bRenderAlpha=(GetNextSymbol().LowerCase()==AnsiString("yes"));
@@ -349,15 +350,13 @@ void Global::ConfigParse(cParser &Parser)
{ // McZapkie-030402 - logowanie parametrow
// fizycznych dla kazdego pojazdu z maszynista
Parser.getTokens();
Parser >> token;
WriteLogFlag = (token == "yes");
Parser >> WriteLogFlag;
}
else if (token == "physicsdeactivation")
{ // McZapkie-291103 - usypianie fizyki
Parser.getTokens();
Parser >> token;
PhysicActivationFlag = (token == "yes");
Parser >> PhysicActivationFlag;
}
else if (token == "debuglog")
{
@@ -381,8 +380,7 @@ void Global::ConfigParse(cParser &Parser)
{
// McZapkie-240403 - czestotliwosc odswiezania ekranu
Parser.getTokens();
Parser >> token;
Global::bAdjustScreenFreq = (token == "yes");
Parser >> Global::bAdjustScreenFreq;
}
else if (token == "mousescale")
{
@@ -394,15 +392,13 @@ void Global::ConfigParse(cParser &Parser)
{
// Winger 040204 - 'zywe' patyki dostosowujace sie do trakcji; Ra 2014-03: teraz łamanie
Parser.getTokens();
Parser >> token;
Global::bEnableTraction = (token == "yes");
Parser >> Global::bEnableTraction;
}
else if (token == "loadtraction")
{
// Winger 140404 - ladowanie sie trakcji
Parser.getTokens();
Parser >> token;
Global::bLoadTraction = (token == "yes");
Parser >> Global::bLoadTraction;
}
else if (token == "friction")
{ // mnożnik tarcia - KURS90
@@ -415,8 +411,7 @@ void Global::ConfigParse(cParser &Parser)
// Winger 160404 - zaleznosc napiecia loka od trakcji;
// Ra 2014-03: teraz prąd przy braku sieci
Parser.getTokens();
Parser >> token;
Global::bLiveTraction = (token == "yes");
Parser >> Global::bLiveTraction;
}
else if (token == "skyenabled")
{
@@ -429,15 +424,13 @@ void Global::ConfigParse(cParser &Parser)
{
Parser.getTokens();
Parser >> token;
Global::bManageNodes = (token == "yes");
Parser >> Global::bManageNodes;
}
else if (token == "decompressdds")
{
Parser.getTokens();
Parser >> token;
Global::bDecompressDDS = (token == "yes");
Parser >> Global::bDecompressDDS;
}
else if (token == "defaultext")
{
@@ -460,8 +453,7 @@ void Global::ConfigParse(cParser &Parser)
{
Parser.getTokens();
Parser >> token;
Global::bnewAirCouplers = (token == "yes");
Parser >> Global::bnewAirCouplers;
}
else if (token == "defaultfiltering")
{
@@ -567,8 +559,7 @@ void Global::ConfigParse(cParser &Parser)
{
// podwójna jasność ambient
Parser.getTokens();
Parser >> token;
Global::bDoubleAmbient = (token == "yes");
Parser >> Global::bDoubleAmbient;
}
else if (token == "movelight")
{
@@ -594,8 +585,7 @@ void Global::ConfigParse(cParser &Parser)
{
// podwójna jasność ambient
Parser.getTokens();
Parser >> token;
Global::bSmoothTraction = (token == "yes");
Parser >> Global::bSmoothTraction;
}
else if (token == "timespeed")
{
@@ -613,8 +603,7 @@ void Global::ConfigParse(cParser &Parser)
{
// tekst generowany przez GLUT
Parser.getTokens();
Parser >> token;
Global::bGlutFont = (token == "yes");
Parser >> Global::bGlutFont;
}
else if (token == "latitude")
{
@@ -632,8 +621,7 @@ void Global::ConfigParse(cParser &Parser)
{
// automatyczna pauza, gdy okno nieaktywne
Parser.getTokens();
Parser >> token;
Global::bInactivePause = (token == "yes");
Parser >> Global::bInactivePause;
}
else if (token == "slowmotion")
{
@@ -651,22 +639,19 @@ void Global::ConfigParse(cParser &Parser)
{
// hunter-271211: ukrywanie konsoli
Parser.getTokens();
Parser >> token;
Global::bHideConsole = (token == "yes");
Parser >> Global::bHideConsole;
}
else if (token == "oldsmudge")
{
Parser.getTokens();
Parser >> token;
Global::bOldSmudge = (token == "yes");
Parser >> Global::bOldSmudge;
}
else if (token == "rollfix")
{
// Ra: poprawianie przechyłki, aby wewnętrzna szyna była "pozioma"
Parser.getTokens();
Parser >> token;
Global::bRollFix = (token == "yes");
Parser >> Global::bRollFix;
}
else if (token == "fpsaverage")
{
@@ -791,8 +776,7 @@ void Global::ConfigParse(cParser &Parser)
{
// czy grupować eventy o tych samych nazwach
Parser.getTokens();
Parser >> token;
Global::bJoinEvents = (token == "yes");
Parser >> Global::bJoinEvents;
}
else if (token == "hiddenevents")
{
@@ -837,14 +821,12 @@ void Global::ConfigParse(cParser &Parser)
// maciek001: ustawienia MWD
else if (token == "mwdmasterenable") { // główne włączenie maszyny!
Parser.getTokens();
Parser >> token;
bMWDmasterEnable = (token == "yes");
Parser >> bMWDmasterEnable;
if (bMWDdebugEnable) WriteLog("SerialPort Master Enable");
}
else if (token == "mwddebugenable") { // logowanie pracy
Parser.getTokens();
Parser >> token;
bMWDdebugEnable = (token == "yes");
Parser >> bMWDdebugEnable;
if (bMWDdebugEnable) WriteLog("MWD Debug Mode On");
}
else if (token == "mwddebugmode") { // co ma być debugowane?
@@ -864,14 +846,12 @@ void Global::ConfigParse(cParser &Parser)
}
else if (token == "mwdinputenable") { // włącz wejścia
Parser.getTokens();
Parser >> token;
bMWDInputEnable = (token == "yes");
Parser >> bMWDInputEnable;
if (bMWDdebugEnable && bMWDInputEnable) WriteLog("MWD Input Enable");
}
else if (token == "mwdbreakenable") { // włącz obsługę hamulców
Parser.getTokens();
Parser >> token;
bMWDBreakEnable = (token == "yes");
Parser >> bMWDBreakEnable;
if (bMWDdebugEnable && bMWDBreakEnable) WriteLog("MWD Break Enable");
}
else if (token == "mwdmainbreakconfig") { // ustawienia hamulca zespolonego

1
Globals.h
View File

@@ -177,6 +177,7 @@ class Global
static float fDistanceFactor;
static int iBpp;
static bool bFullScreen;
static bool VSync;
static bool bFreeFly;
// float RunningTime;
static bool bWireFrame;

56
skydome.cpp
View File

@@ -78,49 +78,44 @@ void CSkyDome::Generate() {
float const offset = 0.1f * radius; // horizontal offset, a cheap way to prevent a gap between ground and horizon
// create geometry chunk
int const latitudes = m_tesselation / 2;
int const latitudes = m_tesselation / 2 / 2; // half-sphere only
int const longitudes = m_tesselation;
std::uint16_t index = 0;
for( int i = 0; i < latitudes; ++i ) {
for( int i = 0; i <= latitudes; ++i ) {
float lat0 = M_PI * ( -0.5f + (float)( i ) / latitudes );
float z0 = std::sin( lat0 );
float zr0 = std::cos( lat0 );
float const latitude = M_PI * ( -0.5f + (float)( i ) / latitudes / 2 ); // half-sphere only
float const z = std::sin( latitude );
float const zr = std::cos( latitude );
float lat1 = M_PI * ( -0.5f + (float)( i + 1 ) / latitudes );
float z1 = std::sin( lat1 );
float zr1 = std::cos( lat1 );
for( int j = 0; j <= longitudes; ++j ) {
// quad strip
for( int j = 0; j <= longitudes / 2; ++j ) {
float const longitude = 2.0 * M_PI * (float)( j ) / longitudes;
float const x = std::cos( longitude );
float const y = std::sin( longitude );
/*
m_vertices.emplace_back( float3( x * zr, y * zr - offset, z ) * radius );
// we aren't using normals, but the code is left here in case it's ever needed
// m_normals.emplace_back( float3( x * zr, -y * zr, -z ) );
*/
// cartesian to opengl swap: -x, -z, -y
m_vertices.emplace_back( float3( -x * zr, -z - offset, -y * zr ) * radius );
m_colours.emplace_back( float3( 0.75f, 0.75f, 0.75f ) ); // placeholder
float longitude = 2.0 * M_PI * (float)( j ) / longitudes;
float x = std::cos( longitude );
float y = std::sin( longitude );
m_vertices.emplace_back( float3( x * zr0, y * zr0 - offset, z0 ) * radius );
// m_normals.emplace_back( float3( -x * zr0, -y * zr0, -z0 ) );
m_colours.emplace_back( float3( 0.75f, 0.75f, 0.75f ) );
m_vertices.emplace_back( float3( x * zr1, y * zr1 - offset, z1 ) * radius );
// m_normals.emplace_back( float3( -x * zr1, -y * zr1, -z1 ) );
m_colours.emplace_back( float3( 0.75f, 0.75f, 0.75f ) );
if( j == 0 ) {
// beginning of the strip, don't start indices yet
index += 2;
if( (i == 0) || (j == 0) ) {
// initial edge of the dome, don't start indices yet
++index;
}
else {
// indices for two triangles
m_indices.emplace_back( index - 2 );
// indices for two triangles, formed between current and previous latitude
m_indices.emplace_back( index - 1 - (longitudes + 1) );
m_indices.emplace_back( index - 1 );
m_indices.emplace_back( index );
m_indices.emplace_back( index );
m_indices.emplace_back( index - 1 );
m_indices.emplace_back( index + 1 );
index += 2;
m_indices.emplace_back( index - ( longitudes + 1 ) );
m_indices.emplace_back( index - 1 - ( longitudes + 1 ) );
++index;
}
}
}
@@ -152,6 +147,7 @@ void CSkyDome::Render() {
::glGenBuffers( 1, &m_indexbuffer );
::glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_indexbuffer );
::glBufferData( GL_ELEMENT_ARRAY_BUFFER, m_indices.size() * sizeof( unsigned short ), m_indices.data(), GL_STATIC_DRAW );
// NOTE: vertex and index source data is superfluous past this point, but, eh
}
// begin
::glEnableClientState( GL_VERTEX_ARRAY );